225 Commits

Author SHA1 Message Date
“DaisyWu”
2f41195d8b fix: 修复iOS收不到推送问题 2025-02-13 10:56:24 +08:00
wsy
8160326833 Merge branch 'develop' into build-addGateway-20240814 2025-02-12 14:25:46 +08:00
wsy
55c971071a fix: 修复网关相关bug 2025-02-12 14:24:23 +08:00
“DaisyWu”
63b5e3f79e fix: sky和鑫泓佳环境下推送渠道的区分以及各个厂商通道ID的规整 2025-02-10 14:05:09 +08:00
“DaisyWu”
d9aadc0cd1 Merge branch 'develop_liyi' of code-internal.star-lock.cn:StarlockTeam/app-starlock into develop_liyi 2025-02-10 09:45:50 +08:00
“DaisyWu”
8a9afdcffc feat: 新增安卓本地通知自定義樣式 2025-02-10 09:45:36 +08:00
a422f48c22 Merge remote-tracking branch 'origin/develop' into develop_liyi 2025-02-08 14:39:23 +08:00
Liuyf
0f246f3067 fix:xhj,sky 微信相关配置分离 2025-02-07 15:27:06 +08:00
197827143f Merge remote-tracking branch 'origin/develop' into develop_liyi
# Conflicts:
#	ios/Podfile.lock
2025-02-05 10:50:48 +08:00
Liuyf
0839c9ec3c fix:星星锁更换包名签名后第三方平台业务key申请、配置,逻辑适配等工作 2025-01-24 12:01:55 +08:00
359a7f3de4 style:调整文件名错别字 2025-01-23 14:30:31 +08:00
5b96705633 fix:增加视频日志中的视频缩略图、修复监控时锁板不在线状态不变更的问题 2025-01-22 13:53:17 +08:00
d7a6a76d07 Merge remote-tracking branch 'origin/develop' into develop_liyi
# Conflicts:
#	lan/lan_en.json
#	lan/lan_keys.json
#	lan/lan_zh.json
#	lib/tools/storage.dart
2025-01-20 14:15:26 +08:00
Liuyf
7e25bb01a9 feat: 新增app版本发布说明 2025-01-15 19:08:23 +08:00
b754d56b28 Merge remote-tracking branch 'origin/develop' into develop_liyi
# Conflicts:
#	lib/main.dart
#	lib/tools/storage.dart
2025-01-14 18:00:08 +08:00
Liuyf
9bfac8fe20 Merge branch 'develop' into feat_devops 2025-01-11 16:33:25 +08:00
魏少阳
49b042d62b fix: 1、修复进入万师傅白屏问题。2、iOS原生添加34国权限文案 2025-01-11 14:52:12 +08:00
Liuyf
3bccec750b feat:firebase统计和事件上报接入 2025-01-10 19:19:17 +08:00
6ecf89088e Merge remote-tracking branch 'origin/develop' into develop_liyi
# Conflicts:
#	lib/blue/io_gateway/io_gateway_configuringWifi.dart
2025-01-09 14:11:04 +08:00
323c99b27e fix:完善对讲流程、增加监控功能 2025-01-09 14:10:10 +08:00
0b65d905b9 Merge remote-tracking branch 'origin/develop' into develop_liyi 2025-01-08 11:30:53 +08:00
Liuyf
f1447d8a94 Merge branch 'develop' into release 2025-01-08 08:50:55 +08:00
Liuyf
bb1cab3b00 fix: umeng初始化隐私合规问题修复 2025-01-07 20:03:47 +08:00
Liuyf
5dd0423c59 fix: 隐私合规问题修复 2025-01-07 16:44:55 +08:00
Liuyf
64d1cd902b fix: 隐私合规问题修复 2025-01-07 16:43:00 +08:00
魏少阳
e219c240bf fix: 1、修复一键登录sky环境登录问题。2、完善一键登录bug 2025-01-02 10:43:41 +08:00
魏少阳
64e5a03f77 fix: 1、完成一键登录功能 2024-12-30 18:17:28 +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
魏少阳
b253a9a134 fix: 修改国际化bug 2024-12-19 14:30:08 +08:00
“DaisyWu”
d146c8be8d Merge branch 'develop_liyi' of http://code.star-lock.cn/StarlockTeam/app-starlock into develop_liyi 2024-12-17 17:08:48 +08:00
“DaisyWu”
eb1c018581 feat: 1,新增电子反锁UI及本地功能
2,新增可视门铃码国际化UI及本地功能
	3,新增双重认证UI及本地功能
	4,新增双锁联动UI及本地功能
2024-12-17 17:07:59 +08:00
2bdcc2f888 Merge remote-tracking branch 'origin/develop' into develop_liyi 2024-12-16 10:14:01 +08:00
魏少阳
4d98561545 fix: 1、添加繁体香港。2、修复简体、繁体(台湾)、繁体(香港)传入显示问题。3、修复网关模块bug。4、添加网关强制删除功能。5、添加网关扫描设备功能。6、修复国际化其他bug 2024-12-13 10:59:42 +08:00
95d6016b58 fix:销毁星图资源时同时清除缓存 2024-12-12 16:06:28 +08:00
“DaisyWu”
a8fe92e46d Merge branch 'develop' into develop_liyi
# Conflicts:
#	lan/lan_zh.json
2024-12-09 16:04:46 +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
fec9933c0a feat:增加新的中继协议逻辑 2024-12-03 10:06:27 +08:00
魏少阳
590d457f68 Merge:merge develop into build-addGateway-20240814 2024-11-26 17:46:54 +08:00
b79f5d0913 fix:修复部分国际化bug 2024-11-25 14:56:11 +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
魏少阳
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
魏少阳
d6ca149344 fix: 1、修复国家化看其他国家语言是现有国际化显示问题。2、网关添加从服务器拉取网关配置功能 2024-11-12 16:49:51 +08:00
魏少阳
03cb9c9451 fix: 修复国际化问题 2024-11-05 09:55:04 +08:00
魏少阳
ab1ab37cbd fix: 1、取消锁详情进入操作记录界面就从锁上面拉取记录功能。2、修复操作记录频繁调用接口bug 2024-10-31 17:09:06 +08:00