117 Commits

Author SHA1 Message Date
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
魏少阳
a61ebda710 fix: 1、修复wifi锁、网关配网传入的gatewayJson长度1字节改为2字节bug 2025-01-08 19:35:42 +08:00
7943aef0c2 Merge remote-tracking branch 'origin/develop' into develop_liyi 2025-01-08 18:16:45 +08:00
魏少阳
a90a6a387a Merge branch 'develop' into build-addGateway-20240814 2025-01-08 18:05:43 +08:00
魏少阳
f21e49ae68 fix: 1、修复wifi锁、网关配网传入的gatewayJson长度1字节改为2字节 2025-01-08 18:03:30 +08:00
0b65d905b9 Merge remote-tracking branch 'origin/develop' into develop_liyi 2025-01-08 11:30:53 +08:00
Liuyf
b7ed39388a fix: umeng初始化隐私合规问题修复。 2025-01-08 11:08:26 +08:00
c16c9be4c6 fix:增加p2p调试命令 2025-01-06 09:52:14 +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
魏少阳
ddf590c321 fix: 1、修改网关模块、远程开锁超时时间为60秒 2024-12-31 13:57:22 +08:00
c865db7a9f fix:增加页面播放逻辑、调整proto文件 2024-12-28 14:58:01 +08:00
1bafcd535a style:增加对讲状态,整理部分代码 2024-12-16 16:04:41 +08:00
2bdcc2f888 Merge remote-tracking branch 'origin/develop' into develop_liyi 2024-12-16 10:14:01 +08:00
魏少阳
2636f19619 fix: 1、进入修改国际化语言界面重启APP界面变灰问题。2、wifi密码输错一次再次提交没反应的问题 2024-12-14 09:20:21 +08:00
aad509e7b9 fix:将webview拉伸为全屏、整理代码 2024-12-13 14:30:07 +08:00
魏少阳
4d98561545 fix: 1、添加繁体香港。2、修复简体、繁体(台湾)、繁体(香港)传入显示问题。3、修复网关模块bug。4、添加网关强制删除功能。5、添加网关扫描设备功能。6、修复国际化其他bug 2024-12-13 10:59:42 +08:00
bb682226af fix:增加html测试 2024-12-12 10:28:03 +08:00
b723d127f4 Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2024-12-09 17:06:14 +08:00
c46115c5b2 fix:去掉better_player依赖 2024-12-09 17:05:20 +08:00
“DaisyWu”
a8fe92e46d Merge branch 'develop' into develop_liyi
# Conflicts:
#	lan/lan_zh.json
2024-12-09 16:04:46 +08:00
3b53a44887 fix:完善状态变更和通知 2024-12-09 15:57:41 +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
2429a107e1 feat:增加protobuf提供的实体类转换 2024-12-03 16:15:19 +08:00
063fc90a29 fix:调整新的中继协议中的上报签名逻辑 2024-12-03 14:44:29 +08:00
da16a61940 fix:调整新的中继协议中的上报签名逻辑 2024-12-03 10:06:28 +08:00
3a27c83c62 fix:调整新的中继协议中的上报签名逻辑 2024-12-03 10:06:27 +08:00
fec9933c0a feat:增加新的中继协议逻辑 2024-12-03 10:06: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 2024-11-29 12:34:50 +08:00
Liuyf
aee84858c8 fix: ITMS-91056: Invalid privacy manifest 2024-11-28 19:37:34 +08:00
魏少阳
590d457f68 Merge:merge develop into build-addGateway-20240814 2024-11-26 17:46:54 +08:00
魏少阳
720406913a feat: 1、添加跳转小程序。2、修改网关配网逻辑。3、修复电子钥匙、卡、指纹、密码模块国际化bug 2024-11-18 15:29:08 +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
Liuyf
f801b29e69 fix: ios-voice-processor (= 1.1.0, ~> 1.1.0) depends resolved failed 2024-10-28 16:52:57 +08:00
魏少阳
93b24fec2e 1、添加友盟统计
2、添加埋点
2024-10-19 18:26:41 +08:00
魏少阳
6eeb2e9fe3 修复国际化bug 2024-10-19 09:38:57 +08:00
魏少阳
427503c10b 完成网关配网功能 2024-10-08 18:22:31 +08:00
魏少阳
219c70d3cc 修改过建好,打包给谢敬调试网关 2024-10-08 10:30:43 +08:00
魏少阳
b8e6c52afe 添加版本打包 2024-10-07 09:16:21 +08:00
魏少阳
9336e83434 1.0.81版本打包给宿舍门测试 2024-09-30 10:35:44 +08:00
Liuyf
552c787c5a feat: bugly自定义日志采集逻辑 2024-09-29 13:47:50 +08:00
魏少阳
d947ffeeb2 修复网关调试问题 2024-09-26 13:39:16 +08:00
魏少阳
6b792df101 1、添加网关获取附近WiFi协议及逻辑
2、添加添加网关协议、接口及逻辑
3、添加网关详情功能
4、添加删除网关功能
2024-09-19 09:26:07 +08:00
魏少阳
75b400c0e9 合并优化启动代码 2024-09-11 15:23:46 +08:00
魏少阳
ef693c5429 Merge branch 'release' into build-addGateway-20240814
# Conflicts:
#	pubspec.yaml
2024-09-04 09:53:59 +08:00
魏少阳
a7336b79cc 1、添加开完锁之后数据上传
2、打包apk上传到pre下载页
3、完成App启动数据请求优化问题
2024-09-02 18:09:57 +08:00