Commit Graph

Select branches

Hide Pull Requests

canary_release_sky

develop_sky

develop_sky_drLock

develop_sky_drLock_minbb

develop_sky_liyi

develop_sky_minbb

develop_sky_xiejing

master_sky

release_sky

#1

#2

#3

#4

#5

#6

1.0.27+20240411

1.0.40+2024051704

1.0.41+2024051705

1.0.47+2024052101

1.0.48+2024052201

1.0.51+2024052801

1.0.53+2024052803

1.0.56+2024060401

1.0.56+2024060502

1.0.56+202406401

1.0.57+2024060701

1.0.58+2024060702

1.0.59+2024060703

1.0.60+2024061101

1.0.63+2024061302

1.0.65+2024061801

1.0.66+2024061802

1.0.69+2024070301

sky_v1.5.514

sky_v1.6.604

sky_v1.6.607

sky_v1.6.610

sky_v1.6.612

sky_v1.6.613

sky_v1.6.614

sky_v1.6.650

sky_v1.6.656

sky_v1.6.659

sky_v1.6.661

sky_v1.6.663

sky_v1.6.665

sky_v1.6.669

sky_v1.6.671

sky_v1.6.673

sky_v1.6.675

sky_v1.6.679

sky_v1.6.681

sky_v1.6.683

sky_v1.6.685

sky_v1.6.688

v1.0.0

v1.0.1

v1.0.3

v1.0.4

v1.0.5

v1.0.6

v1.0.7

v1.0.80

v1.0.83

v1.0.84

v1.0.85

v1.0.86

v1.0.87

v1.0.88

v1.1.0

v1.1.1

v1.1.2

v1.1.3

v1.1.4

v1.1.5

v1.1.6

v1.2.0

v1.2.1

v1.3.366

v1.3.367

v1.3.370

v1.3.372

v1.3.399

v1.3.426

v1.4.427

v1.4.451

v1.4.452

v1.4.452_sky

v1.4.459_sky

v1.4.460_sky

v1.4.461_sky

v1.4.463_sky

v1.4.465_sky

v1.4.484_sky

v1.4.497_sky

v1.4.500_sky

v1.4.508_sky

v1.4.510_sky

v1.4.538_sky

v1.4.561_sky

v1.4.567_sky

v1.4.592_sky

v1.4.593_sky

v1.4.598_sky

v1.5.463

v1.5.511

v1.6.487

v1.6.533

v1.7.488

v1.7.489

v1.7.490

v1.7.491

v1.7.492

v1.7.493

v1.7.494

v1.7.495

v1.7.496

v1.7.497

Mono Color

• 82df2f6e4b fix:增加生成tag版本号时移除Merge和Revert操作对版本号进行递增的逻辑，增加对commit id 的去重 liyi 2025-06-03 09:36:51 +08:00
• f08f1007b4 Merge branch 'release_sky' into 'master_sky' v1.4.463_sky 李仪 2025-06-03 01:27:31 +00:00
• b8d34cda29 Merge branch 'develop_sky' into 'release_sky' 李仪 2025-06-03 01:25:21 +00:00
• b640d6156d Merge branch 'develop_sky_liyi' into 'develop_sky' 李仪 2025-06-03 01:24:08 +00:00
• 1220653526 fix:修复指纹详情删除时不弹出确认框 liyi 2025-06-03 09:23:31 +08:00
• f956ec175f Merge branch 'release_sky' into 'master_sky' 李仪 2025-05-30 10:22:58 +00:00
• a693827c79 fix:修复master_sky更新tag失败的问题 liyi 2025-05-30 18:22:10 +08:00
• 40c8619c06 Merge branch 'release_sky' into 'master_sky' 李仪 2025-05-30 10:16:51 +00:00
• 9a8678057d fix:修复卡片、人脸、指纹详情页点击删除不弹出确认窗口的问题 liyi 2025-05-30 18:15:53 +08:00
• 6ceb684470 Merge branch 'release_sky' into 'master_sky' 李仪 2025-05-30 09:57:35 +00:00
• d4f64f37ea Merge branch 'develop_sky' into 'release_sky' 李仪 2025-05-30 09:21:49 +00:00
• 71887da5c9 Merge branch 'develop_sky_liyi' into 'develop_sky' 李仪 2025-05-30 08:40:19 +00:00
• 6f9787605a fix:修复卡片、人脸、指纹详情页点击删除不弹出确认窗口的问题 liyi 2025-05-30 16:39:09 +08:00
• 789ff17f58 fix:调整原有标准ci的tag生成逻辑，过滤掉携带_sky后缀的tag liyi 2025-05-30 16:28:24 +08:00
• 58c103bebc Merge branch 'release_sky' into 'master_sky' 李仪 2025-05-30 07:42:22 +00:00
• 01e7a098ba Merge branch 'develop_sky' into 'release_sky' 李仪 2025-05-30 07:31:03 +00:00
• 6a76e45e7f Merge branch 'develop_sky_testci' into 'develop_sky' 李仪 2025-05-30 07:27:53 +00:00
• 7a39446f4d fix:测试ci流程 liyi 2025-05-30 15:27:02 +08:00
• 311fddf1ed Merge branch 'develop_sky' into 'canary_release_sky' 李仪 2025-05-30 07:08:57 +00:00
• e6e17ebb89 Merge branch 'master_sky' into 'release_sky' 李仪 2025-05-30 06:47:59 +00:00
• 9452cc2bdc Merge branch 'develop_sky' into 'master_sky' v1.4.452_sky 李仪 2025-05-30 06:46:43 +00:00
• faa88e6668 Merge branch 'develop_sky_testci' into 'develop_sky' 李仪 2025-05-30 06:45:31 +00:00
• 5231e62550 fix:调整tag生成逻辑 liyi 2025-05-30 14:44:46 +08:00
• 5d40153907 Merge branch 'develop_sky' into 'master_sky' 李仪 2025-05-30 06:38:10 +00:00
• 64a5fde201 Merge branch 'develop_sky_testci' into 'develop_sky' 李仪 2025-05-30 06:37:05 +00:00
• f8b3303d0b fix:增加tag生成时输出日志,ci中判断tag的正则调整为增加sky后缀之后的 liyi 2025-05-30 14:36:08 +08:00
• c30dfdc1eb Merge branch 'develop_sky' into 'master_sky' 李仪 2025-05-30 06:20:18 +00:00
• 4c9422bc5b Merge branch 'master_sky' into 'develop_sky' 李仪 2025-05-30 06:19:57 +00:00
• 7105f16daa Merge branch 'develop_sky' into 'canary_release_sky' 李仪 2025-05-30 06:16:20 +00:00
• de73ffe64b Merge branch 'develop_sky_testci' into 'develop_sky' 李仪 2025-05-30 06:01:30 +00:00
• 78ae2c3239 Merge remote-tracking branch 'origin/develop_sky' into develop_sky_testci liyi 2025-05-30 14:00:52 +08:00
• 34eabe7eee fix:测试开发ci流程 liyi 2025-05-30 13:57:18 +08:00
• 2b29e510ce fix:调整rbenv global版本，修复build_android失败问题 liyi 2025-05-30 13:50:48 +08:00
• a94e80e670 fix:调整rbenv global版本，修复build_android失败问题 liyi 2025-05-30 13:48:19 +08:00
• 0e399c5831 fix:调整rbenv global版本，修复build_android失败问题 liyi 2025-05-30 12:34:35 +08:00
• 285211804b fix:调整rbenv global版本，修复build_android失败问题 liyi 2025-05-30 12:29:36 +08:00
• 9af93869a8 fix:测试skyci流程 liyi 2025-05-30 12:19:58 +08:00
• dac34b8824 fix:测试skyci流程 liyi 2025-05-30 11:49:54 +08:00
• c26f241b2b fix:测试skyci流程 liyi 2025-05-30 11:36:17 +08:00
• 5af587466c fix:ci流程调整为sky分支构建 liyi 2025-05-30 11:34:03 +08:00
• 35f7dd38e3 fix:同步修复后的ci文件 liyi 2025-05-30 10:54:37 +08:00
• 1dbb7497ff fix: 写入通讯录权限移除 v1.4.452 Liuyf 2025-05-30 08:51:23 +08:00
• 6290fe36e5 fix: ios release构建错误 v1.4.451 Liuyf 2025-05-29 16:59:15 +08:00
• 14fe6223e4 Merge branch 'release' into develop_address_book v1.6.533 DaisyWu 2025-05-28 14:44:31 +08:00
• 9a11a5b0f7 fix: 修复我的--授权管理员的通讯录获取问题 DaisyWu 2025-05-28 14:44:06 +08:00
• fcfff0e590 Merge branch 'develop_address_book' into 'release' 刘燕峰 2025-05-28 03:08:39 +00:00
• 600212aee5 Merge branch 'release' into develop_address_book DaisyWu 2025-05-28 11:04:10 +08:00
• 879f42bd81 fix: 修复iOS端通讯录点击获取手机号问题 DaisyWu 2025-05-28 11:03:09 +08:00
• c66b994c12 Merge branch 'develop' into develop_address_book DaisyWu 2025-05-28 10:11:25 +08:00
• fa18888df9 Merge branch 'develop_address_book' into 'release' 刘燕峰 2025-05-27 06:16:37 +00:00
• 7e5970b76a Merge branch 'release' into develop_address_book Liuyf 2025-05-27 14:15:36 +08:00
• 79539325af Merge branch 'develop' into develop_address_book Liuyf 2025-05-27 14:15:19 +08:00
• dc77d6e318 fix: 发送电子钥匙直接点通讯录获取不到电话号码，要手动输入 Liuyf 2025-05-27 14:14:51 +08:00
• 9135f6f2a9 fix: 修复蓝牙开锁成功后，最后一条锁记录偶尔不同步bug诊断埋点 Liuyf 2025-05-27 10:33:54 +08:00
• 2c316d427f fix: 安卓选中通讯录失败问题排查 DaisyWu 2025-05-26 19:51:06 +08:00
• 8a601f1596 Merge branch 'develop_liuyf' into release Liuyf 2025-05-26 16:27:56 +08:00
• e4649655b4 fix: 修复蓝牙开锁成功后，锁记录同步不完整bug Liuyf 2025-05-26 16:27:35 +08:00
• 307a96d562 fix: 完善提交 DaisyWu 2025-05-26 16:12:45 +08:00
• 4b3a74cc58 fix: 授权管理员—各个类型下点击通讯录无法直接获取通讯录联系人手机号及姓名问题修复及自测 DaisyWu 2025-05-26 16:11:54 +08:00
• 8c0ae4f349 fix: 修复测试部门问题-发送钥匙各个类型下点击通讯录无法直接获取通讯录联系人手机号及姓名 DaisyWu 2025-05-26 15:58:52 +08:00
• e1e29a02da Merge branch 'develop' into release Liuyf 2025-05-26 14:21:17 +08:00
• 5d0da71780 fix: 修复构建失败问题。 Liuyf 2025-05-26 14:15:27 +08:00
• 261a0363e5 fix: 修复构建失败问题。 Liuyf 2025-05-26 12:05:01 +08:00
• 09f75dbd4a fix: 修复构建失败问题。 Liuyf 2025-05-26 11:57:28 +08:00
• 9f9c31862e fix: 修复构建失败问题。 Liuyf 2025-05-26 11:55:16 +08:00
• f770a11e68 fix: 修复构建失败问题 Liuyf 2025-05-26 11:23:35 +08:00
• ab327e1a4f fix: 修复构建失败问题 Liuyf 2025-05-23 19:20:41 +08:00
• 130cc8f133 fix: 修复构建失败问题 Liuyf 2025-05-23 19:02:47 +08:00
• d31dfd509e Merge branch 'develop_sync_record' into 'release' 刘燕峰 2025-05-23 10:52:42 +00:00
• 2cc53de610 Merge branch 'release' into develop_sync_record DaisyWu 2025-05-23 18:42:53 +08:00
• f938a17576 Merge branch 'release' into develop Liuyf 2025-05-23 15:51:11 +08:00
• 08b8924937 Merge branch 'master' into release Liuyf 2025-05-23 15:50:51 +08:00
• 0fffc2c4b2 Merge branch 'develop_sky' into 'canary_release' 李仪 2025-05-19 02:16:11 +00:00
• 092a0d00b7 fix:恢复原有ci liyi 2025-05-19 10:13:30 +08:00
• c6940e56cf Merge branch 'develop_sky' into 'canary_release' 李仪 2025-05-19 01:25:31 +00:00
• 6a3992b8e2 fix:恢复原有ci liyi 2025-05-19 09:23:21 +08:00
• f4fd0668b0 Merge branch 'develop_sky' into 'canary_release' 李仪 2025-05-17 10:13:10 +00:00
• 0b5fb23eec fix:恢复原有ci liyi 2025-05-17 18:12:39 +08:00
• ec80c224f8 Merge branch 'develop_sky' into 'canary_release' 李仪 2025-05-17 10:08:00 +00:00
• cb48492f38 fix:恢复原有ci liyi 2025-05-17 18:06:55 +08:00
• 1f0172f61f Merge branch 'develop_sky' into 'canary_release' 李仪 2025-05-17 09:51:09 +00:00
• d046167518 fix:恢复原有ci liyi 2025-05-17 17:50:15 +08:00
• b907028e26 Merge branch 'develop_sky' into 'canary_release' 李仪 2025-05-17 09:46:35 +00:00
• eeff5f0665 fix:恢复原有ci liyi 2025-05-17 17:45:53 +08:00
• c26e2068b6 Merge branch 'develop_sky' into 'canary_release' 李仪 2025-05-17 09:37:40 +00:00
• da85d65fa2 fix:恢复原有ci liyi 2025-05-17 17:36:57 +08:00
• d32529518e Merge branch 'develop_sky' into 'canary_release' 李仪 2025-05-17 09:11:06 +00:00
• 78ad994cc4 fix:恢复原有ci liyi 2025-05-17 17:10:30 +08:00
• fe955dd9bb Merge branch 'develop_sky' into 'canary_release' 李仪 2025-05-17 08:33:25 +00:00
• 48603c7daa fix:恢复原有ci liyi 2025-05-17 16:32:39 +08:00
• 7ccb1a8082 Merge branch 'develop_sky' into 'master_sky' sky_v1.6.688 李仪 2025-05-17 07:41:40 +00:00
• 4787759694 fix:调整ci liyi 2025-05-17 15:40:12 +08:00
• de3722292e fix:取消截图时必须接听的逻辑 liyi 2025-05-17 15:12:36 +08:00
• 9c4cea5224 fix:移除高德同时移除锁基本信息中的位置信息 liyi 2025-05-17 15:12:13 +08:00
• 194d7d96e6 Merge branch 'develop_sky' into 'master_sky' sky_v1.6.685 李仪 2025-05-17 06:45:37 +00:00
• 03c24b3c97 fix:增加android构建日志，避免并发构建 liyi 2025-05-17 14:44:46 +08:00
• c4d06dbb36 Merge branch 'develop_sky' into 'master_sky' sky_v1.6.683 李仪 2025-05-17 06:01:57 +00:00
• 7dde0cdf8e fix:增加android构建日志 liyi 2025-05-17 14:00:46 +08:00
• b2b5b6b886 Merge branch 'develop_sky' into 'master_sky' sky_v1.6.681 李仪 2025-05-17 03:44:53 +00:00
• aa6f01ad5c fix:调整镜像源 liyi 2025-05-17 11:42:23 +08:00