Commits · 4dff6ccd8d81266a4dd1c5f2ca793b5123ecae5a · 张宏 / laki_icu_app

27 Jun, 2026 12 commits
- 合并 · 4dff6ccd
  张宏 authored Jun 27, 2026
  
  4dff6ccd
- Merge branch 'master' of http://git.ruanyiit.com/zhanghong/laki_icu_app · cb552db0
  akari authored Jun 27, 2026
  
  cb552db0
- fix: 修复部分蓝牙逻辑 · 5dc83081
  akari authored Jun 27, 2026
  
  5dc83081
- 333333333 · be1b16cd
  张宏 authored Jun 27, 2026
  
  be1b16cd
- 服务器下发mqtt指令控制设备 · 96e4c909
  张宏 authored Jun 27, 2026
  
  96e4c909
- Merge branch 'master' of http://git.ruanyiit.com/zhanghong/laki_icu_app · 6d1704c6
  akari authored Jun 27, 2026
  
  6d1704c6
- fix: 设置第2页显示 · 47ea47f1
  akari authored Jun 27, 2026
  
  47ea47f1
- 333333333333333333333 · 0c5d8ff9
  张宏 authored Jun 27, 2026
  
  0c5d8ff9
- feat: 添加模态确认框 · 3dde4595
  akari authored Jun 27, 2026
  
  3dde4595
- 22222222 · a74d7559
  张宏 authored Jun 27, 2026
  
  a74d7559
- feat: 添加设备校准页面 · d1e20f66
  akari authored Jun 27, 2026
  
  d1e20f66
- 1111 · 907782b8
  张宏 authored Jun 27, 2026
  
  907782b8
26 Jun, 2026 13 commits
- 777777777777 · b5abe691
  张宏 authored Jun 26, 2026
  
  b5abe691
- 66666666666666666666666666 · 95cd69f5
  张宏 authored Jun 26, 2026
  
  95cd69f5
- Merge branch 'master' of http://git.ruanyiit.com/zhanghong/laki_icu_app · c3ea2815
  akari authored Jun 26, 2026
  
  c3ea2815
- fix: 设置页面更新 · 9c940270
  akari authored Jun 26, 2026
  
  9c940270
- 222222222222 · ada160a1
  张宏 authored Jun 26, 2026
  
  ada160a1
- 1111111111111 · 6d5b01b7
  张宏 authored Jun 26, 2026
  
  6d5b01b7
- 1111合并 · d9aad985
  张宏 authored Jun 26, 2026
  
  d9aad985
- Merge branch 'master' of http://git.ruanyiit.com/zhanghong/laki_icu_app · 72cbd0e5
  张宏 authored Jun 26, 2026
```
# Conflicts:
#	lib/utils/event_bus.dart
#	lib/views/monitoring/index/cubit/monitoring_index_cubit.dart
```
  72cbd0e5
- 设备告警、摄像头告警上下行对接联调完成 · eec1450c
  张宏 authored Jun 26, 2026
  
  eec1450c
- fix: 关于本机样式提交 · 43d33868
  akari authored Jun 26, 2026
  
  43d33868
- fix: 修复 · 70a1ac3d
  akari authored Jun 26, 2026
  
  70a1ac3d
- Merge branch 'master' of http://git.ruanyiit.com/zhanghong/laki_icu_app · c701cce4
  akari authored Jun 26, 2026
  
  c701cce4
- feat: 软件设置页面更新 · 862904c4
  akari authored Jun 26, 2026
  
  862904c4
25 Jun, 2026 15 commits
- 6666666666666 · fb9b8d79
  张宏 authored Jun 25, 2026
  
  fb9b8d79
- Merge branch 'master' of http://git.ruanyiit.com/zhanghong/laki_icu_app · 646029b6
  张宏 authored Jun 25, 2026
```
# Conflicts:
#	lib/views/monitoring/index/cubit/monitoring_index_cubit.dart
```
  646029b6
- 对接完成 B端绑定宠物，mqtt下发到设备 · 3e1af08e
  张宏 authored Jun 25, 2026
  
  3e1af08e
- feat: 添加出厂设置页 · 34e710d5
  akari authored Jun 25, 2026
  
  34e710d5
- Merge branch 'master' of http://git.ruanyiit.com/zhanghong/laki_icu_app · d89810d0
  akari authored Jun 25, 2026
  
  d89810d0
- feat: 软件设置子页面 · 59de0036
  akari authored Jun 25, 2026
  
  59de0036
- 22222 · fbfad9ea
  张宏 authored Jun 25, 2026
  
  fbfad9ea
- 重构结构-----------------------------1 · 72d5f64e
  张宏 authored Jun 25, 2026
  
  72d5f64e
- Merge branch 'master' of http://git.ruanyiit.com/zhanghong/laki_icu_app · 00f5040c
  akari authored Jun 25, 2026
  
  00f5040c
- fix: 文件结构调整 · f732ada7
  akari authored Jun 25, 2026
  
  f732ada7
- 222 · a35340e1
  张宏 authored Jun 25, 2026
  
  a35340e1
- Merge branch 'master' of http://git.ruanyiit.com/zhanghong/laki_icu_app · 7a77a537
  akari authored Jun 25, 2026
  
  7a77a537
- feat: 添加软件设置页面 · 050ace38
  akari authored Jun 25, 2026
  
  050ace38
- Merge branch 'master' of http://git.ruanyiit.com/zhanghong/laki_icu_app · 6523c986
  张宏 authored Jun 25, 2026
  
  6523c986
- 1111 · c72e21de
  张宏 authored Jun 25, 2026
  
  c72e21de