Skip to content

Y
yanshouyi-Minipro
Commit f37eb022 authored by xinzhedeai's avatar xinzhedeai
Browse files
Options

重复请求，断开蓝牙设备

parent 7783e678
Hide whitespace changes
Inline Side-by-side
Showing with 143 additions and 111 deletions
common/mixin.js
View file @ f37eb022
......@@ -11,35 +11,19 @@ import {
} from './util.js'
const blueToothMixin = {
onBackPress(options) {
this.gobackDeal()
return true
//console.log('from:' + options.from)
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function() {
// console.warn('onHide goto disconnect');
// if (this.connected) {
this.leavePageFlag = true
// this.stopLink({
// showTip: false
// })
commonStateCodeDeal(2, 'onHide=>离开页面')
// }
this.leavePageFlag = true
commonStateCodeDeal(2, 'onHide=>离开页面')
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function() {
// if (this.connected) {
this.leavePageFlag = true
// this.stopLink({
// showTip: false
// })
commonStateCodeDeal(2, 'onUnload=>离开页面')
// }
commonStateCodeDeal(2, 'onUnload=>离开页面')
},
data() {
return {
......@@ -83,52 +67,52 @@ const blueToothMixin = {
};
},
methods: {
async gobackDeal(){ // 返回上一页的处理逻辑
console.log(this.connectState, this.connectState)
// 添加蓝牙监测 如果手机蓝牙未开启，则直接返回home页面
try{
const adapterRes = await blueToother.openBluetoothAdapter()
if(!this.connectState){ // 没有正确连接的情况，返回直接退出页面到首页
uni.reLaunch({
url: '/pages/home/home',
});
}else if(this.connectState){
uni.reLaunch({
url: '/pages/home/home',
});
}else if(this.btnLoading){
showCustomModal({
content: '正在测量中，是否要中断测量?',
showCancel: true,
success: ()=> {
this.gosend('STOP')
uni.reLaunch({
url: '/pages/home/home',
});
},
})
}else{
showCustomModal({
content: '验收仪设备正在连接中，是否要中断连接?',
showCancel: true,
success: ()=> {
this.stopLink({
showTip: false
})
uni.reLaunch({
url: '/pages/home/home',
});
},
})
}
// async gobackDeal(){ // 返回上一页的处理逻辑
// console.log(this.connectState, this.connectState)
// // 添加蓝牙监测 如果手机蓝牙未开启，则直接返回home页面
// try{
// const adapterRes = await blueToother.openBluetoothAdapter()
// if(!this.connectState){ // 没有正确连接的情况，返回直接退出页面到首页
// uni.reLaunch({
// url: '/pages/home/home',
// });
// }else if(this.connectState){
// uni.reLaunch({
// url: '/pages/home/home',
// });
// }else if(this.btnLoading){
// showCustomModal({
// content: '正在测量中，是否要中断测量?',
// showCancel: true,
// success: ()=> {
// this.gosend('STOP')
// uni.reLaunch({
// url: '/pages/home/home',
// });
// },
// })
// }else{
// showCustomModal({
// content: '验收仪设备正在连接中，是否要中断连接?',
// showCancel: true,
// success: ()=> {
// this.stopLink({
// showTip: false
// })
// uni.reLaunch({
// url: '/pages/home/home',
// });
// },
// })
// }
}catch(e){
console.log(e)
uni.reLaunch({
url: '/pages/home/home',
});
}
},
// }catch(e){
// console.log(e)
// uni.reLaunch({
// url: '/pages/home/home',
// });
// }
// },
setConnected(flag){
this.connected = flag
},
......@@ -184,6 +168,7 @@ const blueToothMixin = {
this.setNavBarTitle('已断开 ')
this.setConnectState(false)
opt.cb && opt.cb()
},
async startLink() {
this.setNavBarTitle('正在连接 ')
......
common/util.js
View file @ f37eb022
import {
logError
} from './log.js'
import store from '../store'
// 可在utils.js或common.js等公共文件中创建此方法
/**
* 公共日志错误转态码逻辑处理方法
......@@ -319,12 +321,14 @@ var storager = {
var popuper = {
showLoading: function(obj={}){
store.commit('setBlueConnectLoading', true)
uni.showLoading({
title: obj.title || '加载中...',
mask: true
})
},
hideLoading: function(){
store.commit('setBlueConnectLoading', false)
uni.hideLoading()
}
}
......
pages.json
View file @ f37eb022
......@@ -116,24 +116,24 @@
"navigationBarTextStyle": "white"
}
},
"tabBar": {
// "custom": true,
"color": "#7A7E83",
"selectedColor": "#007AFF",
"borderStyle": "black",
"backgroundColor": "#F8F8F8",
"list": [{
"pagePath": "pages/home/home",
"iconPath": "static/component.png",
"selectedIconPath": "static/componentHL.png",
"text": "内置组件"
},{
"pagePath": "pages/tabBar/template/template",
"iconPath": "static/template.png",
"selectedIconPath": "static/templateHL.png",
"text": "模板"
}
]
}
// "tabBar": {
// // "custom": true,
// "color": "#7A7E83",
// "selectedColor": "#007AFF",
// "borderStyle": "black",
// "backgroundColor": "#F8F8F8",
// "list": [{
// "pagePath": "pages/home/home",
// "iconPath": "static/component.png",
// "selectedIconPath": "static/componentHL.png",
// "text": "内置组件"
// },{
// "pagePath": "pages/tabBar/template/template",
// "iconPath": "static/template.png",
// "selectedIconPath": "static/templateHL.png",
// "text": "模板"
// }
// ]
// }
}
pages/home/blueMeasure.vue
View file @ f37eb022
......@@ -108,7 +108,7 @@
</view>
</view>
<view class="footer-wrapper">
<view class="funcBtn end" @tap="resetForm">
<view class="funcBtn end" @tap="gobackDeal">
取消
</view>
<view class="funcBtn save" @tap="saveData">
......@@ -216,6 +216,7 @@
})
},
gobackDeal() {
// this.resetForm()
pager.relaunchTo('/pages/home/home')
},
async getDictInfo() {
......@@ -534,7 +535,7 @@
padding-right: 15rpx;
background: #FFFFFF;
border-radius: 10rpx;
margin-top: 20rpx;
.sumary-title {
position: relative;
padding-left: 50rpx;
......
pages/home/blueSearch.vue
View file @ f37eb022
......@@ -43,6 +43,7 @@
blueToothMixin
} from '../../common/mixin.js'
function inArray(arr, key, val) {
for (let i = 0; i < arr.length; i++) {
if (arr[i][key] === val) {
......@@ -60,14 +61,15 @@
return hexArr.join('');
}
export default {
onBackPress(options) {
// this.gobackDeal()
return true
//console.log('from:' + options.from)
},
mixins: [blueToothMixin],
components: {
CustomNavbar,
},
onBackPress(options) {
this.gobackDeal()
return true
},
data() {
return {
devices: [],
......@@ -82,18 +84,32 @@
};
},
onShow() {
uni.hideLoading()
popuper.hideLoading()
},
onLoad(options) {
},
methods: {
gobackDeal(){
uni.reLaunch({
// url: '/pages/home/home'// this.redirectUrl,
url: '/pages/home/home'
});
},
// gobackDeal(){
// console.log('XXXXXXXXX****8泛会上一页')
// if(this.$store.state.blueConnectLoading){
// showCustomModal({
// content: '验收仪设备正在连接中，是否要中断连接?',
// showCancel: true,
// success: ()=> {
// this.stopLink({
// showTip: false
// })
// uni.reLaunch({
// url: '/pages/home/home',
// });
// },
// })
// return true
// }
// uni.reLaunch({
// url: '/pages/home/home',
// });
// },
openBluetoothAdapter() {
this.misScanding = false;
uni.openBluetoothAdapter({
......@@ -182,19 +198,33 @@
},
goto_Comm(e) {
popuper.showLoading({
title: '设备连接中...'
})
// this.$globalData.ble_device = e.currentTarget.dataset;
const deviceInfo = e.currentTarget.dataset
this.deviceId = deviceInfo.deviceId
this.stopBluetoothDevicesDiscovery();
uni.setStorageSync('deviceInfo', deviceInfo)
console.log('*****开始连接蓝牙');
this.startLink()
// uni.reLaunch({
// url: '/pages/home/home'
// });
if(this.$store.state.connected){
showCustomModal({
content: '已有连接的蓝牙设备，是否要中断当前连接?',
showCancel: true,
success: ()=> {
this.stopLink({
showTip: false,
cb: function(){
showCustomToast({
title: '设备连接已断开'
})
}
})
// this.goto_Comm(e)
},
})
}else{
popuper.showLoading({
title: '设备连接中...'
})
// this.$globalData.ble_device = e.currentTarget.dataset;
const deviceInfo = e.currentTarget.dataset
this.deviceId = deviceInfo.deviceId
this.stopBluetoothDevicesDiscovery();
uni.setStorageSync('deviceInfo', deviceInfo)
this.startLink()
}
},
closeBluetoothAdapter() {
uni.closeBluetoothAdapter();
......
pages/home/home.vue
View file @ f37eb022
......@@ -282,6 +282,7 @@
position: relative;
width: 646rpx;
height: 440rpx;
margin-top: -20rpx;
// background-image: url('/static/image/paokong/home-title-bg.png');
// background-color: linear-gradient(-90deg, #F6F9FF 31%, #E4EFFF 100%);
// background-position: center;
......
store/index.js
View file @ f37eb022
......@@ -29,6 +29,7 @@ const store = createStore({
power2: 0,
qiuId:'',
connected: false,
blueConnectLoading: false,
},
mutations: {
setMeasureVal(state, testRes){
......@@ -42,6 +43,16 @@ const store = createStore({
},
setLinked(state, flag){
state.connected = flag
if(!flag){ // 断开链接时，清空store的测量值
state.actualDepth = ''
state.actualWaterLevel = ''
state.power1 = ''
state.power2 = ''
state.qiuId = ''
}
},
setBlueConnectLoading(state, flag){
state.blueConnectLoading = flag
}
// login(state, provider) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment