From d022bd46fd804ecd1c398bdb1848edc5458c4749 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Sat, 12 Oct 2024 16:48:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BA=A2=E5=A4=96=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tpx-physics-scan/tpx-physics-scan.vue     |  27 ++---
 pages.json                                    |   6 ++
 pages/tabBar/mine/mine.vue                    |  13 +--
 pages/user/infraredInfo.vue                   | 102 ++++++++++++++++++
 session/index.js                              |   6 +-
 5 files changed, 126 insertions(+), 28 deletions(-)
 create mode 100644 pages/user/infraredInfo.vue

diff --git a/components/tpx-physics-scan/tpx-physics-scan.vue b/components/tpx-physics-scan/tpx-physics-scan.vue
index d5246f7..1715304 100644
--- a/components/tpx-physics-scan/tpx-physics-scan.vue
+++ b/components/tpx-physics-scan/tpx-physics-scan.vue
@@ -6,24 +6,22 @@
 	import { getSessionSystemInfo } from "@/session"
 	export default {
 		props: {
-			customintent: {
-				default () {
-					return {
-						// !!注意： 不同的设备配置项是不同的
-						scanDownKey: "KEYCODE_SCAN_L_DOWN",
-						actionKey: 'com.android.receive_scan_action',
-						codeKey: "data"
-					}
-				}
-			},
 			value: {
 				default () {
 					return ''
 				}
 			},
 		},
-		data() {
-			return {
+		data() {
+			let { hongWai } = getSessionSystemInfo()
+			let { actionKey = 'com.android.receive_scan_action', codeKey = 'data', scanDownKey = 'KEYCODE_SCAN_L_DOWN' } = hongWai || {}
+			return {
+				customintent: { // 默认配置
+					// !!注意： 不同的设备配置项是不同的
+					scanDownKey,
+					actionKey,
+					codeKey,
+				},
 				receiver: '', 
 				filter: '',
 				codeQueryTag: false,
@@ -84,11 +82,6 @@
 				// #endif
 			},
 			queryCode: function(code) {
-				// let { hongWaiSwitch } = getSessionSystemInfo()
-				// // 红外开启，才可使用该功能
-				// if(!hongWaiSwitch) {
-				// 	return false;
-				// }
 				let that = this;
 				//  #ifdef APP
 				console.log('queryCode');
diff --git a/pages.json b/pages.json
index 7c15551..a4ac77f 100644
--- a/pages.json
+++ b/pages.json
@@ -62,6 +62,12 @@
 			"style": {
 				"navigationBarTitleText": "修改密码"
 			}
+		},
+		{
+			"path": "pages/user/infraredInfo",
+			"style": {
+				"navigationBarTitleText": "红外扫码配置"
+			}
 		},
 		{
 			"path": "pages/user/withdraw",
diff --git a/pages/tabBar/mine/mine.vue b/pages/tabBar/mine/mine.vue
index 7d5ce91..f613e33 100644
--- a/pages/tabBar/mine/mine.vue
+++ b/pages/tabBar/mine/mine.vue
@@ -101,15 +101,15 @@
 							</u-row>
 						</u-row>
 						<u-line></u-line>
-						<!-- <u-row custom-style="padding: 30rpx;" justify="between">
+						<u-row @click="goto(`user/infraredInfo`)" custom-style="padding: 30rpx;" justify="between">
 							<u-row>
 								<u-image :src="getCdnUrl(`mine/sao.png`)" height="34" width="34"></u-image>
-								<u-text margin="0 0 0 30rpx" text="红线扫描模式" size="28" color="#333"></u-text>
+								<u-text margin="0 0 0 30rpx" text="红线扫描" size="28" color="#333"></u-text>
 							</u-row>
 							<u-row>
-								<u-switch v-model="hongWaiSwitch" @change="handleHongWaiChange" active-color="#B12D29" size="34"></u-switch>
+								<u-icon name="arrow-right" size="32" color="#333"></u-icon>
 							</u-row>
-						</u-row> -->
+						</u-row>
 						<u-line></u-line>
 						<u-row @click="goto(`user/updatePassword`)" custom-style="padding: 30rpx;" justify="between">
 							<u-row>
@@ -170,7 +170,6 @@
 		props: {
 		},
 		data() {
-			let { hongWaiSwitch } = getSessionSystemInfo()
 			return {
 				staticInfo: {
 					commStat: {},
@@ -180,7 +179,6 @@
 				curAppVersion: '',
 				chkVRes: {},
 				curDeviceId: '',
-				hongWaiSwitch, 
 			}
 		},
 		onShareAppMessage() {
@@ -221,9 +219,6 @@
 				// TODO
 				this.showToast('清除成功')
 			},
-			handleHongWaiChange(val){
-				setSessionSystemInfo({ hongWaiSwitch: val })
-			}
 			
 		}
 	}
diff --git a/pages/user/infraredInfo.vue b/pages/user/infraredInfo.vue
new file mode 100644
index 0000000..c1208dd
--- /dev/null
+++ b/pages/user/infraredInfo.vue
@@ -0,0 +1,102 @@
+<template>
+	<tpx-page>
+		<tpx-layout>
+			<template v-slot:body>
+				<view class="com-jianju pos-rlt pb-30" style="padding-top: 2rpx;">
+					
+					<view class="blcok-white radius-20">
+						<view class="">
+							
+							<view class="">
+								<view class="mb-10 font-weight">监听扫码事件key</view>
+								<tpx-input v-model:value="submitParam.actionKey" placeholder="actionKey"></tpx-input>
+							</view>
+							
+							<view class="mt-30">
+								<view class="mb-10 font-weight">扫码结果响应key</view>
+								<tpx-input v-model:value="submitParam.codeKey" placeholder="codeKey"></tpx-input>
+							</view>
+							
+						</view>
+					</view>
+				</view>
+			</template>
+			<template v-slot:footer>
+				<view class="blcok-white-noradius">
+					<u-button @click="handleSubmit()" type="primary" size="large" shape="circle" 
+						custom-style="height:80rpx;font-size: 30rpx;"
+					>确定</u-button>
+				</view>
+			</template>
+		</tpx-layout>
+	</tpx-page>
+</template>
+
+<script>
+	import { USERKEY } from "@/store/actionKey"
+	import { encrypt } from "@/common/libs/jsencrypt_utils"
+	import { checkParams } from "@/common/validate"
+	import { setSessionSystemInfo, getSessionSystemInfo } from "@/session"
+	
+	export default {
+		props: {
+		},
+		computed: {
+
+		},
+		data() {
+			let { hongWai } = getSessionSystemInfo()
+			return {
+				queryOption: {
+				
+				},
+				submitParam: {
+					...(hongWai || {}),
+				},
+				submitValidConfig: {
+					actionKey: { required: true, requiredMsg: 'actionKey不能为空' },
+					codeKey: { required: true, requiredMsg: 'codeKey不能为空' },
+				},
+			}
+		},
+		onShareAppMessage() {
+			return {
+				// title: '',
+				// path: 'TODO'
+			}
+		},
+		onLoad(queryOption) {
+			this.queryOption = queryOption
+			this.initData();
+		},
+		onUnload() {
+
+		},
+		methods: {
+			async initData() {
+				
+			},
+			async handleSubmit() {
+				await checkParams(this.submitParam, this.submitValidConfig)
+				setSessionSystemInfo({
+					hongWai: this.submitParam
+				})
+				this.showToast("保存成功")
+				this.goBack()
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import '@/common/uni-nvue.scss';
+
+	page {
+		background-color: #F6F6F6;
+		height: 100% !important;
+	}
+</style>
+<style scoped lang="scss">
+	
+</style>
\ No newline at end of file
diff --git a/session/index.js b/session/index.js
index 6239e3e..70cd22a 100644
--- a/session/index.js
+++ b/session/index.js
@@ -38,7 +38,9 @@ export const getSessionLoginInfo = ()=> {
 export const setSessionSystemInfo = (val = {})=> {
 	let oldVal = getSessionSystemInfo()
 	// {
-	// 	hongWaiSwitch: false, //  红外扫描
+	// 	hongWai: { //  红外扫描
+		
+	//}, 
 	// 	lastActiveTime: 时间戳, //  上次活跃时间戳
 	// }
 	uni.setStorageSync(SYSTEM_INFO_KEY, { ...oldVal, ...val})
@@ -46,6 +48,6 @@ export const setSessionSystemInfo = (val = {})=> {
 
 export const getSessionSystemInfo = ()=> {
 	return uni.getStorageSync(SYSTEM_INFO_KEY) || {
-		hongWaiSwitch: false
+		hongWai: { }
 	}
 }