WIP: 670完成部分,版本合并 #7

Closed
liubiao wants to merge 36 commits from liubiao/APP:main into main

36 Commits

Author SHA1 Message Date
dfb6f29683 670完成 2025-08-26 15:42:26 +08:00
c9996748eb Revert "提交"
This reverts commit 8d97dcf121.
2025-08-26 15:09:14 +08:00
b1ba355cb2 Merge branch 'liubiao-main' 2025-08-26 08:39:27 +08:00
2c2a75aa02 650完成,并解决了冲突 2025-08-25 17:31:14 +08:00
295f904b10 650完成 2025-08-25 17:28:41 +08:00
7f4fd00937 650完成 2025-08-25 17:15:06 +08:00
bbf55c58f0 650完成,670完成部分 2025-08-25 17:13:13 +08:00
793fe7132b 添加全局蓝牙监听 2025-08-18 16:33:06 +08:00
585bd76a0a 添加全局蓝牙监听 2025-08-18 16:32:25 +08:00
96acaa5d94 添加全局蓝牙监听 2025-08-18 16:31:41 +08:00
5e5bde6934 添加全局蓝牙消息监听 2025-08-18 16:30:44 +08:00
76329756c9 解决版本冲突 2025-08-18 08:49:46 +08:00
535f4728ea 添加全局消息监听 2025-08-18 08:38:28 +08:00
e95b2466e1 6155完成部分协议对接 2025-08-15 16:39:00 +08:00
6ef2bb08b9 合并版本 2025-08-15 11:09:06 +08:00
4df8330738 添加类型路由后,合并版本 2025-08-15 10:52:29 +08:00
84c0a6ae18 跟主分支合并 2025-08-15 09:10:11 +08:00
ceafd10b72 650小bug修复 2025-08-15 09:04:27 +08:00
6b4d47828e 修改main.js,去除原有的蓝牙插件 2025-08-15 09:03:48 +08:00
6650334525 增加6155、650跳转 2025-08-14 17:27:10 +08:00
958a74101e 650全局蓝牙优化 2025-08-14 17:25:53 +08:00
1ed6ca4828 修复650id大小写错误 2025-08-13 14:56:24 +08:00
e39356bbe0 增加绑定蓝牙页面 2025-08-13 14:39:29 +08:00
5eea3a0fff 增加650的跳转 2025-08-13 14:38:57 +08:00
d9a28d0345 添加全局蓝牙 2025-08-12 15:27:14 +08:00
47a9dace85 Merge branch 'main' of http://47.107.152.87:3000/dyf/APP
# Conflicts:
#	pages.json
#	unpackage/dist/dev/app-plus/app-config-service.js
#	unpackage/dist/dev/app-plus/app-service.js
#	unpackage/dist/dev/app-plus/app-view.js
#	unpackage/dist/dev/app-plus/manifest.json
#	utils/request.js
2025-08-11 15:21:37 +08:00
4ab10bb251 BLE发送数据添加安卓苹果不同的逻辑 2025-08-11 14:51:09 +08:00
ca844723fa 6155点阵插件完成。 2025-08-07 08:48:02 +08:00
b3c0b74628 650蓝牙协议更新 2025-08-05 13:14:22 +08:00
a3865e2f26 添加文本行转点阵的插件 2025-07-31 13:54:20 +08:00
4ebdec8dac Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	pages/common/index/index.vue
2025-07-31 13:35:07 +08:00
e5e2aca0c4 Merge branch 'main' of http://47.107.152.87:3000/liubiao/APP
# Conflicts:
#	.gitignore
#	pages/common/index/index.vue
#	unpackage/dist/dev/app-plus/app-config-service.js
#	unpackage/dist/dev/app-plus/app-service.js
#	unpackage/dist/dev/app-plus/app-view.js
#	unpackage/dist/dev/app-plus/manifest.json
#	utils/request.js
2025-07-29 09:40:01 +08:00
40639d2bad 蓝牙握手提交 2025-07-29 09:36:54 +08:00
3c0bf2f770 添加蓝牙通讯握手 2025-07-29 09:34:15 +08:00
0ac0d1998a Merge branch 'main' of http://47.107.152.87:3000/liubiao/APP
# Conflicts:
#	unpackage/dist/dev/app-plus/app-config-service.js
#	unpackage/dist/dev/app-plus/app-service.js
#	unpackage/dist/dev/app-plus/app-view.js
2025-07-15 13:18:13 +08:00
e470726fbd 添加几个函数 2025-07-14 11:42:35 +08:00