|
|
2adc73cdab
|
尝试解决主分支冲突
|
2025-09-24 08:35:34 +08:00 |
|
|
|
ab696c3076
|
670小问题修复
|
2025-09-23 16:57:31 +08:00 |
|
|
|
97cbb25753
|
670添加分享的权限
|
2025-09-23 13:54:38 +08:00 |
|
|
|
f3c21c2e1b
|
Merge branch 'new-20250827' of http://47.107.152.87:3000/liubiao/APP into new-20250827
# Conflicts:
# pages/670/HBY670.vue
|
2025-09-23 12:00:43 +08:00 |
|
|
|
f8f199ad32
|
670控制页加入从分享进入时的权限控制
|
2025-09-23 11:56:35 +08:00 |
|
|
|
50373f407d
|
650/670增加关闭探测功能，删除一些跟供应商调试的页面
|
2025-09-23 08:36:21 +08:00 |
|
|
|
1cd9853f2f
|
自动更新，从多个接口更新，避免单一的接口挂掉了无法更新
|
2025-09-19 13:46:33 +08:00 |
|
|
|
482a47bd4f
|
蓝牙增加断开重连、换设备后可以去再次绑定
|
2025-09-19 12:01:06 +08:00 |
|
|
|
b83df1cfbf
|
修改mqtt，根据http 或者http动态修改ws wss访问地址
|
2025-09-19 10:33:42 +08:00 |
|
|
|
ff5e363ccc
|
Merge branch 'new-20250827' of http://47.107.152.87:3000/liubiao/APP into new-20250827
|
2025-09-19 08:25:37 +08:00 |
|
|
|
cb44810c6b
|
670加入机器状态、设备详情加接口请求
|
2025-09-18 17:31:40 +08:00 |
|
|
|
9be161d8aa
|
注销账户功能页面开发
|
2025-09-18 16:46:32 +08:00 |
|
|
|
da9a9f4874
|
完成7305，添加在详情页去绑定蓝牙设备
|
2025-09-17 15:21:20 +08:00 |
|
|
|
ed8f02fb39
|
解决订阅消息有时候会永远pending的问题
|
2025-09-16 17:30:46 +08:00 |
|
|
|
6331190f0d
|
增加蓝牙设备人员信息登记上传
|
2025-09-16 14:51:23 +08:00 |
|
|
|
778594574b
|
修改App图标、名称、蓝牙加入断线重连
|
2025-09-16 11:37:06 +08:00 |
|
|
|
9c9c684ab6
|
650添加应答,app图标添加
|
2025-09-15 11:55:44 +08:00 |
|
|
|
8108744d56
|
Merge branch 'liubiao-new-20250827'
|
2025-08-30 14:37:40 +08:00 |
|
|
|
c537e17780
|
修改设备实时状态参数，同后端一起修改
|
2025-08-30 14:34:44 +08:00 |
|
|
|
9846fe2315
|
添加报警功能
|
2025-08-28 14:05:06 +08:00 |
|
|
|
c2aa8bfa2f
|
移植6155、650、670
|
2025-08-27 11:06:49 +08:00 |
|
|
|
057858a132
|
加了几个文件
|
2025-08-27 10:32:13 +08:00 |
|
|
|
cd912b861e
|
670完成
|
2025-08-27 09:08:59 +08:00 |
|
|
|
dfb6f29683
|
670完成
|
2025-08-26 15:42:26 +08:00 |
|
|
|
2c2a75aa02
|
650完成，并解决了冲突
|
2025-08-25 17:31:14 +08:00 |
|
|
|
bbf55c58f0
|
650完成，670完成部分
|
2025-08-25 17:13:13 +08:00 |
|
|
|
f8a02b7f9f
|
封装实时接口，请求，共多个页面调用
|
2025-08-19 11:48:12 +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 |
|
|
|
fe5545b642
|
优化mqtt协议代码
|
2025-08-16 13:59:17 +08:00 |
|
|
|
e95b2466e1
|
6155完成部分协议对接
|
2025-08-15 16:39:00 +08:00 |
|
|
|
6ef2bb08b9
|
合并版本
|
2025-08-15 11:09:06 +08:00 |
|
|
|
8e1a37dbea
|
修改了列表跳转方式
|
2025-08-15 10:30:08 +08:00 |
|
|
|
84c0a6ae18
|
跟主分支合并
|
2025-08-15 09:10:11 +08:00 |
|
|
|
958a74101e
|
650全局蓝牙优化
|
2025-08-14 17:25:53 +08:00 |
|
|
|
106320bfd5
|
更新mqtt
|
2025-08-14 17:04:12 +08:00 |
|
|
|
e56bbfe674
|
优化设备控制，提交后，实时获取设备返回状态信息
|
2025-08-14 13:46: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 |
|
|
|
0d13f84744
|
分享管理修复bug,210历史记录功能开发
|
2025-08-09 17:59:09 +08:00 |
|
|
|
00e0a4bbd1
|
修复mqtt客户端问题
|
2025-08-09 10:39:05 +08:00 |
|
|
|
c6babaa262
|
进度条加载
|
2025-08-09 09:47:50 +08:00 |
|
|
|
3ab58ac29e
|
修复6170测试中出现的bug
|
2025-08-08 17:34:46 +08:00 |
|
|
|
ca844723fa
|
6155点阵插件完成。
|
2025-08-07 08:48:02 +08:00 |
|
|
|
77d1fdbe64
|
210设备管控页弹框功能
|
2025-08-06 18:33:33 +08:00 |
|
|
|
b3c0b74628
|
650蓝牙协议更新
|
2025-08-05 13:14:22 +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 |
|
