|
|
a422f48c22
|
Merge remote-tracking branch 'origin/develop' into develop_liyi
|
2025-02-08 14:39:23 +08:00 |
|
Liuyf
|
0f246f3067
|
fix：xhj，sky 微信相关配置分离
|
2025-02-07 15:27:06 +08:00 |
|
“DaisyWu”
|
2ee6782714
|
Merge branch 'develop_liyi' of code-internal.star-lock.cn:StarlockTeam/app-starlock into develop_liyi
# Conflicts:
# pubspec.yaml
|
2025-01-21 15:14:22 +08:00 |
|
“DaisyWu”
|
f20a1efb50
|
feat: 补充提交
|
2025-01-21 15:12:44 +08:00 |
|
|
|
e990a0806b
|
fix:增加视频日志中的视频缩略图
|
2025-01-21 14:09:21 +08:00 |
|
|
|
4f6781a0b0
|
fix:视频日志下载时需要增加dio依赖
|
2025-01-21 10:26:15 +08:00 |
|
|
|
b754d56b28
|
Merge remote-tracking branch 'origin/develop' into develop_liyi
# Conflicts:
# lib/main.dart
# lib/tools/storage.dart
|
2025-01-14 18:00:08 +08:00 |
|
|
|
4e7af4fdf8
|
fix:调整发送g711音频数据
|
2025-01-14 17:58:24 +08:00 |
|
|
|
df71e2ceb7
|
fix:调整发送g711音频数据
|
2025-01-14 17:57:33 +08:00 |
|
Liuyf
|
4d6ca7ac20
|
fix：修复android平台无法显示地图和定位信息问题
|
2025-01-13 16:52:21 +08:00 |
|
Liuyf
|
9bfac8fe20
|
Merge branch 'develop' into feat_devops
|
2025-01-11 16:33:25 +08:00 |
|
|
|
63eb726c3b
|
fix:增加对讲时的开锁命令
|
2025-01-10 14:47:50 +08:00 |
|
Liuyf
|
26310031af
|
fix: umeng和firebase动态接入方案
|
2025-01-10 14:39:47 +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 |
|
魏少阳
|
a61ebda710
|
fix: 1、修复wifi锁、网关配网传入的gatewayJson长度1字节改为2字节bug
|
2025-01-08 19:35:42 +08:00 |
|
|
|
7943aef0c2
|
Merge remote-tracking branch 'origin/develop' into develop_liyi
|
2025-01-08 18:16:45 +08:00 |
|
魏少阳
|
a90a6a387a
|
Merge branch 'develop' into build-addGateway-20240814
|
2025-01-08 18:05:43 +08:00 |
|
魏少阳
|
f21e49ae68
|
fix: 1、修复wifi锁、网关配网传入的gatewayJson长度1字节改为2字节
|
2025-01-08 18:03:30 +08:00 |
|
|
|
0b65d905b9
|
Merge remote-tracking branch 'origin/develop' into develop_liyi
|
2025-01-08 11:30:53 +08:00 |
|
Liuyf
|
b7ed39388a
|
fix: umeng初始化隐私合规问题修复。
|
2025-01-08 11:08:26 +08:00 |
|
|
|
c16c9be4c6
|
fix:增加p2p调试命令
|
2025-01-06 09:52:14 +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 |
|
魏少阳
|
ddf590c321
|
fix: 1、修改网关模块、远程开锁超时时间为60秒
|
2024-12-31 13:57:22 +08:00 |
|
|
|
c865db7a9f
|
fix:增加页面播放逻辑、调整proto文件
|
2024-12-28 14:58:01 +08:00 |
|
|
|
1bafcd535a
|
style:增加对讲状态,整理部分代码
|
2024-12-16 16:04:41 +08:00 |
|
|
|
2bdcc2f888
|
Merge remote-tracking branch 'origin/develop' into develop_liyi
|
2024-12-16 10:14:01 +08:00 |
|
魏少阳
|
2636f19619
|
fix: 1、进入修改国际化语言界面重启APP界面变灰问题。2、wifi密码输错一次再次提交没反应的问题
|
2024-12-14 09:20:21 +08:00 |
|
|
|
aad509e7b9
|
fix:将webview拉伸为全屏、整理代码
|
2024-12-13 14:30:07 +08:00 |
|
魏少阳
|
4d98561545
|
fix: 1、添加繁体香港。2、修复简体、繁体(台湾)、繁体(香港)传入显示问题。3、修复网关模块bug。4、添加网关强制删除功能。5、添加网关扫描设备功能。6、修复国际化其他bug
|
2024-12-13 10:59:42 +08:00 |
|
|
|
bb682226af
|
fix:增加html测试
|
2024-12-12 10:28:03 +08:00 |
|
|
|
b723d127f4
|
Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi
|
2024-12-09 17:06:14 +08:00 |
|
|
|
c46115c5b2
|
fix:去掉better_player依赖
|
2024-12-09 17:05:20 +08:00 |
|
“DaisyWu”
|
a8fe92e46d
|
Merge branch 'develop' into develop_liyi
# Conflicts:
# lan/lan_zh.json
|
2024-12-09 16:04:46 +08:00 |
|
|
|
3b53a44887
|
fix:完善状态变更和通知
|
2024-12-09 15:57:41 +08:00 |
|
魏少阳
|
17245ab71d
|
Merge branch 'develop' into build-addGateway-20240814
# Conflicts:
# ios/Podfile.lock
# ios/Runner.xcodeproj/project.pbxproj
|
2024-12-04 15:46:48 +08:00 |
|
魏少阳
|
202c97e0d3
|
Merge branch 'bugly' into build-addGateway-20240814
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# lib/login/login/starLock_login_logic.dart
# lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart
# lib/main/lockDetail/doorLockLog/doorLockLog_page.dart
# lib/main/lockDetail/lockDetail/lockDetail_logic.dart
# lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_logic.dart
# lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_page.dart
# lib/main/lockDetail/lockSet/lockSet/lockSet_logic.dart
# lib/mine/mineSet/mineSet/mineSet_logic.dart
# lib/tools/advancedCalendar/src/widget.dart
# pubspec.yaml
|
2024-12-04 14:25:23 +08:00 |
|
魏少阳
|
789a3142df
|
fix: 完成修复国际化界面显示bug
|
2024-12-04 13:55:58 +08:00 |
|
|
|
2429a107e1
|
feat:增加protobuf提供的实体类转换
|
2024-12-03 16:15:19 +08:00 |
|
|
|
063fc90a29
|
fix:调整新的中继协议中的上报签名逻辑
|
2024-12-03 14:44:29 +08:00 |
|
|
|
da16a61940
|
fix:调整新的中继协议中的上报签名逻辑
|
2024-12-03 10:06:28 +08:00 |
|
|
|
3a27c83c62
|
fix:调整新的中继协议中的上报签名逻辑
|
2024-12-03 10:06:27 +08:00 |
|
|
|
fec9933c0a
|
feat:增加新的中继协议逻辑
|
2024-12-03 10:06:27 +08:00 |
|
Liuyf
|
a7f63b771b
|
Merge branch 'release' into develop
|
2024-11-29 13:31:20 +08:00 |
|
Liuyf
|
3d3cbf80ad
|
fix： ITMS-91056: Invalid privacy manifest
|
2024-11-29 12:34:50 +08:00 |
|
Liuyf
|
aee84858c8
|
fix： ITMS-91056: Invalid privacy manifest
|
2024-11-28 19:37:34 +08:00 |
|
魏少阳
|
590d457f68
|
Merge：merge develop into build-addGateway-20240814
|
2024-11-26 17:46:54 +08:00 |
|
魏少阳
|
720406913a
|
feat: 1、添加跳转小程序。2、修改网关配网逻辑。3、修复电子钥匙、卡、指纹、密码模块国际化bug
|
2024-11-18 15:29:08 +08:00 |
|
Liuyf
|
4cd38d56d2
|
ci: fix ' ios-voice-processor (= 1.1.0, ~> 1.1.0)' issue
|
2024-11-02 10:15:24 +08:00 |
|
魏少阳
|
3b7dd563e6
|
Merge branch 'develop' of code.star-lock.cn:StarlockTeam/app-starlock into develop
|
2024-11-02 09:22:58 +08:00 |
|
