1730 Commits

Author SHA1 Message Date
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
178353895e fix:修复部分国际化bug、增加切换系统语言时更换到对应语言应用昵称 2024-11-25 14:56:10 +08:00
50b6cbd655 fix:修复部分国际化bug、增加切换系统语言时更换到对应语言应用昵称 2024-11-25 14:56:10 +08:00
魏少阳
f562eb085e fix: 1、修复对讲收不到对讲请求bug。2、修复根据名字T9A判断是否判断设备处于长休眠状态改为支持项判断。3、修复国际化bug 2024-11-25 11:07:29 +08:00
3655357192 fix:修复部分国际化bug 2024-11-21 18:11:11 +08:00
55ace71057 Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2024-11-21 11:43:44 +08:00
db48533b43 fix:修复部分国际化bug、增加切换系统语言时更换到对应语言应用昵称 2024-11-21 11:43:31 +08:00
4d1fd4416a fix:修复部分国际化bug、增加切换系统语言时更换到对应语言应用昵称 2024-11-21 11:38:13 +08:00
590c834951 fix:修复部分国际化bug、增加切换系统语言时更换到对应语言应用昵称 2024-11-21 11:35:10 +08:00
魏少阳
99f56e95fd fix: 修改国际化问题 2024-11-21 10:14:52 +08:00
魏少阳
652a46aa3e fix: 修复国际化bug 2024-11-20 10:04:55 +08:00
魏少阳
720406913a feat: 1、添加跳转小程序。2、修改网关配网逻辑。3、修复电子钥匙、卡、指纹、密码模块国际化bug 2024-11-18 15:29:08 +08:00
Liuyf
0bdbf7be22 fix: ci上传pgy偶发失败问题 2024-11-13 18:19:09 +08:00
Liuyf
42a6ef0dcc fix: 修复重置密码没有响应问题 2024-11-13 17:16:25 +08:00
魏少阳
d6ca149344 fix: 1、修复国家化看其他国家语言是现有国际化显示问题。2、网关添加从服务器拉取网关配置功能 2024-11-12 16:49:51 +08:00
魏少阳
38f5f429e4 fix: 修改国际化bug 2024-11-06 09:28:18 +08:00
魏少阳
03cb9c9451 fix: 修复国际化问题 2024-11-05 09:55:04 +08:00
Liuyf
4cd38d56d2 ci: fix ' ios-voice-processor (= 1.1.0, ~> 1.1.0)' issue 2024-11-02 10:15:24 +08:00
魏少阳
3b7dd563e6 Merge branch 'develop' of code.star-lock.cn:StarlockTeam/app-starlock into develop 2024-11-02 09:22:58 +08:00
魏少阳
02c3429e30 fix: 修改国际化bug 2024-11-02 09:22:37 +08:00
魏少阳
1462e74732 Merge branch 'bugly' of code.star-lock.cn:StarlockTeam/app-starlock into bugly 2024-10-31 17:09:11 +08:00
魏少阳
ab1ab37cbd fix: 1、取消锁详情进入操作记录界面就从锁上面拉取记录功能。2、修复操作记录频繁调用接口bug 2024-10-31 17:09:06 +08:00
Liuyf
5deef39697 other: 本地开发local地图密钥添加 2024-10-31 16:20:52 +08:00
Liuyf
e20e6702b9 Merge branch 'release' v1.0.87 2024-10-28 16:54:30 +08:00
Liuyf
f801b29e69 fix: ios-voice-processor (= 1.1.0, ~> 1.1.0) depends resolved failed 2024-10-28 16:52:57 +08:00
Liuyf
7633a398a4 Merge branch 'release' 2024-10-28 16:27:43 +08:00
Liuyf
60cfa16fff other: 继续沿用锁通通为App名称 2024-10-28 16:25:05 +08:00