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