2101 Commits

Author SHA1 Message Date
7f0c1fca1d fix:增加使用登陆接口的scdUrl动态设置星图的url 2025-02-12 09:16:00 +08:00
“DaisyWu”
05f9cad8c9 Merge branch 'develop_liyi' of code-internal.star-lock.cn:StarlockTeam/app-starlock into develop_liyi 2025-02-10 14:05:18 +08:00
“DaisyWu”
63b5e3f79e fix: sky和鑫泓佳环境下推送渠道的区分以及各个厂商通道ID的规整 2025-02-10 14:05:09 +08:00
85119140a9 Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2025-02-10 13:41:58 +08:00
e5d11f6ee8 fix:注释“锁已经被重置”的提示框 2025-02-10 13:41:15 +08:00
329989b2ba fix:调整锁时间获取 2025-02-10 13:40:41 +08:00
494a57074e fix:调整为手动隐藏loading框 2025-02-10 13:40:21 +08:00
bc48f573a1 fix:调整WiFi配网时loading不连续的问题 2025-02-10 13:40:02 +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
Liuyf
d867cf870e Merge branch 'develop_liyi' of code-internal.star-lock.cn:StarlockTeam/app-starlock into develop_liyi 2025-02-08 14:53:04 +08:00
a422f48c22 Merge remote-tracking branch 'origin/develop' into develop_liyi 2025-02-08 14:39:23 +08:00
e13313bd31 fix:增加p2p代码,调整对讲页面的国际化内容 2025-02-08 14:38:02 +08:00
f1c66ec95a fix:修复猫眼设置开关不发送命令的问题 2025-02-08 14:36:36 +08:00
Liuyf
d5ac3ebf3e Merge branch 'develop_liyi' of code-internal.star-lock.cn:StarlockTeam/app-starlock into develop_liyi 2025-02-07 15:44:47 +08:00
Liuyf
0f246f3067 fix:xhj,sky 微信相关配置分离 2025-02-07 15:27:06 +08:00
Liuyf
a03fa613c6 Merge branch 'develop' into release 2025-02-07 11:04:52 +08:00
Liuyf
7a694f567e fix:xhj applinks配置 2025-02-07 11:04:23 +08:00
72e2e3f57e fix:修复进入锁详情页提示“数据不存在问题” 2025-02-07 10:05:58 +08:00
“DaisyWu”
2f00a6280d feat: 1,注释掉旧的udp流程2,注释掉对讲收发包调试代码 2025-02-06 18:44:55 +08:00
“DaisyWu”
e3beea01da Merge branch 'develop_liyi' of code-internal.star-lock.cn:StarlockTeam/app-starlock into develop_liyi 2025-02-06 11:09:53 +08:00
“DaisyWu”
492b2e713d fix: 星图:1,统一项目中星图配置获取途径及有变化更新loginData2,星图:完成修复及验证APP首次注册账号登录后未上线导致呼叫对讲无反应问题 2025-02-06 11:09:03 +08:00
9ca1119974 fix:取消日志打印 2025-02-06 10:03:18 +08:00
Liuyf
15dfcf5265 Merge branch 'develop_liyi' of code-internal.star-lock.cn:StarlockTeam/app-starlock into develop_liyi 2025-02-05 18:40:04 +08:00
bc2850c65e fix:修复猫眼设置项目传递逻辑 2025-02-05 17:56:57 +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
1f83ed80a1 Merge branch 'develop' into release 2025-01-27 15:08:36 +08:00
Liuyf
e1d347760e fix:星星锁更换包名签名后第三方平台业务key申请、配置,逻辑适配等工作 2025-01-26 18:01:22 +08:00
wsy
284fb97d67 Merge branch 'develop' into build-addGateway-20240814 2025-01-26 17:28:48 +08:00
wsy
cceec11e7f fix: 放开Firebase调用 2025-01-26 17:26:29 +08:00
Liuyf
16231cdb73 Merge branch 'develop' into develop_liyi 2025-01-24 16:30:19 +08:00
魏少阳
28442b9614 fix: 修复星图待办:网关、对讲、P2P对应问题 2025-01-24 13:47:26 +08:00
Liuyf
12e886c4b7 Merge branch 'develop' into release 2025-01-24 13:45:31 +08:00
Liuyf
d4e7753fcf fix:星星锁更换包名签名后第三方平台业务key申请、配置,逻辑适配等工作 2025-01-24 13:31:40 +08:00
Liuyf
0839c9ec3c fix:星星锁更换包名签名后第三方平台业务key申请、配置,逻辑适配等工作 2025-01-24 12:01:55 +08:00
d2b3ce2a3b style:将对讲时的开门调整为使用http 2025-01-24 11:05:28 +08:00
“DaisyWu”
cea20dff00 feat: 代码合并 2025-01-23 15:27:39 +08:00
“DaisyWu”
176a265859 feat: 1,星图:退出登录关闭udp相关操作 2,星图:销毁资源取消发送通话中挂断命令 2025-01-23 15:04:59 +08:00
359a7f3de4 style:调整文件名错别字 2025-01-23 14:30:31 +08:00
459f94658d fix:收到蓝牙透传消息使用原有的蓝牙事件触发监听事件进行处理 2025-01-23 14:28:36 +08:00
3a36d9e76e Merge remote-tracking branch 'origin/develop' into develop_liyi 2025-01-23 13:39:02 +08:00
Liuyf
5c4aab9634 fix:firebase base on iOS 13 2025-01-23 10:54:20 +08:00
76b1465f55 Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2025-01-23 10:43:47 +08:00
acbf82c2da fix:调整获取配网结果时的逻辑 2025-01-23 10:43:37 +08:00
Liuyf
9c00533e0f build trigger 2025-01-23 10:28:11 +08:00
Liuyf
3536279736 Revert "other:临时打包sky pre"
This reverts commit f28237c7c7946e74a3cdd5f5c697ecce713de9c6.
2025-01-23 10:17:35 +08:00
342502c788 Merge remote-tracking branch 'origin/develop' into develop_liyi 2025-01-23 09:46:25 +08:00
7251fdcb78 fix:增加只有在接听成功或者等待接听状态才处理挂断请求 2025-01-23 09:44:56 +08:00
b16aa114eb fix:增加视频日志中的视频缩略图、修复监控时锁板不在线状态不变更的问题 2025-01-22 16:11:57 +08:00
“DaisyWu”
da6b92761d Merge branch 'develop_liyi' of code-internal.star-lock.cn:StarlockTeam/app-starlock into develop_liyi 2025-01-22 13:56:09 +08:00