魏少阳
|
5e4a08e803
|
Merge branch 'develop' into build-addGateway-20240814
|
2024-12-09 18:22:35 +08:00 |
|
魏少阳
|
7516813a1c
|
fix: 1、修复扭力设置bug。2、星星锁添加万师傅入口。3、添加蓝牙、网关扫描类型区分。4、删除项目中废弃的协议
|
2024-12-09 18:11:17 +08:00 |
|
Liuyf
|
e1df9e7290
|
fix: 修复buildconfig和plist不对应问题
|
2024-12-09 15:09:16 +08:00 |
|
Liuyf
|
34bdf358c4
|
fix: 修复buildconfig和plist不对应问题
|
2024-12-09 13:52:14 +08:00 |
|
Liuyf
|
23cd12a7b3
|
ci：构建完成发送企微通知
|
2024-12-09 13:44:28 +08:00 |
|
Liuyf
|
323ed1d868
|
Merge branch 'develop' into release
|
2024-12-09 11:14:13 +08:00 |
|
Liuyf
|
77f555249f
|
ci：构建完成发送企微通知
|
2024-12-09 11:11:35 +08:00 |
|
Liuyf
|
ad5b729aa8
|
fix: 提供sky，xhi本地调试配置以及app名称错误配置修复
|
2024-12-09 11:03:37 +08:00 |
|
liuyanfeng
|
3ca337956d
|
ci: 调整预发，联调环境构建配置。
|
2024-12-08 23:28:45 +08:00 |
|
liuyanfeng
|
2ff73544cc
|
ci: 调整预发，联调环境构建配置。
|
2024-12-08 22:44:17 +08:00 |
|
liuyanfeng
|
52ff26a9bd
|
ci: 调整预发，联调环境构建配置
|
2024-12-08 01:58:21 +08:00 |
|
liuyanfeng
|
d7c20001ca
|
fix: remove invalied plist。
|
2024-12-08 01:51:34 +08:00 |
|
liuyanfeng
|
a09e3cb38e
|
fix: remove invalied plist。.
|
2024-12-08 01:41:47 +08:00 |
|
liuyanfeng
|
f1f5fe3fd9
|
fix: remove invalied plist。
|
2024-12-08 01:23:58 +08:00 |
|
liuyanfeng
|
4b0d55ac56
|
fix: remove invalied plist.
|
2024-12-08 00:47:37 +08:00 |
|
liuyanfeng
|
823be1b811
|
fix: remove invalied plist
|
2024-12-08 00:45:43 +08:00 |
|
liuyanfeng
|
42bc0acde4
|
fix: 修复联调，预发布环境打包ipa闪退问题。
|
2024-12-08 00:19:13 +08:00 |
|
liuyanfeng
|
adbfb67a7b
|
fix: 修复联调，预发布环境打包ipa闪退问题.
|
2024-12-07 15:16:47 +08:00 |
|
liuyanfeng
|
a9cbd37867
|
fix: 修复联调，预发布环境打包ipa闪退问题
|
2024-12-07 14:19:59 +08:00 |
|
liuyanfeng
|
2438575ce1
|
fix: 修复联调，预发布环境打包ipa闪退问题
|
2024-12-07 14:07:25 +08:00 |
|
liuyanfeng
|
1b38024cb2
|
fix: 修复联调，预发布环境打包ipa闪退问题
|
2024-12-07 10:16:26 +08:00 |
|
liuyanfeng
|
64c3209a6d
|
fix: 修复联调，预发布环境打包ipa闪退问题
|
2024-12-07 09:17:51 +08:00 |
|
Liuyf
|
3a39886b8f
|
other: 重新生成Podfile.lock文件
|
2024-12-06 14:49:02 +08:00 |
|
Liuyf
|
c5824f9018
|
other: 补充sky-pre，xhj-preJPUSH_PKGNAME配置
|
2024-12-06 11:02:18 +08:00 |
|
Liuyf
|
3b105f8019
|
Merge branch 'feat_devops' into develop
|
2024-12-06 10:22:01 +08:00 |
|
Liuyf
|
7305e0337f
|
other: 补充sky-pre，xhj-pre地图key
|
2024-12-06 10:21:43 +08:00 |
|
Liuyf
|
8bf324bcd5
|
Merge branch 'develop' of code.star-lock.cn:StarlockTeam/app-starlock into develop
|
2024-12-04 16:16:22 +08:00 |
|
Liuyf
|
38c2cdce65
|
other: 调整通知内容
|
2024-12-04 16:15:49 +08:00 |
|
魏少阳
|
17245ab71d
|
Merge branch 'develop' into build-addGateway-20240814
# Conflicts:
# ios/Podfile.lock
# ios/Runner.xcodeproj/project.pbxproj
|
2024-12-04 15:46:48 +08:00 |
|
魏少阳
|
debb1bfd40
|
fix: 合并bugly分支到当前分支
|
2024-12-04 15:21:27 +08:00 |
|
魏少阳
|
202c97e0d3
|
Merge branch 'bugly' into build-addGateway-20240814
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# lib/login/login/starLock_login_logic.dart
# lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart
# lib/main/lockDetail/doorLockLog/doorLockLog_page.dart
# lib/main/lockDetail/lockDetail/lockDetail_logic.dart
# lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_logic.dart
# lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_page.dart
# lib/main/lockDetail/lockSet/lockSet/lockSet_logic.dart
# lib/mine/mineSet/mineSet/mineSet_logic.dart
# lib/tools/advancedCalendar/src/widget.dart
# pubspec.yaml
|
2024-12-04 14:25:23 +08:00 |
|
魏少阳
|
789a3142df
|
fix: 完成修复国际化界面显示bug
|
2024-12-04 13:55:58 +08:00 |
|
Liuyf
|
3d341e8d13
|
ci: 添加联调，预发布环境ci构建通知，同时包含xhj，sky旗下不同产
|
2024-12-02 18:02:32 +08:00 |
|
Liuyf
|
52210c6368
|
ci: 添加联调，预发布环境ci构建通知，同时包含xhj，sky旗下不同产
|
2024-12-02 17:24:27 +08:00 |
|
Liuyf
|
ef6e903ec9
|
other：iOS新增xhj，sky本地调试pre环境配置
|
2024-12-02 17:05:27 +08:00 |
|
Liuyf
|
a7f63b771b
|
Merge branch 'release' into develop
|
2024-11-29 13:31:20 +08:00 |
|
Liuyf
|
3d3cbf80ad
|
fix： ITMS-91056: Invalid privacy manifest
v1.0.88
|
2024-11-29 12:34:50 +08:00 |
|
Liuyf
|
aee84858c8
|
fix： ITMS-91056: Invalid privacy manifest
|
2024-11-28 19:37:34 +08:00 |
|
魏少阳
|
8256557327
|
fix: 修复国际化简体中文显示繁体中文bug
|
2024-11-27 17:22:01 +08:00 |
|
刘燕峰
|
98f7582b1d
|
Delete .DS_Store
|
2024-11-26 09:51:24 +00:00 |
|
刘燕峰
|
1ed47dda7c
|
Delete .DS_Store
|
2024-11-26 09:50:18 +00:00 |
|
刘燕峰
|
4b840b4db0
|
Delete .DS_Store
|
2024-11-26 09:49:48 +00:00 |
|
刘燕峰
|
1254397688
|
Delete .DS_Store
|
2024-11-26 09:49:33 +00:00 |
|
刘燕峰
|
b7dd4d76f6
|
Delete .DS_Store
|
2024-11-26 09:49:22 +00:00 |
|
魏少阳
|
590d457f68
|
Merge：merge develop into build-addGateway-20240814
|
2024-11-26 17:46:54 +08:00 |
|
刘燕峰
|
9fa56c11a8
|
Merge branch 'develop_liyi' into 'build-addGateway-20240814'
fix:修复部分国际化内容
See merge request StarlockTeam/app-starlock!2
|
2024-11-26 05:53:15 +00:00 |
|
魏少阳
|
a77ad75171
|
Merge branch 'develop' of code.star-lock.cn:StarlockTeam/app-starlock into develop
|
2024-11-26 13:47:42 +08:00 |
|
|
|
860016cbf8
|
fix:修复部分国际化bug
|
2024-11-26 11:14:48 +08:00 |
|
|
|
4730b0ebc9
|
Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi
|
2024-11-25 14:57:28 +08:00 |
|
|
|
b79f5d0913
|
fix:修复部分国际化bug
|
2024-11-25 14:56:11 +08:00 |
|
