2745 Commits

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

See merge request StarlockTeam/app-starlock!162
2025-06-12 01:54:43 +00:00
002c8252d6 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:(密码)修复点击重置后不弹窗的问题

See merge request StarlockTeam/app-starlock!161
2025-06-12 01:39:06 +00:00
c76a7f0dad fix:(密码)修复点击重置后不弹窗的问题 2025-06-12 09:38:02 +08:00
5767351b6e Merge branch 'develop_sky' into 'canary_release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!160
2025-06-11 01:24:16 +00:00
0ffde21dda Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!159
2025-06-11 01:19:37 +00:00
9d2c953522 fix:上传数据时回复0时也保持请求下一份数据 2025-06-11 09:18:27 +08:00
0520733080 fix:如果是单次钥匙开锁成功之后就调用删除 2025-06-11 09:17:59 +08:00
ba2fb28018 Merge branch 'develop_sky_liyi' into 'canary_release_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!158
2025-06-10 02:42:30 +00:00
b61aceeac9 fix:图传页面兼容640*480不旋转的视频 2025-06-10 09:26:28 +08:00
0105a3ca72 fix:调整为收到预期接收数据回复之后才进行页面跳转和播放铃声 2025-06-10 09:25:45 +08:00
9623c542b5 Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!157
2025-06-09 06:32:49 +00:00
500f705fc5 fix:调整在选择限时指纹时中生效时间的时间选择器最小时间为当前时间 2025-06-09 11:47:51 +08:00
5d6ae85996 fix:增加锁屏权限开启的引导页面 2025-06-09 11:46:29 +08:00
17510c03ca Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!154
2025-06-06 05:56:51 +00:00
7831615b80 fix:取消构建完成后清理缓存 2025-06-06 13:41:34 +08:00
2de821804a fix:构建完成后清理缓存 2025-06-06 12:03:37 +08:00
58e0bdeef4 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:切换rubygems镜像为阿里云镜像

See merge request StarlockTeam/app-starlock!153
2025-06-06 04:01:38 +00:00
00a74b8a98 fix:切换rubygems镜像为阿里云镜像 2025-06-06 11:35:07 +08:00
7e992183f5 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:修复setup_fastlane_ios中使用了错误的目录位置

See merge request StarlockTeam/app-starlock!152
2025-06-06 01:46:51 +00:00
7a446fdb52 fix:修复setup_fastlane_ios中使用了错误的目录位置 2025-06-06 09:45:57 +08:00
f6d6814e72 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:区分Android和ios的构建时的依赖目录

See merge request StarlockTeam/app-starlock!151
2025-06-06 01:39:46 +00:00
c9ad04d4d9 fix:区分Android和ios的构建时的依赖目录 2025-06-06 09:38:41 +08:00
d9235bd81f Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整ci流程

See merge request StarlockTeam/app-starlock!150
2025-06-06 01:21:30 +00:00
a55f8d1e73 fix:调整ci流程 2025-06-06 09:20:34 +08:00
16d62698c6 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整ci流程

See merge request StarlockTeam/app-starlock!149
2025-06-06 01:18:29 +00:00
03ef57d75d fix:调整ci流程 2025-06-06 09:17:39 +08:00
12b29534f7 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整FCM版本

See merge request StarlockTeam/app-starlock!146
2025-06-06 01:05:11 +00:00
f950392c22 fix:调整FCM版本 2025-06-05 14:31:39 +08:00
bb13b9fb87 Merge branch 'release_sky' into 'canary_release_sky'
Release sky

See merge request StarlockTeam/app-starlock!145
2025-06-05 05:43:56 +00:00
700e713279 Merge branch 'develop_sky' into 'release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!144
2025-06-05 03:52:36 +00:00
06a38603f7 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:增加ci时的flutter依赖镜像源为国内镜像源

See merge request StarlockTeam/app-starlock!143
2025-06-05 03:27:03 +00:00
951571f95e fix:增加ci时的flutter依赖镜像源为国内镜像源 2025-06-05 11:26:26 +08:00
7d4e18f7b1 Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!142
2025-06-05 02:55:31 +00:00
7d6ade5a3b Merge branch 'develop_ios键盘收起问题(1004900)' into 'develop_sky_liyi'
fix:增加返回页面时和点击搜索时收起键盘

See merge request StarlockTeam/app-starlock!141
2025-06-05 02:54:19 +00:00
621838a0cb fix:调整密码详情点击删除不出现弹窗的问题 2025-06-05 10:52:51 +08:00
7bf5d9147d fix:增加返回页面时和点击搜索时收起键盘 2025-06-04 15:59:07 +08:00
5a8f4afc26 Merge branch 'develop_sky' into 'release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!139
2025-06-04 07:11:09 +00:00
c30c16897a Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整ci流程,只保留sky的flavor构建

See merge request StarlockTeam/app-starlock!138
2025-06-04 07:02:50 +00:00
5257fec08e fix:调整ci流程,只保留sky的flavor构建 2025-06-04 15:01:48 +08:00
2a2e6d31f5 Merge branch 'develop_sky' into 'release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!136
2025-06-04 01:19:31 +00:00
a6051abdf7 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:注释一键登录初始化逻辑

See merge request StarlockTeam/app-starlock!135
2025-06-04 01:18:16 +00:00
d825377f39 fix:注释一键登录初始化逻辑 2025-06-03 10:10:22 +08:00
fad838a6c6 Merge branch 'develop_sky' into 'release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!133
2025-06-03 01:55:07 +00:00
c229356547 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:增加生成tag版本号时移除Merge和Revert操作对版本号进行递增的逻辑,增加对commit id 的去重

See merge request StarlockTeam/app-starlock!132
2025-06-03 01:54:08 +00:00
064e5ed542 fix:增加生成tag版本号时移除Merge和Revert操作对版本号进行递增的逻辑,增加对commit id 的去重 2025-06-03 09:53:21 +08:00
b41bf00f8a Merge branch 'develop_sky' into 'release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!130
2025-06-03 01:49:59 +00:00
dc31fc1f06 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:增加生成tag版本号时移除Merge和Revert操作对版本号进行递增的逻辑,增加对commit id 的去重

See merge request StarlockTeam/app-starlock!129
2025-06-03 01:46:20 +00:00
82df2f6e4b fix:增加生成tag版本号时移除Merge和Revert操作对版本号进行递增的逻辑,增加对commit id 的去重 2025-06-03 09:36:51 +08:00
b8d34cda29 Merge branch 'develop_sky' into 'release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!127
2025-06-03 01:25:21 +00:00
b640d6156d Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!126
2025-06-03 01:24:08 +00:00