蓝牙连接 heart

api/login.js

@@ -6,4 +6,11 @@ export function login(params) { // 登录获取token
     method: 'post',
 	data: params.data
   })
+}
+export function getPhoneNumber(params) { // 登录获取token
+  return request({
+    url: '/weixin/getPhoneNumber',
+    method: 'get',
+	data: params.data
+  })
 }
\ No newline at end of file

common/mixin.js

@@ -6,6 +6,7 @@ import {
 	showCustomToast,
 	commonStateCodeDeal,
 	blueToother,
+	storager
 } from './util.js'
 
 const blueToothMixin = {
@@ -132,9 +133,9 @@ const blueToothMixin = {
 			this.connected = flag
 		},
 		setConnectState(flag){ // flag:true  正常  false 不正常
-			if(flag){
-				this.connectState = flag
-			}
+			this.connectState = flag
+			this.$store.commit('setLinked', flag)
+			uni.setStorageSync('connected', flag)
 		},
 		setNavBarTitle(content) {
 			// this.navBarTitle = content + ' ' + this.deviceName
@@ -181,7 +182,6 @@ const blueToothMixin = {
 			// 	}
 			// });
 			
-			this.connected = false
 			this.setNavBarTitle('已断开 ')
 			this.setConnectState(false)
 		},
@@ -193,18 +193,16 @@ const blueToothMixin = {
 				
 				// const result4close = await blueToother.closeBLEConnection(this.deviceId)
 
-				const result = await blueToother.createBLEConnection(this.deviceId)
+				const result = await blueToother.createBLEConnection(storager.get('deviceInfo').deviceId)
 				console.log('result', result)
 				if (result) {
 					commonStateCodeDeal(2, 'createBLEConnection=>创建连接成功')
 					this.setNavBarTitle('已创建连接 ')
-					this.getBLEDeviceServices(this.deviceId);
+					this.getBLEDeviceServices(storager.get('deviceInfo').deviceId);
 					uni.onBLEConnectionStateChange((res) => { // 蓝牙连接意外断开等异常情况
 						if (!res.connected) {
 							this.setNavBarTitle('连接已断开')
 							this.setConnectState(false)
-							this.connected = false
-							
 							// this.stopLink()
 							
 						}
@@ -252,7 +250,7 @@ const blueToothMixin = {
 			var that = this;
 			this.readyRec = false;
 			try {
-				const res = await blueToother.getBLEDeviceServices(this.deviceId)
+				const res = await blueToother.getBLEDeviceServices(storager.get('deviceInfo').deviceId)
 				console.log('res', res)
 				if (res && res.services.length) {
 					var isService = false;
@@ -263,7 +261,7 @@ const blueToothMixin = {
 						if (this.serviceu == res.services[i].uuid) {
 							isService = true;
 							this.setNavBarTitle('服务已匹配')
-							this.getBLEDeviceCharacteristics(this.deviceId, this.serviceu);
+							this.getBLEDeviceCharacteristics(storager.get('deviceInfo').deviceId, this.serviceu);
 						}
 					}
 					if (!isService) {
@@ -297,8 +295,8 @@ const blueToothMixin = {
 			try {
 				const res = await blueToother.notifyBLECharacteristicValueChange(deviceId, serviceId,
 					characteristicId, state)
-				this.connected = true
-				uni.setStorageSync('connected', true)
+				this.setConnectState(true)
+				
 				this.setNavBarTitle('【Notify】开启成功')
 				this.readyRec = true;
 				uni.hideLoading()
@@ -378,7 +376,7 @@ const blueToothMixin = {
 								// this.showModalTips(this.rxdu + "\r正在开启通知...")
 								that.setNavBarTitle('正在开启通知')
 
-								that.notifyBLECharacteristicValueChange(deviceId, serviceId, item.uuid, true)
+								that.notifyBLECharacteristicValueChange(storager.get('deviceInfo').deviceId, serviceId, item.uuid, true)
 							} else {
 								this.setConnectState(false)
 								that.setNavBarTitle('notify特征值uuid不匹配')
@@ -388,6 +386,7 @@ const blueToothMixin = {
 
 					// 操作之前先监听，保证第一时间获取数据
 					uni.onBLECharacteristicValueChange((characteristic) => {
+						console.log('onBLECharacteristicValueChange值改变获取', characteristic)
 						if (!this.readyRec) {
 							return;
 						}
@@ -401,22 +400,67 @@ const blueToothMixin = {
 							commonStateCodeDeal(2, '特征值UUID值不匹配onBLECharacteristicValueChange')
 							return;
 						}
-
+						console.log('recStr*****', recStr)
+						
+						if(recStr === 'HEART'){ // 心跳监测
+							var temp4heart = new Uint8Array(stringToBytes('HEART'));
+							uni.writeBLECharacteristicValue({
+								deviceId: storager.get('deviceInfo').deviceId,
+								serviceId: '0000FFE0-0000-1000-8000-00805F9B34FB',
+								characteristicId: '0000FFE1-0000-1000-8000-00805F9B34FB',
+								value: temp4heart.buffer,
+								success: (res) => {
+									console.log('writeBLECharacteristicValue-successHEART:res=>', res)
+								},
+								fail: (res) => {
+									console.log('writeBLECharacteristicValue-failHEART:res=>', res)
+								},
+							});
+							return
+						}
+						if(recStr.indexOf('HEART') > -1){ // 处理掉测量深度对象值后面拼接的HEART字符串
+							recStr = recStr.split('HEART')[0]
+						}
 						// 设置测试值：
 						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
-						commonStateCodeDeal(2, '监听到设备反馈信息'+JSON.stringify(recBlueResData))
-						
-						// this.form.realTestTime = getCurrentTime()
-
+						if(recBlueResData.power1){
+							this.$store.commit('setPower', {
+								power1: recBlueResData.power1,
+								power2: recBlueResData.power2,
+								qiuId: recBlueResData.id
+							})
+							commonStateCodeDeal(2, '监听到设备反馈信息->电量'+JSON.stringify(recBlueResData))
+							return
+						}
+						if(recBlueResData.ks){
+							this.$store.commit('setPower', {
+								actualDepth: recBlueResData.ks,
+								actualWaterLevel: recBlueResData.ss,
+							})
+							commonStateCodeDeal(2, '监听到设备反馈信息->测量深度'+JSON.stringify(recBlueResData))
+							
+							// 接收到监测深度值，回复主机DATAOK
+							var temp4dataok = new Uint8Array(stringToBytes('DATAOK'));
+							uni.writeBLECharacteristicValue({
+								deviceId: storager.get('deviceInfo').deviceId,
+								serviceId: '0000FFE0-0000-1000-8000-00805F9B34FB',
+								characteristicId: '0000FFE1-0000-1000-8000-00805F9B34FB',
+								value: temp4dataok.buffer,
+								success: (res) => {
+									console.log('writeBLECharacteristicValue-successHEART:res=>', res)
+								},
+								fail: (res) => {
+									console.log('writeBLECharacteristicValue-failHEART:res=>', res)
+								},
+							});
+							
+							return
+						}
 					});
-
-					
 				} else {
 					this.setNavBarTitle('未发现特征值')
 					this.setConnectState(false)

common/util.js

@@ -301,7 +301,7 @@ var storager = {
 }
 
 var popuper = {
-	showLoading: function(obj){
+	showLoading: function(obj={}){
 		uni.showLoading({
 			title: obj.title || '加载中...',
 			mask: true

manifest.json

@@ -129,7 +129,9 @@
         "versionCode" : 100
     },
     "mp-weixin" : {
-        "appid" : "wx6238adc0d70b28d6",
+        // "appid" : "wx6238adc0d70b28d6", // 比萨列
+		"aGETDATAppid" : "wx41f6d06aca0687c3", // 矿山智行
+		
         "setting" : {
             "urlCheck" : false,
             "es6" : true

pages/home/home.vue

@@ -7,7 +7,7 @@
 				<h3>露天炮孔验收仪</h3>
 				<!-- <button @click="gosend">获取电量 {{ actualWaterLevel }}</button> -->
 			</view>
-			<view class="link-info-wrapper" @click="gosend('POWER')">
+			<view class="link-info-wrapper" @click="gosend('GETDATA')">
 				<image class="bg" src="../../static/image/paokong/home-title-bg.png" mode=""></image>
 				<div class="left">
 					<image :src="`/static/image/paokong/${connected?'linkY':'linkN'}.png`" mode=""></image>
@@ -19,15 +19,15 @@
 					<div class="top">
 						<h2>设备电量</h2>
 						<p>
-							小球 <image src="/static/image/paokong/qiu-dl.png">{{ '22' }} %
-							仪器 <image src="/static/image/paokong/shebei-dl.png">{{ '24' }} %
+							小球 <image src="/static/image/paokong/qiu-dl.png">{{ power1 }} %
+							仪器 <image src="/static/image/paokong/shebei-dl.png">{{ power2 }} %
 						</p>
 					</div>
 					<div class="bottom">
 						<h2>设备参数</h2>
 						<p>设备名称：露天炮孔验收仪</p>
 						<p>设备型号：MYSM-OH-01</p>
-						<p>设备ID：MYSM-OH-01</p>
+						<p>设备ID：{{ qiuId }}</p>
 					</div>
 					
 				</div>
@@ -128,10 +128,11 @@
 			uni.hideTabBar()
 		},
 		computed:{
-			...mapState(['actualWaterLevel'])
+			...mapState(['actualWaterLevel', 'power1', 'power2', 'qiuId', 'connected'])
 		},
 		methods: {
 			uploadExcel(){
+				
 				wx.chooseMessageFile({
 					count: 1,
 					type: 'file',
@@ -217,11 +218,12 @@
 					actualDepth: 'xxx', // 孔深
 					actualWaterLevel: '666' // 水深
 				})
-				var strbuf = new Uint8Array(stringToBytes('POWER'));
+				var strbuf = new Uint8Array(stringToBytes('GETDATA'));
 				var buffer1 = strbuf.buffer;
 				setTimeout(() => {
 					uni.writeBLECharacteristicValue({
-						deviceId: 'C8:47:80:52:93:A2',
+						// deviceId: 'C8:47:80:52:93:A2',
+						deviceId: storager.get('deviceInfo').deviceId,
 						serviceId: '0000FFE0-0000-1000-8000-00805F9B34FB',
 						characteristicId: '0000FFE1-0000-1000-8000-00805F9B34FB',
 						value: buffer1,

pages/user/login.vue

@@ -8,6 +8,10 @@
 			<view class='content'>
 				<view class="title">手机号</view>
 				<input class="uni-input" focus placeholder="请输入手机号" v-model="phone" />
+
+				<button class="tel-btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
+					<uni-icons type="phone" size="18"></uni-icons>
+				</button>
 			</view>
 
 			<button class='loginBtn' type='primary' @click="wxLogin">
@@ -17,10 +21,18 @@
 	</view>
 </template>
 
-	
+
 <script>
-	import {showCustomToast, popuper, storager, pager} from '../../common/util.js'
-	import {login} from '../../api/login.js'
+	import {
+		showCustomToast,
+		popuper,
+		storager,
+		pager
+	} from '../../common/util.js'
+	import {
+		login,
+		getPhoneNumber
+	} from '../../api/login.js'
 	export default {
 		onLoad() {
 			/**
@@ -50,114 +62,152 @@
 			}
 		},
 		methods: {
-			async wxLogin(){
-				 popuper.showLoading({title: '登录中...'})
-				  const loginRes = await this.getWxCode()
-				  if(!loginRes.code){
-					  showCustomToast({
-						  title: 'code未获取'
-					  })
-					  return
-				  }
-				  const userInfo = await this.getUserInfo()
-				  if(!userInfo.iv){
-					  showCustomToast({
-					  	  title: 'iv未获取'
-					  })
-						return
-				  }
-				  await this.getToken(loginRes.code, userInfo)
-				  
+			async getPhoneNumber(e) {
+				popuper.showLoading()
+				console.log(e)
+				console.log(JSON.stringify(e))
+				const code = e.detail.code // 动态令牌
+
+				let res = await getPhoneNumber({
+					data: {
+						code
+					}
+				})
+				console.log('res', res)
+				if(res){
+					this.phone = res.phoneNumber
+				}
+				popuper.hideLoading()
+			},
+			async wxLogin() {
+				popuper.showLoading({
+					title: '登录中...'
+				})
+				const loginRes = await this.getWxCode()
+				if (!loginRes.code) {
+					showCustomToast({
+						title: 'code未获取'
+					})
+					return
+				}
+				const userInfo = await this.getUserInfo()
+				if (!userInfo.iv) {
+					showCustomToast({
+						title: 'iv未获取'
+					})
+					return
+				}
+				await this.getToken(loginRes.code, userInfo)
+
 			},
-			getWxCode(){
+			getWxCode() {
 				return new Promise((resolve, reject) => {
-				      uni.login({
-				        provider: 'weixin',
-				        success: (loginRes) => {
-				          console.log('loginRes: ' + JSON.stringify(loginRes));
-				          resolve(loginRes);
-				        },
-				        fail: (err) => reject(err) // 添加失败处理
-				      });
-				    });
+					uni.login({
+						provider: 'weixin',
+						success: (loginRes) => {
+							console.log('loginRes: ' + JSON.stringify(loginRes));
+							resolve(loginRes);
+						},
+						fail: (err) => reject(err) // 添加失败处理
+					});
+				});
 			},
-			getUserInfo(){
+			getUserInfo() {
 				return new Promise((resolve, reject) => {
-				  uni.getUserInfo({
-					provider: 'weixin',
-					success: (infoRes) => {
-					  console.log('infoRes：' + JSON.stringify(infoRes));
-					  resolve(infoRes);
-					},
-					fail: (err) => reject(err) // 添加失败处理
-				  });
+					uni.getUserInfo({
+						provider: 'weixin',
+						success: (infoRes) => {
+							console.log('infoRes：' + JSON.stringify(infoRes));
+							resolve(infoRes);
+						},
+						fail: (err) => reject(err) // 添加失败处理
+					});
 				});
 			},
-			async getToken(code, userInfo){
+			async getToken(code, userInfo) {
 				let res = await login({
 					data: {
-						 "code": code,
-						  "encryptedIv": userInfo.iv,
-						  "encryptedData": userInfo.encryptedData,
-						  phone: this.phone
+						"code": code,
+						"encryptedIv": userInfo.iv,
+						"encryptedData": userInfo.encryptedData,
+						phone: this.phone
 					},
 				})
 				console.log('res', res)
 				popuper.hideLoading()
-				
-				if(res){
+
+				if (res) {
 					storager.set('token', res.token)
 					console.log('获取token', res.token)
 					pager.relaunchTo('/pages/home/home')
-				} 
+				}
 			}
-			
+
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	
-	
-	.container{
+	.tel-btn {
+		background: #fff;
+		    border: none;
+		    position: absolute;
+		    right: 50rpx;
+		    top: -25rpx;
+		    z-index: 1;
+
+		&::after {
+			border: none;
+		}
+	}
+
+	.container {
 		background-color: #fff;
 		height: 100vh;
 		overflow: hidden;
 	}
-	.header{
+
+	.header {
 		margin-top: 340rpx;
 		display: flex;
 		flex-direction: column;
 		justify-content: center;
 		align-items: center;
 		gap: 33rpx;
-		image{
+
+		image {
 			width: 132rpx;
 			height: 132rpx;
 		}
-		.title{
+
+		.title {
 			font-family: Source Han Sans SC;
 			font-weight: bold;
 			font-size: 38rpx;
 			color: #000000;
 		}
-		
+
 	}
-	.content{
+
+	.content {
+		position: relative;
 		display: flex;
 		justify-content: center;
 		gap: 50rpx;
 		margin-top: 128rpx;
-		.title{
+
+		.title {
 			font-weight: bold;
 			font-size: 34rpx;
 			color: #000000;
 		}
-		input{
+
+		input {
 			font-size: 34rpx;
 		}
 	}
-	.loginBtn{
+
+	.loginBtn {
 		width: 630rpx;
 		height: 88rpx;
 		line-height: 88rpx;
@@ -166,5 +216,4 @@
 		margin-top: 172rpx;
 		font-size: 34rpx;
 	}
-	
-</style>
+</style>
\ No newline at end of file

store/index.js

@@ -24,13 +24,26 @@ const store = createStore({
 		// menu: [],
 		// univerifyErrorMsg: ''
 		actualDepth: '2222', // 孔深
-		actualWaterLevel: '111' // 水深
+		actualWaterLevel: '111', // 水深
+		power1: 0,
+		power2: 0,
+		qiuId:'',
+		connected: false,
 	},
 	mutations: {
 		setMeasureVal(state, testRes){
 			state.actualDepth = testRes.actualDepth
 			state.actualWaterLevel = testRes.actualWaterLevel
+		},
+		setPower(state, testRes){
+			state.power1 = testRes.power1
+			state.power2 = testRes.power2
+			state.qiuId = testRes.qiuId
+		},
+		setLinked(state, flag){
+			state.connected = flag
 		}
+		
 		// login(state, provider) {
 		// 	state.hasLogin = true;
 		// 	state.loginProvider = provider;