2924 Commits

Author SHA1 Message Date
bd04e2dc88 Merge branch 'develop_sky' into 'canary_release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!257
2025-08-22 05:46:48 +00:00
52f3ce64a4 Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!256
2025-08-22 05:36:56 +00:00
3e15966c64 fix:调整对讲音频发送速率 2025-08-22 13:35:42 +08:00
8a5e997262 Merge remote-tracking branch 'origin/develop_sky_liyi' into develop_sky_liyi 2025-08-22 09:57:07 +08:00
9a0a407022 fix:去除实时画面、取出异常告警设置 2025-08-22 09:57:03 +08:00
cebc1c09f3 Merge branch 'release_sky' into 'canary_release_sky'
Release sky

See merge request StarlockTeam/app-starlock!255
2025-08-20 07:27:56 +00:00
272b02f2c9 Merge branch 'develop_sky' into 'release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!254
2025-08-20 06:46:37 +00:00
832c72df4a Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!253
2025-08-20 06:29:43 +00:00
6e853024dc fix:调整对讲命令时使用实际款高度 2025-08-20 14:22:09 +08:00
103737cec0 fix:增加读取锁语音包命令 2025-08-20 14:20:06 +08:00
026e06a79f fix:调整云存页面内容 2025-08-20 10:06:03 +08:00
9fdf8377ee fix:调整视频缩略图、调整操作记录查询逻辑 2025-08-19 10:16:20 +08:00
335f66a0b5 fix:调整登录页面键盘无法收起的问题 2025-08-18 18:18:02 +08:00
f48e7c8274 fix:调整操作记录中UI(未完成) 2025-08-18 18:17:41 +08:00
c32f052cb0 fix:调整操作记录中UI(未完成) 2025-08-18 14:48:24 +08:00
477f4f21be fix:增加第三方协议的选项、增加多语言选项的英文名显示 2025-08-18 09:19:41 +08:00
1a6b44ece9 Merge remote-tracking branch 'origin/develop_sky_liyi' into develop_sky_liyi 2025-08-15 17:22:49 +08:00
f4e8b5e5ef fix:增加英文描述 2025-08-15 17:22:36 +08:00
f23eff1c09 fix:取消循环指纹的写死逻辑 2025-08-15 14:12:13 +08:00
fc3f27e951 fix:调整ios的录音发送逻辑 2025-08-15 13:55:39 +08:00
47ddb9b72a fix:调整ios的录音发送逻辑 2025-08-15 13:52:13 +08:00
88db0e850b fix:调整ios收到对讲后找到推送的消息并设置为已读 2025-08-15 13:51:11 +08:00
392cb83156 Merge branch 'develop_sky' into 'release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!251
2025-08-12 03:26:22 +00:00
94b314ddc5 fix:调整依赖,为了修复ci的构建失败 2025-08-12 11:12:25 +08:00
7fe97666e5 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整依赖,为了修复ci的构建失败

See merge request StarlockTeam/app-starlock!250
2025-08-12 02:54:52 +00:00
5ca0ba4a12 fix:调整依赖,为了修复ci的构建失败 2025-08-12 10:54:11 +08:00
5c209b985d 删除pubspec.lock 2025-08-12 02:48:23 +00:00
7048235138 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整依赖,为了修复ci的构建失败

See merge request StarlockTeam/app-starlock!249
2025-08-12 02:39:46 +00:00
b099c6101e fix:调整依赖,为了修复ci的构建失败 2025-08-12 10:39:12 +08:00
4a80acf9e1 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整依赖,为了修复ci的构建失败

See merge request StarlockTeam/app-starlock!248
2025-08-12 02:25:20 +00:00
8667b4017f fix:调整依赖,为了修复ci的构建失败 2025-08-12 10:22:36 +08:00
21fbf62a8f Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!247
2025-08-12 01:41:45 +00:00
9769501387 fix:调整依赖,为了修复ci的构建失败 2025-08-12 09:40:43 +08:00
0b1a9b69a3 fix:调整targetSdkVersion为google适配 2025-08-12 09:32:51 +08:00
a5b5d6ad0e Merge branch 'release_sky' into 'canary_release_sky'
Release sky

See merge request StarlockTeam/app-starlock!245
2025-08-08 02:27:41 +00:00
19e300b4db Merge branch 'develop_sky' into 'release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!244
2025-08-08 02:17:05 +00:00
84be5b7617 Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!243
2025-08-08 01:59:52 +00:00
9df1c3243b fix:调整操作记录中的显示文本 2025-08-08 09:55:16 +08:00
21ede72014 fix:增加巴西葡萄牙语 2025-08-08 09:54:54 +08:00
493fc19033 fix:调整循环密码的失效时间问题 2025-08-08 09:54:42 +08:00
f17a7feb9c fix:增加第三方协议平台设置的查询ttp接口 2025-08-08 09:54:23 +08:00
b0bd6515ac fix:增加第三方协议平台设置的查询ttp接口 2025-08-08 09:54:20 +08:00
2bfc84e428 fix:增加离线密码开锁的事件上报时增加密码字段 2025-08-07 14:19:50 +08:00
a5dcaae5a8 fix:增加巴西葡萄牙语 2025-08-07 10:47:08 +08:00
395e967abe fix:调整添加指纹时的步骤图片 2025-08-06 12:01:54 +08:00
bc8f9c364a Merge branch 'release_sky' into 'canary_release_sky'
Release sky

See merge request StarlockTeam/app-starlock!242
2025-08-05 07:43:08 +00:00
73988c9bab Merge branch 'develop_sky' into 'release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!241
2025-08-05 07:34:36 +00:00
c954ee6918 Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!240
2025-08-05 07:24:39 +00:00
46303ce2b9 fix:调整添加指纹时发送命令的阶段 2025-08-05 15:20:16 +08:00
8752c8dc41 fix:调整当添加完锁的锁出现已被重置逻辑的进行连接时将isReconnect设置为true 2025-08-05 15:19:42 +08:00