1
0
forked from dyf/APP
Commit Graph

425 Commits

Author SHA1 Message Date
b99ac04c88 优化100j 2026-03-26 19:20:52 +08:00
e7b40dbed6 修复100J 2026-03-26 15:39:50 +08:00
a18b2b81e8 100J修复使用4G还提示蓝牙的文案异常 2026-03-26 15:12:16 +08:00
6715384b0a 100J修复蓝牙超时问题 2026-03-25 10:08:28 +08:00
4e518e7340 优化100J代码 2026-03-24 16:26:37 +08:00
1598065457 更新100J代码 2026-03-24 16:18:17 +08:00
4eb118b42c Merge pull request 'new-20250827' (#40) from liubiao/APP:new-20250827 into main
Reviewed-on: dyf/APP#40
2026-03-24 15:59:44 +08:00
5613f0fb8a merge upstream 2026-03-24 15:58:24 +08:00
bdc9ad8fcd Merge branch 'new-20250827' of http://47.107.152.87:3000/liubiao/APP into new-20250827 2026-03-24 15:57:34 +08:00
89817525ab 修复100J频繁提示电量低、蓝牙状态的问题 2026-03-24 15:57:25 +08:00
7cfbfdfce3 修复100J问题 2026-03-24 15:55:47 +08:00
a7e1809fc8 100J加固蓝牙相关逻辑 2026-03-24 15:47:24 +08:00
7158293d8d 修复100J低电量提示可能重复 2026-03-24 15:30:30 +08:00
ded31de046 Merge pull request 'new-20250827' (#39) from liubiao/APP:new-20250827 into main
Reviewed-on: dyf/APP#39
2026-03-24 15:18:48 +08:00
c286660a10 修复102时间加减异常 2026-03-24 12:00:27 +08:00
5163491ea3 merge upstream 2026-03-20 14:49:45 +08:00
0e66d375fc 100J增加物联按键蓝牙同步状态到APP 2026-03-20 09:09:49 +08:00
1fcaf8a9a4 体验性小优化 2026-03-19 17:25:41 +08:00
75b9f27965 merge upstream 2026-03-19 15:49:38 +08:00
bdea9dac4b 100J上传音频格式限制 2026-03-19 15:48:44 +08:00
444b3b35ac 100J加个限制格式提示 2026-03-19 15:46:53 +08:00
3e19646ed7 merge upstream 2026-03-19 15:27:44 +08:00
44607f9b0c 100J更新兼容性 2026-03-19 15:18:59 +08:00
23b72ef9ae 蓝牙按工厂要求修改,app隐藏时断开设备蓝牙,已配对设备显示实际连接的设备
# Conflicts:
#	App.vue
2026-03-19 15:14:32 +08:00
84feb9f1e8 合并代码 2026-03-19 14:37:58 +08:00
3a9de3078c 处理100J设备蓝牙问题 2026-03-19 14:36:17 +08:00
ac59e28281 Merge branch 'main' of http://47.107.152.87:3000/dyf/APP 2026-03-19 12:40:53 +08:00
f943bb9b09 更新100j蓝牙 2026-03-19 12:37:29 +08:00
dyf
a2680fc14d Merge pull request 'new-20250827 解决合并冲突' (#38) from liubiao/APP:new-20250827 into main
Reviewed-on: dyf/APP#38
2026-03-19 11:42:40 +08:00
ebe126d826 完善100J蓝牙 2026-03-19 11:41:17 +08:00
f86e6a4fb7 解决合并冲突
# Conflicts:
#	utils/BleReceive.js
2026-03-19 09:22:28 +08:00
bb0610ff1a Merge branch 'new-20250827' of http://47.107.152.87:3000/liubiao/APP into new-20250827 2026-03-19 09:14:51 +08:00
61f00e1cbf 修改7305人员信息取模组件,文本自动居中 2026-03-19 09:13:48 +08:00
a9848bd299 100J蓝牙上传语音待验证 2026-03-18 18:09:31 +08:00
729f782c42 merge upstream 2026-03-18 15:24:52 +08:00
2c9197833b 100J还差语音文件蓝牙上传 2026-03-18 15:04:49 +08:00
141267b25f 1 2026-03-17 18:03:43 +08:00
ede41f68fd 蓝牙小优化,App隐藏时断开设备连接 2026-03-16 15:20:18 +08:00
7512b7211c Merge branch 'main' of http://47.107.152.87:3000/dyf/APP 2026-03-11 14:09:20 +08:00
fba175a9a5 100J修正设备响应解析-待验证 2026-03-11 14:08:14 +08:00
5428ead05e 100J增加蓝牙封装,在api层直接优先蓝牙拦截逻辑-待验证 2026-03-11 14:02:17 +08:00
dyf
64b7914d23 Merge pull request 'new-20250827 批量报警、批量发送消息,分供应商处理' (#37) from liubiao/APP:new-20250827 into main
Reviewed-on: dyf/APP#37
2026-03-10 17:39:39 +08:00
b42394c083 Merge branch 'liubiao-new-20250827' 2026-03-10 17:38:10 +08:00
3b5aae87f4 批量报警、批量发送消息,多个供应商的协议作区分 2026-03-10 17:27:11 +08:00
df19c437aa Merge branch 'liubiao-new-20250827' 2026-03-10 14:47:09 +08:00
2be522977c 批量报警、批量发送消息,分供应商处理 2026-03-10 14:07:13 +08:00
4cacdbe7f7 Merge branch 'new-20250827' of http://47.107.152.87:3000/liubiao/APP into new-20250827 2026-03-09 16:10:59 +08:00
1eae2d1d91 更新100、670电量低的提示方式为监听式 2026-03-09 16:10:48 +08:00
9904cb3634 merge upstream 2026-03-09 16:09:56 +08:00
1e3a75fe5c Merge branch 'liubiao-new-20250827' 2026-03-07 14:54:41 +08:00