From 4fe62d1f086ed08ddd38609ae32014749fb9481b Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Mon, 13 May 2024 00:49:19 +0800
Subject: [PATCH] uu

---
 .../tpx-bluetooth-print/render-template.vue   |  13 +-
 components/tpx-bluetooth/tpx-bluetooth.vue    | 130 +++++++++++-------
 pages/print/courierNote.vue                   |   2 +-
 session/index.js                              |  11 +-
 session/key.js                                |   3 +-
 5 files changed, 99 insertions(+), 60 deletions(-)

diff --git a/components/tpx-bluetooth-print/render-template.vue b/components/tpx-bluetooth-print/render-template.vue
index 13bb4f3..72847c3 100644
--- a/components/tpx-bluetooth-print/render-template.vue
+++ b/components/tpx-bluetooth-print/render-template.vue
@@ -1,7 +1,7 @@
 <template>
-	<tpx-bluetooth v-model:value="blueToothData">
+	<tpx-bluetooth ref="curBlueTooth">
 		<template v-slot:button>
-			<u-button @click="handlePrint" type="primary" :disabled="!(blueToothData.deviceId && blueToothData.serviceId && blueToothData.characteristicId)">打印</u-button>
+			<u-button @click="handlePrint" type="primary">确认打印</u-button>
 		</template>
 		<template v-slot:content>
 			<view class="pt-20 pb-10">打印内容</view>
@@ -52,11 +52,6 @@ export default {
 			imgData: '',
 			percentage: 0, // 打印进度 
 			threshold: 200, // 阈值(值越大,图片打印越深)
-			blueToothData: {
-				deviceId: '',
-				serviceId: '',
-				characteristicId: ''
-			}
 		}
 	},
 	mounted () {
@@ -71,8 +66,10 @@ export default {
 		// 打印
 		async handlePrint(){
 			const that = this
+			let { deviceId, serviceId, characteristicId } = this.$refs.curBlueTooth.getInstance()
+			
 			const opt = {
-			    ...this.blueToothData,
+			    ...{ deviceId, serviceId, characteristicId },
 			    onProgress: (percentage) => {
 					console.log("打印进度====", percentage)
 			        that.percentage = percentage
diff --git a/components/tpx-bluetooth/tpx-bluetooth.vue b/components/tpx-bluetooth/tpx-bluetooth.vue
index 26359c1..5b5d574 100644
--- a/components/tpx-bluetooth/tpx-bluetooth.vue
+++ b/components/tpx-bluetooth/tpx-bluetooth.vue
@@ -1,5 +1,5 @@
 <template>
-	<tpx-layout>
+	<tpx-layout v-if="showConnectPage">
 		<template v-slot:header>
 			<view class="blcok-white" style="margin-top: 0;">
 				<view >
@@ -27,8 +27,8 @@
 					</u-steps>
 				</view>
 			</view>
-			
 		</template>
+		
 		<template v-slot:body>
 			<view class="blcok-white">
 				<view v-if="curTab == 0">
@@ -90,15 +90,16 @@
 						</view>
 					</template>	
 				</view>
-				
 				<slot name="content"></slot>
 			</view>
 		</template>
 	</tpx-layout>
+	
 </template> 
 
 <script>
 import { showLoading, showToast, hideLoading }	from "@/common/untool"
+import { getSessionBluetoothInfo, setSessionBluetoothInfo } from "@/session"
 
 export default {
 	computed: {
@@ -113,68 +114,91 @@ export default {
 	},
 	watch: {
 		deviceId(val){
-			this.value.deviceId = val
-			this.$emit('update:value', this.value)
+			updateBlueSessionInfo()
 		},
 		serviceId(val){
-			this.value.serviceId = val
-			this.$emit('update:value', this.value)
+			updateBlueSessionInfo()
 		},
 		characteristicId(val){
-			this.value.characteristicId = val
-			this.$emit('update:value', this.value)
+			updateBlueSessionInfo()
 		}
 	},
 	props:{
-		value: {
-			default () {
-				return {}
-			}
-		},
+		
 	},
 	data () {
+		let { deviceId, serviceId, characteristicId } = getSessionBluetoothInfo()
 		return {
+			showConnectPage: true,
 			canvasId: 'shareCanvas',
 			canvas_width: 240,
 			canvas_height: 240,
 			curTab: 0,
 			searchLoading: false,
 			devices: [],
-			deviceId: this.value?.deviceId,
+			deviceId,
 			serverList: [],
-			serviceId: this.value?.deviceId,
+			serviceId,
 			characteristics: [],
-			characteristicId: this.value?.deviceId,
+			characteristicId,
 		}
 	},
-	mounted () {
+	async mounted () {
 		// 初始化蓝牙模块
-		this.openBluetoothAdapter()
-		// 自动搜索设备
-		this.discoveryPrinter()
+		await this.openBluetoothAdapter()
+		this.autoConnect()
 	},
 	unmounted() {
 		this.stopDiscoveryPrinter()
-		this.closeBluetoothAdapter()
+		// this.closeBluetoothAdapter()
 	},
 	methods: {
+		updateBlueSessionInfo() {
+			let { deviceId, serviceId, characteristicId } = this
+			setSessionBluetoothInfo({ deviceId, serviceId, characteristicId })
+		},
+		// 自动连接历史蓝牙配置
+		async autoConnect() {
+			let conSta = await this.checkConnectStat()
+			// 自动连接
+			if(!conSta) {
+				this.discoveryPrinter()
+			}
+			return true
+		},
+		
+		// 检查蓝牙 缓存连接状态 【获取不到characteristics说明连接已经过期】
+		async checkConnectStat(){
+			let bl = false
+			try{
+				await this.getBLEDeviceCharacteristics()
+				bl = true
+			}catch(e){
+			}
+			return bl
+		},
 		changeTab(type) {
 			this.curTab = type
 		},
 		openBluetoothAdapter () {
 			var _this = this
-			uni?.openBluetoothAdapter?.({
-				complete (e) {
-					console.log(e);
-					if (!e.errCode) {
-						console.log('初始化完成')
-					} else if (e.errCode == 10001) {
-						showToast('请打开手机蓝牙')
-					} else {
-						console.log('openBluetoothAdapter：error=========', e.errMsg)
-						showToast(e.errMsg)
+			return new Promise((resolve, reject)=> {
+				uni?.openBluetoothAdapter?.({
+					complete (e) {
+						console.log(e);
+						if (!e.errCode) {
+							resolve()
+							console.log('初始化完成')
+						} else if (e.errCode == 10001) {
+							reject(e)
+							showToast('请打开手机蓝牙')
+						} else {
+							reject(e)
+							console.log('openBluetoothAdapter：error=========', e.errMsg)
+							showToast(e.errMsg)
+						}
 					}
-				}
+				})
 			})
 		},
 		// 开始搜寻附近的蓝牙外围设备
@@ -183,21 +207,26 @@ export default {
 			_this.devices = []
 			_this.searchLoading = true
 			_this.curTab = 0
-			uni?.startBluetoothDevicesDiscovery?.({
-				complete (e) {
-					console.log(e)
-					if (e.errMsg == "startBluetoothDevicesDiscovery:ok") {
-						// ArrayBuffer转16进度字符串示例
-						uni.onBluetoothDeviceFound(devices => {
-							console.log("========devices=====", devices)
-							let curDvs = devices?.devices?.[0] || {}
-							// 过滤重复的
-							if(curDvs.deviceId && _this.devices.map(t=> t.deviceId).indexOf(curDvs.deviceId) == -1) {
-								_this.devices.push(curDvs)
-							}
-						})
+			return new Promise((resolve, reject)=> {
+				uni?.startBluetoothDevicesDiscovery?.({
+					complete (e) {
+						console.log(e)
+						if (e.errMsg == "startBluetoothDevicesDiscovery:ok") {
+							resolve()
+							// ArrayBuffer转16进度字符串示例
+							uni.onBluetoothDeviceFound(devices => {
+								console.log("========devices=====", devices)
+								let curDvs = devices?.devices?.[0] || {}
+								// 过滤重复的
+								if(curDvs.deviceId && _this.devices.map(t=> t.deviceId).indexOf(curDvs.deviceId) == -1) {
+									_this.devices.push(curDvs)
+								}
+							})
+						} else {
+							reject()
+						}
 					}
-				}
+				})
 			})
 		},
 		// 停止搜寻附近的蓝牙外围设备
@@ -294,7 +323,7 @@ export default {
 		},
 		getBLEDeviceCharacteristics () {
 			var _this = this
-			return new Promise((resolve)=> {
+			return new Promise((resolve, reject)=> {
 				showLoading('正在搜索特征值')
 				uni.getBLEDeviceCharacteristics({
 					// 这里的 deviceId 需要已经通过 createBLEConnection 与对应设备建立链接
@@ -310,12 +339,15 @@ export default {
 					},
 					fail:(res)=>{
 						hideLoading()
-						resolve()
+						reject()
 						console.log(res)
 					}
 				})
 			})
 		},
+		getInstance() {
+			return this
+		}
 	}
 }
 </script>
diff --git a/pages/print/courierNote.vue b/pages/print/courierNote.vue
index 0eecbc9..333b783 100644
--- a/pages/print/courierNote.vue
+++ b/pages/print/courierNote.vue
@@ -96,7 +96,7 @@
 							
 							<tpx-checkitems :list="resData.list" v-model:value="submitParam.billCode" v-slot="dlCurrent" type="multiple" 
 							>
-								<view slot class="yditem mt-20">
+								<view slot class="yditem">
 									<u-row>
 										<u-col span="8">
 											<u-row>
diff --git a/session/index.js b/session/index.js
index af54f12..0e8d93c 100644
--- a/session/index.js
+++ b/session/index.js
@@ -1,4 +1,4 @@
-import { XTOKEN_KEY, USERINFO_KEY } from "./key"
+import { XTOKEN_KEY, USERINFO_KEY, BLUETOOTH_KEY } from "./key"
 
 export const setSessionXToken = (val = '')=> {
 	uni.setStorageSync(XTOKEN_KEY, val)
@@ -14,4 +14,13 @@ export const setSessionUserInfo = (val = {})=> {
 
 export const getSessionUserInfo = ()=> {
 	return uni.getStorageSync(USERINFO_KEY) || {}
+}
+
+
+export const setSessionBluetoothInfo = (val = {})=> {
+	uni.setStorageSync(BLUETOOTH_KEY, val)
+}
+
+export const getSessionBluetoothInfo = ()=> {
+	return uni.getStorageSync(BLUETOOTH_KEY) || {}
 }
\ No newline at end of file
diff --git a/session/key.js b/session/key.js
index 0ee9e79..3982912 100644
--- a/session/key.js
+++ b/session/key.js
@@ -1,2 +1,3 @@
 export const XTOKEN_KEY = 'XTOKEN_KEY'
-export const USERINFO_KEY = 'USERINFO_KEY'
\ No newline at end of file
+export const USERINFO_KEY = 'USERINFO_KEY'
+export const BLUETOOTH_KEY = 'BLUETOOTH_KEY'
\ No newline at end of file