1975 Commits

Author SHA1 Message Date
50d7ea78d9 fix:完善视频日志、操作记录页面功能 2025-01-10 14:46:51 +08:00
6ecf89088e Merge remote-tracking branch 'origin/develop' into develop_liyi
# Conflicts:
#	lib/blue/io_gateway/io_gateway_configuringWifi.dart
2025-01-09 14:11:04 +08:00
323c99b27e fix:完善对讲流程、增加监控功能 2025-01-09 14:10:10 +08:00
魏少阳
fd3d721881 Merge branch 'develop' into build-addGateway-20240814 2025-01-08 19:36:35 +08:00
魏少阳
a61ebda710 fix: 1、修复wifi锁、网关配网传入的gatewayJson长度1字节改为2字节bug 2025-01-08 19:35:42 +08:00
Liuyf
79cc72efdc Merge branch 'master' into develop 2025-01-08 18:18:50 +08:00
Liuyf
d2f54efded fix: umeng 隐私合规问题修复 2025-01-08 18:17:07 +08:00
7943aef0c2 Merge remote-tracking branch 'origin/develop' into develop_liyi 2025-01-08 18:16:45 +08:00
魏少阳
ff6c5524a3 Merge remote-tracking branch 'origin/develop' into develop 2025-01-08 18:11:22 +08:00
魏少阳
a90a6a387a Merge branch 'develop' into build-addGateway-20240814 2025-01-08 18:05:43 +08:00
Liuyf
22fda75602 Merge branch 'release' 2025-01-08 18:05:03 +08:00
Liuyf
daeb0205d6 Merge branch 'develop' into release 2025-01-08 18:04:50 +08:00
Liuyf
cf5f23619d fix: umeng 隐私合规问题修复 2025-01-08 18:04:25 +08:00
魏少阳
f21e49ae68 fix: 1、修复wifi锁、网关配网传入的gatewayJson长度1字节改为2字节 2025-01-08 18:03:30 +08:00
Liuyf
357a8661dd Merge branch 'release' v1.1.4 2025-01-08 17:20:17 +08:00
Liuyf
6228f17fb8 Merge branch 'develop' into release 2025-01-08 17:20:00 +08:00
Liuyf
d099e81e92 fix: umeng 隐私合规问题修复 2025-01-08 17:19:07 +08:00
Liuyf
3159f5d02e Merge branch 'release' v1.1.3 2025-01-08 14:59:57 +08:00
Liuyf
108bc6944b Merge branch 'develop' into release 2025-01-08 14:59:35 +08:00
Liuyf
6e50905f8b fix: umeng 隐私合规问题修复 2025-01-08 14:58:58 +08:00
Liuyf
d7eccec7f3 Merge branch 'release' v1.1.2 2025-01-08 11:53:46 +08:00
Liuyf
6776992b90 Merge branch 'develop' into release 2025-01-08 11:53:30 +08:00
Liuyf
25e6a906de fix: google play不允许清单文件重复列举申请相同权限 2025-01-08 11:52:43 +08:00
0b65d905b9 Merge remote-tracking branch 'origin/develop' into develop_liyi 2025-01-08 11:30:53 +08:00
Liuyf
ca9e5d8ecd Merge branch 'release' v1.1.1 2025-01-08 11:09:24 +08:00
Liuyf
e85ad4698a Merge branch 'develop' into release 2025-01-08 11:09:12 +08:00
Liuyf
b7ed39388a fix: umeng初始化隐私合规问题修复。 2025-01-08 11:08:26 +08:00
92fcf4a4fa fix:完善对讲流程、增加蓝牙透传消息指令 2025-01-08 09:14:29 +08:00
Liuyf
56515adb41 Merge branch 'release' v1.1.0 2025-01-08 08:51:11 +08:00
Liuyf
f1447d8a94 Merge branch 'develop' into release 2025-01-08 08:50:55 +08:00
Liuyf
bb1cab3b00 fix: umeng初始化隐私合规问题修复 2025-01-07 20:03:47 +08:00
Liuyf
848b89841c Merge branch 'release' 2025-01-07 16:45:35 +08:00
Liuyf
5dd0423c59 fix: 隐私合规问题修复 2025-01-07 16:44:55 +08:00
Liuyf
64d1cd902b fix: 隐私合规问题修复 2025-01-07 16:43:00 +08:00
c16c9be4c6 fix:增加p2p调试命令 2025-01-06 09:52:14 +08:00
Liuyf
3aea843bfc Merge branch 'release' 2025-01-03 15:32:07 +08:00
魏少阳
404fcb7a8d Merge branch 'develop' into build-addGateway-20240814 2025-01-03 14:36:22 +08:00
魏少阳
c5e473d24e fix: 1、修复繁体台湾翻译之后简体中文较多问题 2025-01-03 14:35:12 +08:00
Liuyf
0ee31a0f62 ci: 修复gitlab域名更换后无法通过域名推送tag 2025-01-03 11:45:26 +08:00
3bd96e58b9 Merge remote-tracking branch 'origin/develop' into develop_liyi
# Conflicts:
#	lib/network/api_provider_base.dart
2025-01-03 11:37:59 +08:00
Liuyf
8159c7ceda ci: 修复gitlab域名更换后无法通过域名推送tag 2025-01-03 11:35:58 +08:00
Liuyf
830d4ae938 fix: 修复alexa 支持语言列表为空问题 2025-01-02 18:52:25 +08:00
Liuyf
42f873d5c3 fix: 1、添加设备功能入口开发 2025-01-02 18:14:53 +08:00
魏少阳
687eea4031 fix: 1、添加设备功能入口开发 2025-01-02 17:52:24 +08:00
魏少阳
00a6a113a9 fix: 1、修复国际化bug 2025-01-02 16:15:41 +08:00
魏少阳
de1ec20ef5 Merge branch 'develop' into build-addGateway-20240814 2025-01-02 10:48:59 +08:00
ff9564b55a fix:完善各个对讲状态下的逻辑 2025-01-02 10:30:07 +08:00
01885f8a7c fix:调整对讲请求未接听时的超时时间为60秒 2025-01-02 10:29:23 +08:00
87ed175fed fix:整理对讲状态、增加视频页面的旋转角度 2025-01-02 10:28:56 +08:00
4044b9b1e1 fix:取消接听中状态 2025-01-02 10:27:59 +08:00