Skip to content

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

蓝牙公公处理 页面单独调用write处理

parent df7a059a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 180 additions and 1315 deletions
api/operatorLog.js 0 → 100644
View file @ ee270356
import request from '@/common/request.js'
export function getDataList(data) { // 获取下拉列表数据
return request({
url: '/operation/getList',
method: 'get',
data
})
}
export function getselectList4productName(data) { // 获取下拉列表数据
return request({
url: '/product/getList',
method: 'get',
data
})
}
export function getselectList4tester(data) { // 获取下拉列表数据
return request({
url: '/product/getList',
method: 'post',
data
})
}
export function getDict(data) { // 获取下拉列表数据
return request({
url: '/system/dict/data/type/'+data.type,
method: 'get',
})
}
common/mixin.js
View file @ ee270356
......@@ -33,9 +33,9 @@ const blueToothMixin = {
onUnload: function() {
// if (this.connected) {
this.leavePageFlag = true
this.stopLink({
showTip: false
})
// this.stopLink({
// showTip: false
// })
commonStateCodeDeal(2, 'onUnload=>离开页面')
// }
},
......@@ -298,9 +298,28 @@ const blueToothMixin = {
const res = await blueToother.notifyBLECharacteristicValueChange(deviceId, serviceId,
characteristicId, state)
this.connected = true
uni.setStorageSync('connected', true)
this.setNavBarTitle('【Notify】开启成功')
this.readyRec = true;
uni.hideLoading()
this.gosend('POWER')
/**
* 024-12-27新增逻辑：
* 1、蓝牙连接成功后弹窗，点击确认调转页面
* 2、发送指令，获取小球id与电量
*/
showCustomModal({
content: '蓝牙已连接，是否跳转首页',
showCancel: true,
success: ()=> {
uni.reLaunch({
url: '/pages/home/home',
});
},
})
} catch (res) {
this.setConnectState(false)
commonStateCodeDeal(res.errCode || res,
......@@ -385,6 +404,9 @@ const blueToothMixin = {
// 设置测试值：
const recBlueResData = JSON.parse(recStr)
console.log('设备检测值', recBlueResData)
console.info('获取小球id和电量', recBlueResData)
// console.log('设备检测值：', recBlueResData.angle)
this.form.realTestInclination = recBlueResData.angle
this.form.realTestHoleDepth = recBlueResData.lenth
......@@ -447,7 +469,6 @@ const blueToothMixin = {
// title: '已停止测量',
// })
this.btnLoading = false
this.saveFormData2Local && this.saveFormData2Local()
}
},
fail: (res) => {
......
common/util.js
View file @ ee270356
......@@ -248,7 +248,6 @@ function getCurrentTime() {
// 拼接年月日时分格式的字符串
let formattedTime = `${year}-${month}-${date} ${hours}:${minutes}`;
return formattedTime
}
function ab2Str(arrayBuffer) {
......
components/miku-calendar/mikuCalendar.vue deleted 100644 → 0
View file @ df7a059a
This diff is collapsed.
manifest.json
View file @ ee270356
{
"name" : "中深孔验收仪",
"name" : "露天炮孔验收仪",
"appid" : "__UNI__672B793",
"description" : "中深孔验收仪",
"description" : "露天炮孔验收仪",
"versionName" : "1.0.0",
"versionCode" : "100",
"transformPx" : false,
......
pages.json
View file @ ee270356
......@@ -55,6 +55,14 @@
"navigationBarTitleText" : "孔测量"
}
},
{
"path" : "pages/home/operateLog",
"style" :
{
"navigationBarTitleText" : "操作日志"
}
},
// {
// "path": "pages/tabBar/component/comm",
// "style": {
......@@ -82,7 +90,7 @@
"path" : "pages/user/login",
"style" :
{
"navigationBarTitleText" : ""
"navigationBarTitleText" : "微信授权登录"
}
},
{
......
pages/home/blueMeasure.vue
View file @ ee270356
......@@ -4,6 +4,7 @@
</CustomNavbar>
<view class="body-wrapper">
<button @click="gosend">获取电量</button>
<view class="demo-uni-row">
<uni-row>
<uni-col :span="7" class="_title">
......@@ -141,10 +142,11 @@
<script>
import CustomNavbar from '@/pages/component/CustomNavbar.vue';
// import {
// blueToothMixin
// } from '../../common/mixin.js'
import {
blueToothMixin
} from '../../common/mixin.js'
import {
stringToBytes,
getCurrentTime,
showCustomToast,
showCustomModal
......@@ -156,7 +158,7 @@
getDict
} from '../../api/blueToothMeasure.js'
export default {
mixins: [blueToothMixin],
// mixins: [blueToothMixin],
components: {
CustomNavbar,
},
......@@ -198,6 +200,26 @@
// this.initLink()
},
methods: {
gosend(){
var strbuf = new Uint8Array(stringToBytes('POWER'));
var buffer1 = strbuf.buffer;
setTimeout(()=>{
uni.writeBLECharacteristicValue({
deviceId: 'C8:47:80:52:93:A2',
serviceId: '0000FFE0-0000-1000-8000-00805F9B34FB',
characteristicId:'0000FFE1-0000-1000-8000-00805F9B34FB',
value: buffer1,
success: (res) => {
console.log('writeBLECharacteristicValue-success:res=>', res)
},
fail: (res) => {
console.log('writeBLECharacteristicValue-fail:res=>', res)
// commonStateCodeDeal(res.errCode || res, 'gosend -> writeBLECharacteristicValue',
// this)
},
});
}, 1000)
},
async getDictInfo() {
let res = await getDict({
type: 'zhuangyao_type'
......
pages/home/blueSearch.vue
View file @ ee270356
......@@ -2,6 +2,9 @@
<view class="wrapper">
<CustomNavbar title="蓝牙扫描" @gobackDeal="gobackDeal('blueSearch')">
</CustomNavbar>
<view class="" style="text-align: center; color: #000; font-size: 32rpx; margin-top:20rpx;">
{{ pageLoadText }}
</view>
<view class="body-wrapper">
<!-- 横向均分 -->
......@@ -27,7 +30,9 @@
<script>
import CustomNavbar from '@/pages/component/CustomNavbar.vue';
const app = getApp();
import {
blueToothMixin
} from '../../common/mixin.js'
function inArray(arr, key, val) {
for (let i = 0; i < arr.length; i++) {
......@@ -46,13 +51,13 @@
return hexArr.join('');
}
export default {
mixins: [blueToothMixin],
components: {
CustomNavbar,
},
onBackPress(options) {
this.gobackDeal()
return true
},
data() {
return {
......@@ -71,11 +76,7 @@
uni.hideLoading()
},
onLoad(options) {
if (options.refer === 'blueTest') {
this.redirectUrl = '/pages/home/blueTest'
}else if(options.refer === 'blueMeasure'){
this.redirectUrl = '/pages/home/blueMeasure'
}
},
methods: {
gobackDeal(){
......@@ -172,18 +173,17 @@
},
goto_Comm(e) {
console.log('*****跳转首页');
// this.$globalData.ble_device = e.currentTarget.dataset;
const deviceInfo = e.currentTarget.dataset
this.deviceId = deviceInfo.deviceId
this.stopBluetoothDevicesDiscovery();
uni.setStorageSync('deviceInfo', deviceInfo)
uni.reLaunch({
// url: this.redirectUrl,
url: '/pages/home/home'
// complete:function(e){
// console.log('e', JSON.stringify(e))
// }
});
console.log('*****开始连接蓝牙');
this.startLink()
// uni.reLaunch({
// url: '/pages/home/home'
// });
},
closeBluetoothAdapter() {
uni.closeBluetoothAdapter();
......
pages/home/home.vue
View file @ ee270356
......@@ -4,13 +4,13 @@
<view class="logo-wrapper">
<image class="logoImg" src="/static/image/home/logo.png" alt="" />
<h3>露天炮孔验收仪</h3>
<button @click="gosend">获取电量</button>
</view>
<view class="link-info-wrapper" @click="navTo('login')">
<view class="link-info-wrapper" @click="gosend('POWER')">
<div class="left">
<image src="/static/image/paokong/linkY.png" mode=""></image>
<image :src="`/static/image/paokong/${connected?'linkY':'linkN'}.png`" mode=""></image>
<view class="link-status">
蓝牙已连接
蓝牙{{ connected? '已连接': '未连接' }}
</view>
</div>
<div class="right">
......@@ -72,8 +72,12 @@
<script>
import CustomNavbar from '@/pages/component/CustomNavbar.vue';
import {formatNumber,formatDateThis,getUnixTime} from "../../common/dateUtil.js"
import {showCustomModal, showCustomToast} from "../../common/util.js"
import {stringToBytes, showCustomModal, showCustomToast, commonStateCodeDeal} from "../../common/util.js"
// import {
// blueToothMixin
// } from '../../common/mixin.js'
export default {
// mixins: [blueToothMixin],
onBackPress(options) {
// showCustomToast({
// title: '当前页为最后一页，不能继续返回了'
......@@ -85,16 +89,59 @@
},
data() {
return {
deviceInfo: {}
}
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
uni.hideLoading()
// if(uni.getStorageSync('connected')){
// this.gosend('POWER')
// }else{
// this.initLink()
// }'
},
onShow() {
uni.hideLoading()
},
// watch:{
// connected(newVal){
// if(newVal){ // 已连接
// this.gosend('POWER')
// }
// }
// },
mounted() {
const deviceInfo = uni.getStorageSync('deviceInfo')
if(deviceInfo){ // 获取蓝牙设备型号id
this.deviceInfo = deviceInfo
}
uni.hideTabBar()
},
methods: {
gosend(){
var strbuf = new Uint8Array(stringToBytes('POWER'));
var buffer1 = strbuf.buffer;
setTimeout(()=>{
uni.writeBLECharacteristicValue({
deviceId: 'C8:47:80:52:93:A2',
serviceId: '0000FFE0-0000-1000-8000-00805F9B34FB',
characteristicId:'0000FFE1-0000-1000-8000-00805F9B34FB',
value: buffer1,
success: (res) => {
console.log('writeBLECharacteristicValue-success:res=>', res)
},
fail: (res) => {
console.log('writeBLECharacteristicValue-fail:res=>', res)
// commonStateCodeDeal(res.errCode || res, 'gosend -> writeBLECharacteristicValue',
// this)
},
});
}, 1000)
},
navTo(flag){
if(flag === 'export'){
this.exportData2Excel()
......
pages/home/importFile.vue
View file @ ee270356
......@@ -6,10 +6,10 @@
<view class="jisuanqi" @click="exportExcel" style="margin-top:100rpx;">
导出
</view>
<view class="jisuanqi" @click="showCalendar=true" style="margin-top:100rpx;">
<!-- <view class="jisuanqi" @click="showCalendar=true" style="margin-top:100rpx;">
选择日期
</view>
-->
<view class="content-confirm" style="margin-top:100rpx;">
日期选择{{searchDate}}
<!-- <calendar-select v-model="showCalendar"
......@@ -20,7 +20,7 @@
@change="changeDate"></calendar-select>
-->
<!--
<button @click="open">打开弹窗</button>
<uni-popup ref="popup" type="bottom" border-radius="10px 10px 0 0">
<miku-calendar
......@@ -36,7 +36,7 @@
></miku-calendar>
</uni-popup>
</uni-popup> -->
</view>
......@@ -46,13 +46,13 @@
</template>
<script>
import * as XLSX from '@/common/excel.js'
import CalendarSelect from '@/components/calendar-select/calendar-select.vue'
import mikuCalendar from "@/components/miku-calendar/mikuCalendar.vue"
// import CalendarSelect from '@/components/calendar-select/calendar-select.vue'
// import mikuCalendar from "@/components/miku-calendar/mikuCalendar.vue"
var that;
export default {
components: {
CalendarSelect,
mikuCalendar
// CalendarSelect,
// mikuCalendar
},
data() {
return {
......
pages/home/operateLog.vue
View file @ ee270356
<template>
<view class="pageWrapper">
<CustomNavbar :title="navBarTitle" goBackUrl="/pages/home/home" @gobackDeal="gobackDeal">
<CustomNavbar :title="navBarTitle" @gobackDeal="gobackDeal">
</CustomNavbar>
<view class="body-wrapper">
......@@ -68,25 +68,11 @@
</uni-tr>
</uni-table>
</view>
<view class="" v-show="!connected" style="text-align: center; color: darkgray; margin-top:20rpx;">
{{ pageLoadText }}
</view>
<!-- <uni-popup ref="popup" type="bottom" border-radius="10px 10px 0 0">
<miku-calendar :calendarBg="'#fff'"
:dateRange="[new Date('2024/02/01').getTime(),new Date('2024/02/27').getTime()]" :dateRangeMax="365"
@dateRangeMaxDeal="dateRangeMaxDeal" mode='dateRange' :showArrow="true" themeColor="rgb(100,124,203)"
arrowColor="rgb(100,124,203)" @confirm="calendarConfirm"></miku-calendar>
</uni-popup> -->
</view>
</template>
<script>
import CustomNavbar from '@/pages/component/CustomNavbar.vue';
import mikuCalendar from "@/components/miku-calendar/mikuCalendar.vue";
import {
getCurrentTime,
showCustomToast,
......@@ -100,7 +86,6 @@
export default {
components: {
CustomNavbar,
mikuCalendar
},
data() {
const currentDate = this.getDate({
......@@ -151,6 +136,11 @@
}
},
methods: {
gobackDeal(){ // 返回上一页的处理逻辑
uni.reLaunch({
url: '/pages/home/home',
});
},
// 搜索
search() {
this.getData(1, this.searchVal)
......
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