|
|
c30dfdc1eb
|
Merge branch 'develop_sky' into 'master_sky'
Develop sky
See merge request StarlockTeam/app-starlock!111
|
2025-05-30 06:20:18 +00:00 |
|
|
|
4c9422bc5b
|
Merge branch 'master_sky' into 'develop_sky'
# Conflicts:
# lib/blue/blue_manage.dart
|
2025-05-30 06:19:57 +00:00 |
|
|
|
de73ffe64b
|
Merge branch 'develop_sky_testci' into 'develop_sky'
Develop sky testci
See merge request StarlockTeam/app-starlock!109
|
2025-05-30 06:01:30 +00:00 |
|
|
|
78ae2c3239
|
Merge remote-tracking branch 'origin/develop_sky' into develop_sky_testci
# Conflicts:
# .gitlab-ci.yml
# android/Gemfile.lock
# lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart
|
2025-05-30 14:00:52 +08:00 |
|
|
|
34eabe7eee
|
fix:测试开发ci流程
|
2025-05-30 13:57:18 +08:00 |
|
|
|
2b29e510ce
|
fix:调整rbenv global版本，修复build_android失败问题
|
2025-05-30 13:50:48 +08:00 |
|
|
|
a94e80e670
|
fix:调整rbenv global版本，修复build_android失败问题
|
2025-05-30 13:48:19 +08:00 |
|
|
|
0e399c5831
|
fix:调整rbenv global版本，修复build_android失败问题
|
2025-05-30 12:34:35 +08:00 |
|
|
|
285211804b
|
fix:调整rbenv global版本，修复build_android失败问题
|
2025-05-30 12:29:36 +08:00 |
|
|
|
9af93869a8
|
fix:测试skyci流程
|
2025-05-30 12:19:58 +08:00 |
|
|
|
dac34b8824
|
fix:测试skyci流程
|
2025-05-30 11:49:54 +08:00 |
|
|
|
c26f241b2b
|
fix:测试skyci流程
|
2025-05-30 11:36:17 +08:00 |
|
|
|
5af587466c
|
fix:ci流程调整为sky分支构建
|
2025-05-30 11:34:03 +08:00 |
|
|
|
35f7dd38e3
|
fix:同步修复后的ci文件
|
2025-05-30 10:54:37 +08:00 |
|
Liuyf
|
1dbb7497ff
|
fix: 写入通讯录权限移除
v1.4.452
|
2025-05-30 08:51:23 +08:00 |
|
Liuyf
|
6290fe36e5
|
fix: ios release构建错误
v1.4.451
|
2025-05-29 16:59:15 +08:00 |
|
DaisyWu
|
14fe6223e4
|
Merge branch 'release' into develop_address_book
v1.6.533
|
2025-05-28 14:44:31 +08:00 |
|
DaisyWu
|
9a11a5b0f7
|
fix: 修复我的--授权管理员的通讯录获取问题
|
2025-05-28 14:44:06 +08:00 |
|
刘燕峰
|
fcfff0e590
|
Merge branch 'develop_address_book' into 'release'
Develop address book
See merge request StarlockTeam/app-starlock!100
|
2025-05-28 03:08:39 +00:00 |
|
DaisyWu
|
600212aee5
|
Merge branch 'release' into develop_address_book
|
2025-05-28 11:04:10 +08:00 |
|
DaisyWu
|
879f42bd81
|
fix: 修复iOS端通讯录点击获取手机号问题
|
2025-05-28 11:03:09 +08:00 |
|
DaisyWu
|
c66b994c12
|
Merge branch 'develop' into develop_address_book
|
2025-05-28 10:11:25 +08:00 |
|
刘燕峰
|
fa18888df9
|
Merge branch 'develop_address_book' into 'release'
Develop address book
See merge request StarlockTeam/app-starlock!99
|
2025-05-27 06:16:37 +00:00 |
|
Liuyf
|
7e5970b76a
|
Merge branch 'release' into develop_address_book
|
2025-05-27 14:15:36 +08:00 |
|
Liuyf
|
79539325af
|
Merge branch 'develop' into develop_address_book
|
2025-05-27 14:15:19 +08:00 |
|
Liuyf
|
dc77d6e318
|
fix: 发送电子钥匙直接点通讯录获取不到电话号码，要手动输入
|
2025-05-27 14:14:51 +08:00 |
|
Liuyf
|
9135f6f2a9
|
fix: 修复蓝牙开锁成功后，最后一条锁记录偶尔不同步bug诊断埋点
|
2025-05-27 10:33:54 +08:00 |
|
DaisyWu
|
2c316d427f
|
fix: 安卓选中通讯录失败问题排查
|
2025-05-26 19:51:06 +08:00 |
|
Liuyf
|
8a601f1596
|
Merge branch 'develop_liuyf' into release
|
2025-05-26 16:27:56 +08:00 |
|
Liuyf
|
e4649655b4
|
fix: 修复蓝牙开锁成功后，锁记录同步不完整bug
|
2025-05-26 16:27:35 +08:00 |
|
DaisyWu
|
307a96d562
|
fix: 完善提交
|
2025-05-26 16:12:45 +08:00 |
|
DaisyWu
|
4b3a74cc58
|
fix: 授权管理员—各个类型下点击通讯录无法直接获取通讯录联系人手机号及姓名问题修复及自测
|
2025-05-26 16:11:54 +08:00 |
|
DaisyWu
|
8c0ae4f349
|
fix: 修复测试部门问题-发送钥匙各个类型下点击通讯录无法直接获取通讯录联系人手机号及姓名
|
2025-05-26 15:58:52 +08:00 |
|
Liuyf
|
e1e29a02da
|
Merge branch 'develop' into release
|
2025-05-26 14:21:17 +08:00 |
|
Liuyf
|
5d0da71780
|
fix: 修复构建失败问题。
|
2025-05-26 14:15:27 +08:00 |
|
Liuyf
|
261a0363e5
|
fix: 修复构建失败问题。
|
2025-05-26 12:05:01 +08:00 |
|
Liuyf
|
09f75dbd4a
|
fix: 修复构建失败问题。
|
2025-05-26 11:57:28 +08:00 |
|
Liuyf
|
9f9c31862e
|
fix: 修复构建失败问题。
|
2025-05-26 11:55:16 +08:00 |
|
Liuyf
|
f770a11e68
|
fix: 修复构建失败问题
|
2025-05-26 11:23:35 +08:00 |
|
Liuyf
|
ab327e1a4f
|
fix: 修复构建失败问题
|
2025-05-23 19:20:41 +08:00 |
|
Liuyf
|
130cc8f133
|
fix: 修复构建失败问题
|
2025-05-23 19:02:47 +08:00 |
|
刘燕峰
|
d31dfd509e
|
Merge branch 'develop_sync_record' into 'release'
Develop sync record
See merge request StarlockTeam/app-starlock!98
|
2025-05-23 10:52:42 +00:00 |
|
DaisyWu
|
2cc53de610
|
Merge branch 'release' into develop_sync_record
|
2025-05-23 18:42:53 +08:00 |
|
Liuyf
|
f938a17576
|
Merge branch 'release' into develop
|
2025-05-23 15:51:11 +08:00 |
|
Liuyf
|
08b8924937
|
Merge branch 'master' into release
|
2025-05-23 15:50:51 +08:00 |
|
|
|
092a0d00b7
|
fix:恢复原有ci
|
2025-05-19 10:13:30 +08:00 |
|
|
|
6a3992b8e2
|
fix:恢复原有ci
|
2025-05-19 09:23:21 +08:00 |
|
|
|
0b5fb23eec
|
fix:恢复原有ci
|
2025-05-17 18:12:39 +08:00 |
|
|
|
cb48492f38
|
fix:恢复原有ci
|
2025-05-17 18:06:55 +08:00 |
|
|
|
d046167518
|
fix:恢复原有ci
|
2025-05-17 17:50:15 +08:00 |
|
