|
|
eceaa90010
|
merge upstream
|
2026-04-01 08:45:34 +08:00 |
|
|
|
c64b140754
|
100J蓝牙设备上报问题解决
|
2026-03-31 13:57:21 +08:00 |
|
|
|
d134c67a16
|
Merge branch 'new-20250827' of http://47.107.152.87:3000/liubiao/APP into new-20250827
# Conflicts:
# pages/common/index/index.vue
|
2026-03-30 14:01:07 +08:00 |
|
|
|
37f5047a46
|
完成6075J蓝牙对接
|
2026-03-30 13:17:47 +08:00 |
|
|
|
b99ac04c88
|
优化100j
|
2026-03-26 19:20:52 +08:00 |
|
|
|
c286660a10
|
修复102时间加减异常
|
2026-03-24 12:00:27 +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 |
|
|
|
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 |
|
|
|
ede41f68fd
|
蓝牙小优化，App隐藏时断开设备连接
|
2026-03-16 15:20:18 +08:00 |
|
|
|
5428ead05e
|
100J增加蓝牙封装,在api层直接优先蓝牙拦截逻辑-待验证
|
2026-03-11 14:02:17 +08:00 |
|
|
|
c1c7d4491b
|
添加102联机记录
|
2026-03-05 10:06:37 +08:00 |
|
|
|
2f871ac5cf
|
添加消息推送云函数、消息处理为后续的消息通知做准备
|
2026-02-24 15:39:58 +08:00 |
|
|
|
1aa11a7a38
|
蓝牙设备均添加可主动断开蓝牙
|
2026-02-13 16:42:15 +08:00 |
|
|
|
27097fecc4
|
修复不在控制页时收到蓝牙消息，进入设备页后未同步显示的问题
|
2026-02-13 11:50:30 +08:00 |
|
|
|
fc88bd6f7d
|
一些小优化
|
2026-02-10 15:45:45 +08:00 |
|
|
|
4a7af6d093
|
merge upstream
|
2026-02-07 13:51:43 +08:00 |
|
|
|
3fecf3380a
|
100J续航时间显示优化
|
2026-02-07 09:54:38 +08:00 |
|
|
|
8d84309ce8
|
Merge branch 'new-20250827' of http://47.107.152.87:3000/liubiao/APP into new-20250827
# Conflicts:
# config/index.js
|
2026-02-06 08:34:27 +08:00 |
|
|
|
1fc02b5f5a
|
100J页面功能完成
|
2026-02-05 11:40:56 +08:00 |
|
|
|
7cbdc00ae0
|
再次封装Msg组件，扫码功能增加中转页面
|
2026-02-05 10:15:11 +08:00 |
|
|
|
e3f5ef4c91
|
Merge branch 'main' of http://47.107.152.87:3000/dyf/APP
|
2026-02-03 18:56:26 +08:00 |
|
|
|
6e83056687
|
100J语音上传功能
|
2026-02-03 18:55:48 +08:00 |
|
|
|
b1eab86ba6
|
修改安卓蓝牙未开启定位服务的问题
|
2026-02-03 13:08:49 +08:00 |
|
|
|
5399ecf359
|
调整一下底部小样式
|
2026-01-30 11:51:29 +08:00 |
|
|
|
23fe40902b
|
蓝牙设备添加分享功能
|
2026-01-29 16:52:52 +08:00 |
|
|
|
1e971292cd
|
6155添加分享
|
2026-01-29 14:40:20 +08:00 |
|
|
|
d6ca84170f
|
完成102添加联机日志，报警日志
|
2026-01-28 16:31:34 +08:00 |
|
|
|
78adc0bfed
|
首页更新，添加蓝牙电量显示
|
2026-01-06 16:13:28 +08:00 |
|
|
|
830288e107
|
修复首页蓝牙连接断开时更新状态，修复670 SOS报警时红色提示
|
2025-12-24 14:47:21 +08:00 |
|
|
|
637658a762
|
优化首页的下拉刷新、数据排序、绑定后刷新
|
2025-12-24 10:52:28 +08:00 |
|
|
|
425b7b9cfd
|
修复6155蓝牙上报数据灯光状态不跟随变化的问题。
|
2025-12-19 13:37:14 +08:00 |
|
|
|
4c48f0efec
|
日常小bug修复
|
2025-12-17 09:00:14 +08:00 |
|
|
|
2cf02932e5
|
018A UI部分完成了
|
2025-12-15 10:22:05 +08:00 |
|
|
|
5a558f1ed8
|
修改服务协议和隐私政策，添加注销账号功能
|
2025-12-09 15:23:07 +08:00 |
|
|
|
6414bf3d7a
|
4877保存已选的配组
|
2025-12-03 11:42:05 +08:00 |
|
|
|
e2d07e984f
|
修复670灯光问题
|
2025-12-03 10:20:11 +08:00 |
|
|
|
cd6d529523
|
修复一个Uniapp蓝牙的坑,App首页蓝牙状态功能添加
|
2025-12-02 11:32:56 +08:00 |
|
|
|
6a2688caf4
|
102真机测试完成
|
2025-12-01 16:24:22 +08:00 |
|
|
|
b01ad9d698
|
删除测试App的部分文件,修复loading有时不显示的问题
|
2025-11-25 16:08:45 +08:00 |
|
|
|
ec6deab32a
|
合并主分支
# Conflicts:
# pages/210/deviceControl/index.vue
# pages/650/HBY650.vue
# pages/common/index/index.vue
# unpackage/dist/dev/app-plus/static/tabs/device-HL.png
# unpackage/dist/dev/app-plus/static/tabs/device.png
# unpackage/dist/dev/app-plus/static/tabs/my-HL.png
# unpackage/dist/dev/app-plus/static/tabs/my.png
# utils/BleReceive.js
# utils/loading.js
|
2025-11-21 16:27:32 +08:00 |
|
|
|
864dd59b4c
|
Merge branch 'new-20250827' of http://47.107.152.87:3000/liubiao/APP into new-20250827
# Conflicts:
# pages/6155/deviceDetail.vue
|
2025-11-21 14:21:10 +08:00 |
|
