166 Commits

Author SHA1 Message Date
0b65d905b9 Merge remote-tracking branch 'origin/develop' into develop_liyi 2025-01-08 11:30:53 +08:00
Liuyf
64d1cd902b fix: 隐私合规问题修复 2025-01-07 16:43:00 +08:00
3bd96e58b9 Merge remote-tracking branch 'origin/develop' into develop_liyi
# Conflicts:
#	lib/network/api_provider_base.dart
2025-01-03 11:37:59 +08:00
魏少阳
2442e599b6 fix: 1、修复bug 2024-12-26 16:26:00 +08:00
db7cd20a12 Merge remote-tracking branch 'origin/develop' into develop_liyi 2024-12-26 09:11:00 +08:00
Liuyf
5c351ccc7b feat:App本地调试名称国际化适配 2024-12-25 11:04:54 +08:00
Liuyf
d7611bdc12 feat:App名称国际化 2024-12-25 11:01:04 +08:00
Liuyf
9d31bca9e0 feat:App名称国际化 2024-12-25 10:46:01 +08:00
0f65751f48 Merge remote-tracking branch 'origin/develop' into develop_liyi 2024-12-25 09:10:56 +08:00
Liuyf
742d7b4f1b other: 默认配置好本地调试环境 2024-12-24 16:02:55 +08:00
ci_bot
5a4de444e2 other: 证书问题修复 2024-12-24 15:50:18 +08:00
Liuyf
8b30af9cea feat:app名称国际化适配 2024-12-24 15:43:54 +08:00
685591e652 Merge remote-tracking branch 'origin/develop' into develop_liyi 2024-12-24 14:22:25 +08:00
魏少阳
136da703cc fix: 1、添加跟随系统功能。2、修复网关bug。3、修复其他bug 2024-12-24 14:11:54 +08:00
d6322c21ad Merge remote-tracking branch 'origin/develop' into develop_liyi 2024-12-19 15:47:16 +08:00
魏少阳
b0a0deaee4 Merge branch 'develop' into build-addGateway-20240814 2024-12-19 14:31:27 +08:00
魏少阳
b253a9a134 fix: 修改国际化bug 2024-12-19 14:30:08 +08:00
094e4c1662 Merge remote-tracking branch 'origin/develop' into develop_liyi 2024-12-18 09:26:51 +08:00
Liuyf
5b8615b9d2 feat: 锁通通放开‘增值服务’和‘配件商城’ 2024-12-16 16:43:29 +08:00
Liuyf
e119a8eb78 Revert "refactor: sky App图标和名称替换"
This reverts commit 4fbce85a0fcdb8ababec809f6a82fa8804b679a4.
2024-12-16 16:14:36 +08:00
14eb5c448e fix:代码合并 2024-12-10 09:45:50 +08:00
ci_bot
21cc865b14 feat: 配置Debug模式下 xhj,sky证书 2024-12-09 18:47:58 +08:00
Liuyf
a553dfa967 feat: 支持sky,xhj Debug模式下本地调试 2024-12-09 18:45:47 +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
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
魏少阳
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
魏少阳
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
ef6e903ec9 other:iOS新增xhj,sky本地调试pre环境配置 2024-12-02 17:05:27 +08:00
刘燕峰
1254397688 Delete .DS_Store 2024-11-26 09:49:33 +00:00
魏少阳
590d457f68 Merge:merge develop into build-addGateway-20240814 2024-11-26 17:46:54 +08:00
魏少阳
a77ad75171 Merge branch 'develop' of code.star-lock.cn:StarlockTeam/app-starlock into develop 2024-11-26 13:47:42 +08:00
178353895e fix:修复部分国际化bug、增加切换系统语言时更换到对应语言应用昵称 2024-11-25 14:56:10 +08:00