2933 Commits

Author SHA1 Message Date
231d2fd21d Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整sky下的ci为master_sky进行生成tag和version

See merge request StarlockTeam/app-starlock!39
2025-05-09 08:45:04 +00:00
bbfaec71c8 fix:调整sky下的ci为master_sky进行生成tag和version 2025-05-09 16:44:21 +08:00
c95b0b9721 Merge branch 'develop_sky' into 'master_sky'
fix:测试ci

See merge request StarlockTeam/app-starlock!38
2025-05-09 08:39:14 +00:00
f5f52043d0 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:测试ci

See merge request StarlockTeam/app-starlock!35
2025-05-09 08:24:56 +00:00
08d41a6925 fix:测试ci 2025-05-09 16:23:57 +08:00
25fcca811b Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:测试ci

See merge request StarlockTeam/app-starlock!32
2025-05-09 08:17:03 +00:00
869beca8f1 fix:测试ci 2025-05-09 16:16:06 +08:00
7b02bc7a8a Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:测试ci

See merge request StarlockTeam/app-starlock!30
2025-05-09 08:00:49 +00:00
eed97a4825 fix:测试ci 2025-05-09 15:59:45 +08:00
2cdcd69108 fix:增加sky的ci分支规则 2025-05-09 15:47:41 +08:00
刘燕峰
2ad72c27cf Merge branch 'develop_sync_record' into 'develop'
fix: “上传数据成功后,指纹列表没显示出来,必须下拉刷新才显示”问题修复完成

See merge request StarlockTeam/app-starlock!28
2025-05-09 06:02:44 +00:00
DaisyWu
d6dba6e3dd fix: “上传数据成功后,指纹列表没显示出来,必须下拉刷新才显示”问题修复完成 2025-05-09 13:39:05 +08:00
29fc822b91 fix:根据后端判断开始时间上传锁板的指纹列表数据时需要改为255 2025-05-09 09:30:40 +08:00
e9c06cc66d Merge branch 'develop' into 'canary_release'
Develop

See merge request StarlockTeam/app-starlock!27
2025-05-08 08:28:18 +00:00
Liuyf
15adae81e8 Merge branch 'develop' into release v1.5.511 2025-05-08 15:54:22 +08:00
79f2d95314 fix:调整点击静音时发送期望数据被改为iamge的问题 2025-05-08 15:37:10 +08:00
7f7bb49d8c fix:调整为原有的864*480对讲视频 2025-05-08 15:23:30 +08:00
47f5096a9c fix:增加native解码插件支持720P对讲页面 2025-05-08 15:23:30 +08:00
203b625ddd fix:移除h264、mjpeg切换debug按钮 2025-05-08 15:23:30 +08:00
d27c4e2f9f fix:调整无音频问题 2025-05-08 15:23:30 +08:00
9b755e2993 fix:增加原生插件解码的页面、增加h264、mjpeg切换的debug按钮 2025-05-08 15:23:30 +08:00
443b14450b fix:清除角标 2025-05-08 15:23:30 +08:00
81b1fdd43d fix:搜索蓝牙设备区分,sky改为76 2025-05-08 15:23:30 +08:00
刘燕峰
def413943e Merge branch 'develop_clean_subscript' into 'develop'
fix:清除角标

See merge request StarlockTeam/app-starlock!26
2025-05-08 07:18:54 +00:00
刘燕峰
2100964073 Merge branch 'develop_bluetooth_separate' into 'develop'
fix:搜索蓝牙设备区分,sky改为76

See merge request StarlockTeam/app-starlock!25
2025-05-08 07:18:13 +00:00
10d4fa78fa fix:搜索蓝牙设备区分,sky改为76 2025-05-08 15:11:08 +08:00
b6552b4802 fix:清除角标 2025-05-08 14:01:03 +08:00
b2d2c75b54 fix:增加peerId长度补齐逻辑但不使用 2025-05-08 13:43:11 +08:00
1a67783d7a fix:调整mjpeg的渲染逻辑 2025-05-08 11:33:38 +08:00
a0895927c4 Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2025-05-08 11:04:48 +08:00
4e6f546019 fix:插件依赖更新 2025-05-08 11:03:25 +08:00
34da68e16c fix:调整缓冲区大小 2025-05-08 11:03:25 +08:00
2f03a98cc4 fix:调整解码插件依赖模式 2025-05-08 11:03:25 +08:00
6ef92e2340 fix:取消本地状态栏弹窗 2025-05-08 11:03:25 +08:00
723a803e17 fix:调整ios端渲染白边问题 2025-05-08 11:03:25 +08:00
2fbb4695b4 fix:调整猫眼监控支持项 2025-05-08 11:03:25 +08:00
c84e053172 fix:SKY环境下不显示设置管理员开关 2025-05-08 11:03:25 +08:00
7ea2694878 fix:修复胁迫通知列表时的文本错误 2025-05-08 11:03:25 +08:00
66dd5de9f1 fix:SKY环境下不显示设置管理员开关 2025-05-08 11:03:25 +08:00
e1bf2f2fdc fix:调整为原有的864*480对讲视频 2025-05-08 11:03:25 +08:00
07d20dfbf2 fix:调整为原有的864*480对讲视频 2025-05-08 11:03:25 +08:00
357eaac746 fix:增加native解码插件支持720P对讲页面 2025-05-08 11:03:25 +08:00
e806987fa0 fix:完成720P 20帧渲染需求 2025-05-08 11:03:25 +08:00
419912c590 fix:增加视频旋转角度,调整监控时获取锁peerId的逻辑 2025-05-08 11:03:25 +08:00
84431d17c4 fix:增加视频旋转角度 2025-05-08 11:03:25 +08:00
1543de142f fix:增加插件播放页注释 2025-05-08 11:03:25 +08:00
bf8d0511c1 fix:移除h264、mjpeg切换debug按钮 2025-05-08 11:03:24 +08:00
37f4e6d78e fix:调整回到列表偶尔出现相同锁记录 2025-05-08 11:03:24 +08:00
ea01d79bbd fix:调整配网逻辑 2025-05-08 11:03:24 +08:00
d75754e14e fix:SKY环境下注释该锁已被重置的弹窗 2025-05-08 11:03:24 +08:00