Compare commits

...

1783 Commits

Author SHA1 Message Date
513607e1ef fix: 增加日志 2025-11-07 18:03:11 +08:00
6cc00ca348 fix: 增加调试页面 2025-10-29 18:02:55 +08:00
21aa3adf7b fix: 调整页面是默认选中为锁通通 2025-10-27 17:35:41 +08:00
f6e900aaad fix: 增加日志 2025-10-27 09:27:37 +08:00
41aea1d1bf fix: 增加调试页面 2025-10-24 09:17:22 +08:00
5ed7e4013e fix: 调整列表左滑无法删除的问题 2025-10-23 09:49:21 +08:00
a4892633a3 fix: 增加日志 2025-10-22 15:52:53 +08:00
f73943785f fix: 修复添加完锁之后立马蓝牙开锁无法打开的问题 2025-10-22 14:38:55 +08:00
baeb3c139a fix: 修复在列表无法直接删除锁的问题 2025-10-22 09:59:55 +08:00
e1011688de fix: 调整第三方平台设置 2025-10-22 09:37:26 +08:00
4f1b1dd02f fix: 恢复分支 2025-10-20 15:29:28 +08:00
ae176ffb6c fix: 增加网关配网时的参数 2025-10-20 14:48:13 +08:00
2bfbac52fa fix: 停用友盟,格式化部分代码 2025-10-15 16:52:04 +08:00
10c9b896aa fix: 停用友盟,格式化部分代码 2025-10-09 11:38:47 +08:00
ddb71668c4 fix: 增加网络信号信息 2025-10-09 11:37:38 +08:00
d3cd4adce8 fix: 增加ai助理、调整第三方协议 2025-10-09 11:37:24 +08:00
b5dfd10baa fix: 调整注册账户时国外用户默认使用邮箱,并给出提示 2025-09-28 09:31:13 +08:00
2e85975c41 fix: 调整蓝牙开锁时出现重复响应,增加防抖处理。调整动画控制器在初始化之前进行赋值 2025-09-26 18:49:41 +08:00
8a5de7d442 fix: 调整蓝牙开锁时出现重复响应,增加防抖处理。调整动画控制器在初始化之前进行赋值 2025-09-25 18:23:35 +08:00
8fd0a5243e fix: 测试ci
Some checks failed
Flutter CI - Basic Setup / 🏗️ Build Flutter Artifacts (pull_request) Failing after 3m45s
Flutter CI - Basic Setup / 🔧 Basic Setup (pull_request) Successful in 1m31s
2025-09-25 10:57:01 +08:00
bdaad63b11 fix: 测试ci
Some checks failed
Flutter CI - Basic Setup / 🔧 Basic Setup (pull_request) Successful in 3m21s
Flutter CI - Basic Setup / 🏗️ Build Flutter Artifacts (pull_request) Failing after 5m34s
2025-09-25 10:38:36 +08:00
0ee37e8fda fix: 测试ci
Some checks failed
Flutter CI - Basic Setup / 🔧 Basic Setup (pull_request) Successful in 3m13s
Flutter CI - Basic Setup / 🏗️ Build Flutter Artifacts (pull_request) Failing after 7m9s
2025-09-25 10:18:11 +08:00
670e6e8b26 fix: 测试ci 2025-09-25 10:16:02 +08:00
68b244a527 fix: 测试ci 2025-09-25 09:56:28 +08:00
47b5e7b06e fix: 测试ci(增加构建制品) 2025-09-25 09:55:37 +08:00
736854c959 fix: 测试ci(增加构建制品) 2025-09-25 09:55:10 +08:00
7aef630e1b fix: 测试ci(增加构建制品) 2025-09-25 09:54:04 +08:00
3eee6d663a fix: 测试ci(增加构建制品)
Some checks failed
Flutter CI - Basic Setup / 🔧 Basic Setup (push) Successful in 3m38s
Flutter CI - Basic Setup / 🏗️ Build Flutter Artifacts (push) Has been cancelled
2025-09-25 09:43:46 +08:00
fc4429d828 fix: 测试ci
Some checks failed
Flutter CI - Basic Setup / 🔧 Basic Setup (push) Failing after 1m30s
2025-09-25 09:41:33 +08:00
9c14338c53 fix: 测试ci(计算下一位版本号)
All checks were successful
Flutter CI - Basic Setup / 🔧 Basic Setup (push) Successful in 3m11s
2025-09-25 09:32:03 +08:00
9b69c65bf8 fix: 测试ci
All checks were successful
Flutter CI - Basic Setup / 🔧 Basic Setup (push) Successful in 3m14s
2025-09-25 09:22:12 +08:00
398c45ade1 fix: 测试ci
Some checks failed
Flutter CI - Basic Setup / 🔧 Basic Setup (push) Failing after 3m32s
2025-09-25 09:12:47 +08:00
ac157e8b93 fix: 测试ci
Some checks failed
Flutter Build - Sky Develop / 📦 Build AAB (Develop) (push) Failing after 2m30s
Flutter Build - Sky Develop / 🍎 Build iOS (Develop) (push) Failing after 1m31s
Flutter Build - Sky Develop / 🏷️ Create Tag & Notify (push) Has been skipped
Flutter Build - Sky Develop / 🧮 Determine Version (push) Successful in 4m11s
Flutter Build - Sky Develop / 📦 Build APK (Develop) (push) Failing after 2m35s
2025-09-23 11:07:09 +08:00
d49359bdf7 fix: 测试ci
Some checks failed
Flutter Build - Sky Develop / 🧮 Determine Version (push) Successful in 3m24s
Flutter Build - Sky Develop / 📦 Build APK (Develop) (push) Failing after 3m11s
Flutter Build - Sky Develop / 📦 Build AAB (Develop) (push) Failing after 2m39s
Flutter Build - Sky Develop / 🍎 Build iOS (Develop) (push) Failing after 5m28s
Flutter Build - Sky Develop / 🏷️ Create Tag & Notify (push) Has been skipped
2025-09-23 10:43:51 +08:00
2ab18a1425 fix: 测试ci
Some checks failed
Flutter Build - Sky Develop / 🧮 Determine Version (push) Has been cancelled
Flutter Build - Sky Develop / 📦 Build APK (Develop) (push) Has been cancelled
Flutter Build - Sky Develop / 📦 Build AAB (Develop) (push) Has been cancelled
Flutter Build - Sky Develop / 🍎 Build iOS (Develop) (push) Has been cancelled
Flutter Build - Sky Develop / 🏷️ Create Tag & Notify (push) Has been cancelled
2025-09-23 10:42:47 +08:00
c41e1ebd9d fix: 测试ci
Some checks failed
Flutter Build - Sky / 🧮 Determine Version (push) Failing after 1m30s
Flutter Build - Sky / 📦 Build APK (push) Has been skipped
Flutter Build - Sky / 📦 Build AAB (push) Has been skipped
Flutter Build - Sky / 🍎 Build iOS (push) Has been skipped
Flutter Build - Sky / 🏷️ Create Tag & Notify (push) Has been skipped
2025-09-23 10:27:05 +08:00
13af3c02a2 fix: 测试ci
Some checks failed
Flutter Build - Sky Dev / Build Android for Sky (dev) (push) Failing after 8m47s
2025-09-23 10:11:29 +08:00
2674cf2554 fix: 测试ci
Some checks failed
Flutter Build - Sky Dev / Build Android for Sky (dev) (push) Failing after 6m16s
2025-09-23 09:42:50 +08:00
1f107b4be7 fix: 测试ci
Some checks failed
Flutter Build - Sky Dev / Build Android for Sky (dev) (push) Failing after 1m48s
2025-09-23 09:16:36 +08:00
74826b9acb fix: 测试ci
Some checks failed
Flutter Build - Sky Dev / Build Android for Sky (dev) (push) Failing after 2m23s
2025-09-23 09:11:59 +08:00
c122bfa637 fix: 测试ci
Some checks failed
Flutter Build - Sky Dev / Build Android for Sky (dev) (push) Failing after 1m46s
2025-09-22 18:37:42 +08:00
462e464f8a fix: 测试ci
Some checks failed
Flutter Build - Sky Dev / Build Android for Sky (dev) (push) Failing after 1m51s
2025-09-22 18:32:24 +08:00
7c346a118e fix: 测试ci
Some checks failed
Flutter Build - Sky Dev / Build Android for Sky (dev) (push) Has been cancelled
2025-09-22 18:31:50 +08:00
01d60d2d49 fix: 测试ci
Some checks failed
Flutter CI - Build iOS & Android / Build Flutter App (push) Failing after 2m53s
2025-09-22 18:25:50 +08:00
73548e45b6 fix: 测试ci
All checks were successful
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 1m32s
2025-09-22 18:23:59 +08:00
004a0b89a9 fix: 测试ci
Some checks are pending
Flutter CI - Develop Sky / Build iOS & Android (push) Waiting to run
2025-09-22 18:07:29 +08:00
4cbaa92593 fix: 测试ci
Some checks are pending
Flutter CI - Develop Sky / Build iOS & Android (push) Waiting to run
2025-09-22 18:03:43 +08:00
47a1bfb914 Merge pull request 'develop_sky_liyi' (#2) from develop_sky_liyi into develop_sky
Some checks are pending
Flutter CI/CD Pipeline / Print Environment (push) Waiting to run
Flutter CI/CD Pipeline / Generate Git Tag (push) Blocked by required conditions
Flutter CI/CD Pipeline / Generate Next Version (push) Blocked by required conditions
Flutter CI/CD Pipeline / Build Android APK/AAB (push) Blocked by required conditions
Flutter CI/CD Pipeline / Build iOS IPA (push) Blocked by required conditions
Flutter CI/CD Pipeline / Create Release & Upload Assets (push) Blocked by required conditions
Flutter CI/CD Pipeline / Notify on Success (push) Blocked by required conditions
Flutter CI/CD Pipeline / Notify on Failure (push) Blocked by required conditions
Flutter CI/CD Pipeline / Clean Workspace (push) Blocked by required conditions
Reviewed-on: #2
2025-09-22 17:49:44 +08:00
7759267d0b Merge pull request 'develop_sky' (#1) from develop_sky into develop_sky_liyi
Some checks failed
Flutter CI/CD Pipeline / Print Environment (pull_request) Has been cancelled
Flutter CI/CD Pipeline / Generate Git Tag (pull_request) Has been cancelled
Flutter CI/CD Pipeline / Generate Next Version (pull_request) Has been cancelled
Flutter CI/CD Pipeline / Build Android APK/AAB (pull_request) Has been cancelled
Flutter CI/CD Pipeline / Build iOS IPA (pull_request) Has been cancelled
Flutter CI/CD Pipeline / Create Release & Upload Assets (pull_request) Has been cancelled
Flutter CI/CD Pipeline / Notify on Success (pull_request) Has been cancelled
Flutter CI/CD Pipeline / Notify on Failure (pull_request) Has been cancelled
Flutter CI/CD Pipeline / Clean Workspace (pull_request) Has been cancelled
Reviewed-on: #1
2025-09-22 17:48:19 +08:00
a8cc945d61 fix: 测试ci 2025-09-22 17:46:41 +08:00
725ef31640 fix: 测试ci
All checks were successful
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 1m40s
2025-09-22 17:38:39 +08:00
1b70bd8b92 fix: 测试ci
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-09-22 17:33:51 +08:00
31123e503a fix: 测试ci 2025-09-22 17:28:58 +08:00
e8b2cf4660 fix: 调整插件版本 2025-09-22 17:17:00 +08:00
279b329a1e Merge branch 'develop_sky_liyi' into 'develop_sky'
fix: 调整插件版本

See merge request StarlockTeam/app-starlock!285
2025-09-22 07:35:42 +00:00
30283fe513 fix: 调整插件版本 2025-09-22 15:35:15 +08:00
8728c4f697 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix: 调整插件版本

See merge request StarlockTeam/app-starlock!284
2025-09-22 07:29:21 +00:00
766dd88770 fix: 调整插件版本 2025-09-22 15:27:45 +08:00
5118aed3ca Merge branch 'develop_sky_liyi' into 'develop_sky'
fix: 调整开锁在同步数据完成之后断开连接

See merge request StarlockTeam/app-starlock!283
2025-09-22 07:03:09 +00:00
987fd4770a fix: 调整开锁在同步数据完成之后断开连接 2025-09-22 15:01:44 +08:00
3df6716abb Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!281
2025-09-19 03:03:14 +00:00
adf1cf3f1c fix: 修复已配对的设备还能搜索到的问题 2025-09-19 10:20:39 +08:00
cfde51c063 fix: 修复设置语音包后等待几秒后出现操作失败的问题 2025-09-19 10:20:23 +08:00
8fd1dac254 fix: 更新国际化文本 2025-09-17 09:43:26 +08:00
13bf53e964 fix: 增加注册账户时使用国外手机号获取验证码时进行提示 2025-09-17 09:34:33 +08:00
7feb282f13 Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!277
2025-09-15 01:17:34 +00:00
4d60ea4535 fix: 调整蓝牙开锁后直接同步上传卡片、密码、指纹人脸 2025-09-12 10:21:07 +08:00
393ee9d2bc fix: 增加注册页面点击后收起键盘 2025-09-10 09:17:38 +08:00
fac3c060e6 fix: 增加蓝牙开锁后同步密码、卡、指纹、人脸、遥控的钥匙信息 2025-09-06 14:50:32 +08:00
694df0282f fix: 调整操作记录中id和昵称的兼容显示 2025-09-06 14:50:08 +08:00
6b65661384 fix:语言包设置逻辑 2025-09-05 15:11:07 +08:00
1b611ca9de Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整mtu设置

See merge request StarlockTeam/app-starlock!273
2025-09-04 09:04:53 +00:00
1d0366414c fix:调整mtu设置 2025-09-04 17:01:56 +08:00
fe13b0c2e0 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:兼容没有新增读取、设置语音包协议的锁板

See merge request StarlockTeam/app-starlock!270
2025-09-03 09:08:19 +00:00
de297682bd fix:兼容没有新增读取、设置语音包协议的锁板 2025-09-03 17:07:25 +08:00
2347ba871f Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:增加和读取锁板上的语音包设置

See merge request StarlockTeam/app-starlock!268
2025-09-01 06:31:07 +00:00
d18cd9645e fix:增加和读取锁板上的语音包设置 2025-09-01 14:30:26 +08:00
fbbf68c840 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整语音设置

See merge request StarlockTeam/app-starlock!266
2025-09-01 01:32:41 +00:00
ca8b26d48b fix:调整语音设置 2025-09-01 09:31:34 +08:00
e126dd60fc Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整录音时不播放声音

See merge request StarlockTeam/app-starlock!264
2025-08-29 05:41:20 +00:00
b2697eef17 fix:调整录音时不播放声音 2025-08-29 13:40:17 +08:00
bfc6363957 Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!262
2025-08-28 06:00:48 +00:00
1aea41026d fix:调整国际化内容 2025-08-28 13:59:22 +08:00
cafe132afc fix:调整录音时不播放声音 2025-08-28 13:41:53 +08:00
6496741144 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整音频结束时继续发送为0的音频包,而不是立即中断

See merge request StarlockTeam/app-starlock!260
2025-08-26 07:29:32 +00:00
22887310c0 fix:调整音频结束时继续发送为0的音频包,而不是立即中断 2025-08-26 15:28:18 +08:00
c4c82ea8f8 Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!258
2025-08-26 03:34:52 +00:00
d0b8f76303 fix:增加操作记录中的云存视频图像失效提示;国际化文本内容 2025-08-26 11:16:50 +08:00
4bbbac11a3 fix:调整音频增益逻辑 2025-08-26 11:14:19 +08:00
404ecf724f fix:调整猫眼切换工作模式时的loading状态 2025-08-22 14:26:23 +08:00
52f3ce64a4 Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!256
2025-08-22 05:36:56 +00:00
3e15966c64 fix:调整对讲音频发送速率 2025-08-22 13:35:42 +08:00
8a5e997262 Merge remote-tracking branch 'origin/develop_sky_liyi' into develop_sky_liyi 2025-08-22 09:57:07 +08:00
9a0a407022 fix:去除实时画面、取出异常告警设置 2025-08-22 09:57:03 +08:00
832c72df4a Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!253
2025-08-20 06:29:43 +00:00
6e853024dc fix:调整对讲命令时使用实际款高度 2025-08-20 14:22:09 +08:00
103737cec0 fix:增加读取锁语音包命令 2025-08-20 14:20:06 +08:00
026e06a79f fix:调整云存页面内容 2025-08-20 10:06:03 +08:00
9fdf8377ee fix:调整视频缩略图、调整操作记录查询逻辑 2025-08-19 10:16:20 +08:00
335f66a0b5 fix:调整登录页面键盘无法收起的问题 2025-08-18 18:18:02 +08:00
f48e7c8274 fix:调整操作记录中UI(未完成) 2025-08-18 18:17:41 +08:00
c32f052cb0 fix:调整操作记录中UI(未完成) 2025-08-18 14:48:24 +08:00
477f4f21be fix:增加第三方协议的选项、增加多语言选项的英文名显示 2025-08-18 09:19:41 +08:00
1a6b44ece9 Merge remote-tracking branch 'origin/develop_sky_liyi' into develop_sky_liyi 2025-08-15 17:22:49 +08:00
f4e8b5e5ef fix:增加英文描述 2025-08-15 17:22:36 +08:00
f23eff1c09 fix:取消循环指纹的写死逻辑 2025-08-15 14:12:13 +08:00
fc3f27e951 fix:调整ios的录音发送逻辑 2025-08-15 13:55:39 +08:00
47ddb9b72a fix:调整ios的录音发送逻辑 2025-08-15 13:52:13 +08:00
88db0e850b fix:调整ios收到对讲后找到推送的消息并设置为已读 2025-08-15 13:51:11 +08:00
94b314ddc5 fix:调整依赖,为了修复ci的构建失败 2025-08-12 11:12:25 +08:00
7fe97666e5 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整依赖,为了修复ci的构建失败

See merge request StarlockTeam/app-starlock!250
2025-08-12 02:54:52 +00:00
5ca0ba4a12 fix:调整依赖,为了修复ci的构建失败 2025-08-12 10:54:11 +08:00
5c209b985d 删除pubspec.lock 2025-08-12 02:48:23 +00:00
7048235138 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整依赖,为了修复ci的构建失败

See merge request StarlockTeam/app-starlock!249
2025-08-12 02:39:46 +00:00
b099c6101e fix:调整依赖,为了修复ci的构建失败 2025-08-12 10:39:12 +08:00
4a80acf9e1 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整依赖,为了修复ci的构建失败

See merge request StarlockTeam/app-starlock!248
2025-08-12 02:25:20 +00:00
8667b4017f fix:调整依赖,为了修复ci的构建失败 2025-08-12 10:22:36 +08:00
21fbf62a8f Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!247
2025-08-12 01:41:45 +00:00
9769501387 fix:调整依赖,为了修复ci的构建失败 2025-08-12 09:40:43 +08:00
0b1a9b69a3 fix:调整targetSdkVersion为google适配 2025-08-12 09:32:51 +08:00
84be5b7617 Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!243
2025-08-08 01:59:52 +00:00
9df1c3243b fix:调整操作记录中的显示文本 2025-08-08 09:55:16 +08:00
21ede72014 fix:增加巴西葡萄牙语 2025-08-08 09:54:54 +08:00
493fc19033 fix:调整循环密码的失效时间问题 2025-08-08 09:54:42 +08:00
f17a7feb9c fix:增加第三方协议平台设置的查询ttp接口 2025-08-08 09:54:23 +08:00
b0bd6515ac fix:增加第三方协议平台设置的查询ttp接口 2025-08-08 09:54:20 +08:00
2bfc84e428 fix:增加离线密码开锁的事件上报时增加密码字段 2025-08-07 14:19:50 +08:00
a5dcaae5a8 fix:增加巴西葡萄牙语 2025-08-07 10:47:08 +08:00
395e967abe fix:调整添加指纹时的步骤图片 2025-08-06 12:01:54 +08:00
c954ee6918 Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!240
2025-08-05 07:24:39 +00:00
46303ce2b9 fix:调整添加指纹时发送命令的阶段 2025-08-05 15:20:16 +08:00
8752c8dc41 fix:调整当添加完锁的锁出现已被重置逻辑的进行连接时将isReconnect设置为true 2025-08-05 15:19:42 +08:00
23a4008d2d fix:调整报警事件的文本为红色显示 2025-08-05 14:46:11 +08:00
c6e43651e1 fix:调整希腊语显示 2025-08-05 09:31:39 +08:00
c67db6e324 fix:调整操作记录中的id显示内容 2025-08-04 18:02:14 +08:00
0ab9b5f03a fix:调整ios和android页面不一致的问题 2025-08-04 15:54:19 +08:00
79948ff405 fix:调整新增指纹时的图片显示问题 2025-08-04 15:25:40 +08:00
862b87d5d1 fix:修复进入设置后还有loading的问题 2025-08-04 15:25:20 +08:00
295ce15fc4 fix:增加128bit的绑定状态判断改为位判断 2025-08-04 15:25:00 +08:00
5de4d4de57 fix:增加事件昵称中的id为录入时的记录姓名 2025-08-04 15:24:40 +08:00
aec0bc2b18 fix:增加首次发蓝牙端口后直接重发 2025-08-04 15:24:20 +08:00
93ce93bdd4 fix:修复进入设置后还有loading的问题 2025-08-04 15:23:58 +08:00
3957701172 Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!239
2025-08-04 03:00:37 +00:00
5a12e2acb4 fix:修复国际化翻译后出现name后缀的问题 2025-08-04 09:26:14 +08:00
adb7a25d1c fix:修复添加锁时台湾显示为繁体中文的问题 2025-07-31 17:08:46 +08:00
2583396e83 fix:修复备用电池显示0的问题 2025-07-31 15:24:27 +08:00
c80a5c8533 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整版本号

See merge request StarlockTeam/app-starlock!236
2025-07-30 03:25:11 +00:00
fdd95729aa fix:调整版本号 2025-07-30 11:09:43 +08:00
e0bd9a678c Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整版本号

See merge request StarlockTeam/app-starlock!233
2025-07-30 02:57:57 +00:00
a508800b7c fix:调整版本号 2025-07-30 10:57:15 +08:00
8ce3952a64 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整版本号

See merge request StarlockTeam/app-starlock!230
2025-07-30 02:49:28 +00:00
fd468a60da fix:调整版本号 2025-07-30 10:48:50 +08:00
917dfbba91 Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!226
2025-07-29 06:00:53 +00:00
493241b8ad fix:调整分享逻辑为插件调用 2025-07-29 14:00:07 +08:00
a5b817ffb3 fix:调整添加锁后进行蓝牙交互出现锁已重置的问题 2025-07-29 13:59:52 +08:00
43c4e703b9 Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!225
2025-07-29 05:51:07 +00:00
617c7ad9b6 fix:增加发送过程中超时的问题 2025-07-28 15:58:28 +08:00
b06e3b61c8 fix:修复进入语音包设置时不进行更新选中的问题 2025-07-28 15:07:03 +08:00
02d395b7a4 fix:调整分享密码时改为使用插件 2025-07-28 11:49:39 +08:00
a5006b28fa fix:调整ios和android页面不一致的问题 2025-07-28 10:00:56 +08:00
e57e7de6f7 fix:调整多国语言词条 2025-07-28 09:12:13 +08:00
3b12069a01 Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!222
2025-07-26 08:13:58 +00:00
f7199fdc98 fix:调整多国语言词条 2025-07-26 16:11:58 +08:00
b8fd34c232 fix:跳转语音包设置 2025-07-25 17:10:20 +08:00
92a2407fb4 Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!219
2025-07-25 07:03:55 +00:00
42d1ea52d4 fix:增加第三方平台设置 2025-07-25 15:00:29 +08:00
ba2eac4cee fix:增加第三方平台设置 2025-07-25 15:00:07 +08:00
f037cb3c28 fix:调整语言包流程 2025-07-25 14:59:54 +08:00
7937ff5b7b fix:增加第三方平台设置 2025-07-24 16:18:03 +08:00
2e3bc11563 fix:增加第三方平台设置 2025-07-24 16:17:49 +08:00
26e0f4d3bb fix:调整firebase必须在Android和生产环境才生效 2025-07-24 11:28:59 +08:00
41c4623876 Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!216
2025-07-23 03:38:22 +00:00
5e1d1bd0c1 fix:修复无法搜索到网关的问题 2025-07-23 11:33:42 +08:00
139d16387c fix:修复无法搜索到网关的问题 2025-07-23 10:58:03 +08:00
768f7fd38f Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!213
2025-07-23 01:55:25 +00:00
4045adf0b2 fix:增加添加锁时选择语音包的页面 2025-07-23 09:52:58 +08:00
b2952b3c72 fix:增加添加锁时配置语音包的页面 2025-07-18 10:40:41 +08:00
ccad385a80 fix:调整语音包设置 2025-07-17 14:56:56 +08:00
30cb3a7ac3 fix:恢复对讲请求消息payload内容 2025-07-16 18:01:07 +08:00
e2dc776fd1 fix:设置语言包之后同步锁设置信息 2025-07-15 15:07:32 +08:00
c221e2cbdf fix:推出对讲页时停止发送期望数据 2025-07-12 15:51:05 +08:00
2feb1fb2fc fix:调整配网后及时更新锁设置 2025-07-12 15:50:31 +08:00
95325f3a39 fix:增加云存webview的支付页面、增加语音包设置模块 2025-07-12 15:50:03 +08:00
f09e0bf329 Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!198
2025-07-09 03:36:58 +00:00
25ed80e4ba fix:调整对讲解码插件版本 2025-07-09 11:36:30 +08:00
4bae1d1e98 fix:ios环境下打开应用时获取VoIPToken 2025-07-09 11:23:46 +08:00
5e14f217ea Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整VoIP上报的结构

See merge request StarlockTeam/app-starlock!194
2025-07-03 09:12:21 +00:00
4a3a228a80 fix:调整VoIP上报的结构 2025-07-03 17:10:12 +08:00
41fdae21f8 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整ios编译宏

See merge request StarlockTeam/app-starlock!192
2025-07-03 07:23:14 +00:00
4fd5449e3e fix:调整ios编译宏 2025-07-03 15:22:12 +08:00
38391a4f12 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整ios编译宏

See merge request StarlockTeam/app-starlock!190
2025-07-03 06:43:12 +00:00
d4d04140ce fix:调整ios编译宏 2025-07-03 14:42:05 +08:00
2956b25d54 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:增加国内环境下不上报VoIP;调整Fastlin中的环境

See merge request StarlockTeam/app-starlock!188
2025-07-03 03:31:52 +00:00
2571d95c99 fix:增加国内环境下不上报VoIP;调整Fastlin中的环境 2025-07-03 11:30:56 +08:00
c7c1730cb0 Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!186
2025-07-02 09:14:39 +00:00
87905dacb7 fix:调整为callkit实现 2025-07-02 17:13:05 +08:00
4e08f57c48 fix:调整为callkit实现 2025-07-02 17:11:39 +08:00
2ab2a48f02 fix:voip收到推送使用livecommunicationkit触发推送实现备份 2025-07-01 14:22:57 +08:00
517b6b6734 fix:voip收到推送的基础功能增加 2025-06-30 17:17:07 +08:00
822bf89a2c Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整ios解码流程

See merge request StarlockTeam/app-starlock!183
2025-06-26 01:41:33 +00:00
d3df44dd87 fix:调整ios解码流程 2025-06-26 09:40:15 +08:00
61b7041e71 Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!182
2025-06-25 10:51:05 +00:00
75dbbc93d1 fix:调整兼容ios的对讲解码流程 2025-06-25 18:49:29 +08:00
9acb5f4cce fix:调整兼容ios的对讲解码流程 2025-06-25 18:48:31 +08:00
a98fc0b905 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整解码插件版本、静态资源目录

See merge request StarlockTeam/app-starlock!178
2025-06-23 08:17:47 +00:00
1103e61152 fix:调整解码插件版本、静态资源目录 2025-06-23 16:17:09 +08:00
c033cb9608 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整解码插件版本、静态资源目录

See merge request StarlockTeam/app-starlock!177
2025-06-23 08:11:42 +00:00
b48bb378ad fix:调整解码插件版本、静态资源目录 2025-06-23 16:10:54 +08:00
954cfc6276 Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!176
2025-06-23 08:01:39 +00:00
293716f146 fix:调整切换清晰度逻辑 2025-06-23 16:00:37 +08:00
ce193a2195 fix:调整切换清晰度逻辑 2025-06-23 15:39:00 +08:00
de6d2628f6 fix:优化对讲效果 2025-06-23 15:28:43 +08:00
dfccfa9089 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:将接收udp数据改为Isolate,主线程解耦udp数据接收

See merge request StarlockTeam/app-starlock!175
2025-06-18 10:03:04 +00:00
2093784f38 fix:将接收udp数据改为Isolate,主线程解耦udp数据接收 2025-06-18 18:00:57 +08:00
6385a2c7b9 Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!174
2025-06-18 07:18:48 +00:00
c617d73bb4 fix:传递对讲页的监听数据时增加原始音视频数据参数 2025-06-18 15:15:26 +08:00
f8847ca483 fix:调大帧数据发送速率和网络缓冲区大小 2025-06-18 15:14:57 +08:00
b9258830f2 fix:传递对讲页的监听数据时增加原始音视频数据参数 2025-06-18 15:14:36 +08:00
370d10df7d fix:调整当处于对讲进行时不进行跳转页面 2025-06-18 15:13:43 +08:00
2e9ee167b3 fix:调整传递到对讲页时携带原始消息内容 2025-06-18 15:13:24 +08:00
51ca6e1f23 fix:修复对讲的高清、标清切换功能 2025-06-18 15:12:51 +08:00
bf4c2b4750 fix:增加音视频数据的丢包率判断、调整udp发送和接收缓冲区大小 2025-06-18 14:59:34 +08:00
9edb18deb5 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:(判断联网)调整判断网络状态方式调整

See merge request StarlockTeam/app-starlock!167
2025-06-13 06:17:43 +00:00
9f2c049147 fix:(判断联网)调整判断网络状态方式调整 2025-06-13 14:01:38 +08:00
c9b5de847d Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!164
2025-06-12 09:53:14 +00:00
8d48068d23 fix:(国际化)增加亚美尼亚语、格鲁吉亚语语言 2025-06-12 17:52:21 +08:00
91bbaabf1c fix:增加语言翻译脚本和两国语言文件 2025-06-12 17:25:12 +08:00
11958ea87c Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!163
2025-06-12 08:37:02 +00:00
c0b2114683 fix:(对讲铃声)调整路由页面昵称;调整铃声播放逻辑 2025-06-12 16:35:55 +08:00
ceb889c3a3 Merge remote-tracking branch 'origin/develop_sky_liyi' into develop_sky_liyi 2025-06-12 15:29:27 +08:00
9aad61f940 fix:新增国际化语言文本 2025-06-12 15:29:20 +08:00
002c8252d6 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:(密码)修复点击重置后不弹窗的问题

See merge request StarlockTeam/app-starlock!161
2025-06-12 01:39:06 +00:00
c76a7f0dad fix:(密码)修复点击重置后不弹窗的问题 2025-06-12 09:38:02 +08:00
0ffde21dda Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!159
2025-06-11 01:19:37 +00:00
9d2c953522 fix:上传数据时回复0时也保持请求下一份数据 2025-06-11 09:18:27 +08:00
0520733080 fix:如果是单次钥匙开锁成功之后就调用删除 2025-06-11 09:17:59 +08:00
b61aceeac9 fix:图传页面兼容640*480不旋转的视频 2025-06-10 09:26:28 +08:00
0105a3ca72 fix:调整为收到预期接收数据回复之后才进行页面跳转和播放铃声 2025-06-10 09:25:45 +08:00
9623c542b5 Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!157
2025-06-09 06:32:49 +00:00
500f705fc5 fix:调整在选择限时指纹时中生效时间的时间选择器最小时间为当前时间 2025-06-09 11:47:51 +08:00
5d6ae85996 fix:增加锁屏权限开启的引导页面 2025-06-09 11:46:29 +08:00
17510c03ca Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!154
2025-06-06 05:56:51 +00:00
7831615b80 fix:取消构建完成后清理缓存 2025-06-06 13:41:34 +08:00
2de821804a fix:构建完成后清理缓存 2025-06-06 12:03:37 +08:00
58e0bdeef4 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:切换rubygems镜像为阿里云镜像

See merge request StarlockTeam/app-starlock!153
2025-06-06 04:01:38 +00:00
00a74b8a98 fix:切换rubygems镜像为阿里云镜像 2025-06-06 11:35:07 +08:00
7e992183f5 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:修复setup_fastlane_ios中使用了错误的目录位置

See merge request StarlockTeam/app-starlock!152
2025-06-06 01:46:51 +00:00
7a446fdb52 fix:修复setup_fastlane_ios中使用了错误的目录位置 2025-06-06 09:45:57 +08:00
f6d6814e72 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:区分Android和ios的构建时的依赖目录

See merge request StarlockTeam/app-starlock!151
2025-06-06 01:39:46 +00:00
c9ad04d4d9 fix:区分Android和ios的构建时的依赖目录 2025-06-06 09:38:41 +08:00
d9235bd81f Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整ci流程

See merge request StarlockTeam/app-starlock!150
2025-06-06 01:21:30 +00:00
a55f8d1e73 fix:调整ci流程 2025-06-06 09:20:34 +08:00
16d62698c6 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整ci流程

See merge request StarlockTeam/app-starlock!149
2025-06-06 01:18:29 +00:00
03ef57d75d fix:调整ci流程 2025-06-06 09:17:39 +08:00
12b29534f7 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整FCM版本

See merge request StarlockTeam/app-starlock!146
2025-06-06 01:05:11 +00:00
f950392c22 fix:调整FCM版本 2025-06-05 14:31:39 +08:00
06a38603f7 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:增加ci时的flutter依赖镜像源为国内镜像源

See merge request StarlockTeam/app-starlock!143
2025-06-05 03:27:03 +00:00
951571f95e fix:增加ci时的flutter依赖镜像源为国内镜像源 2025-06-05 11:26:26 +08:00
7d4e18f7b1 Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!142
2025-06-05 02:55:31 +00:00
7d6ade5a3b Merge branch 'develop_ios键盘收起问题(1004900)' into 'develop_sky_liyi'
fix:增加返回页面时和点击搜索时收起键盘

See merge request StarlockTeam/app-starlock!141
2025-06-05 02:54:19 +00:00
621838a0cb fix:调整密码详情点击删除不出现弹窗的问题 2025-06-05 10:52:51 +08:00
7bf5d9147d fix:增加返回页面时和点击搜索时收起键盘 2025-06-04 15:59:07 +08:00
c30c16897a Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整ci流程,只保留sky的flavor构建

See merge request StarlockTeam/app-starlock!138
2025-06-04 07:02:50 +00:00
5257fec08e fix:调整ci流程,只保留sky的flavor构建 2025-06-04 15:01:48 +08:00
a6051abdf7 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:注释一键登录初始化逻辑

See merge request StarlockTeam/app-starlock!135
2025-06-04 01:18:16 +00:00
d825377f39 fix:注释一键登录初始化逻辑 2025-06-03 10:10:22 +08:00
c229356547 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:增加生成tag版本号时移除Merge和Revert操作对版本号进行递增的逻辑,增加对commit id 的去重

See merge request StarlockTeam/app-starlock!132
2025-06-03 01:54:08 +00:00
064e5ed542 fix:增加生成tag版本号时移除Merge和Revert操作对版本号进行递增的逻辑,增加对commit id 的去重 2025-06-03 09:53:21 +08:00
dc31fc1f06 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:增加生成tag版本号时移除Merge和Revert操作对版本号进行递增的逻辑,增加对commit id 的去重

See merge request StarlockTeam/app-starlock!129
2025-06-03 01:46:20 +00:00
82df2f6e4b fix:增加生成tag版本号时移除Merge和Revert操作对版本号进行递增的逻辑,增加对commit id 的去重 2025-06-03 09:36:51 +08:00
b640d6156d Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!126
2025-06-03 01:24:08 +00:00
1220653526 fix:修复指纹详情删除时不弹出确认框 2025-06-03 09:23:31 +08:00
a693827c79 fix:修复master_sky更新tag失败的问题 2025-05-30 18:22:10 +08:00
9a8678057d fix:修复卡片、人脸、指纹详情页点击删除不弹出确认窗口的问题 2025-05-30 18:15:53 +08:00
d4f64f37ea Merge branch 'develop_sky' into 'release_sky'
fix:修复卡片、人脸、指纹详情页点击删除不弹出确认窗口的问题

See merge request StarlockTeam/app-starlock!122
2025-05-30 09:21:49 +00:00
71887da5c9 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:修复卡片、人脸、指纹详情页点击删除不弹出确认窗口的问题

See merge request StarlockTeam/app-starlock!121
2025-05-30 08:40:19 +00:00
6f9787605a fix:修复卡片、人脸、指纹详情页点击删除不弹出确认窗口的问题 2025-05-30 16:39:09 +08:00
01e7a098ba Merge branch 'develop_sky' into 'release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!119
2025-05-30 07:31:03 +00:00
6a76e45e7f Merge branch 'develop_sky_testci' into 'develop_sky'
fix:测试ci流程

See merge request StarlockTeam/app-starlock!118
2025-05-30 07:27:53 +00:00
7a39446f4d fix:测试ci流程 2025-05-30 15:27:02 +08:00
e6e17ebb89 Merge branch 'master_sky' into 'release_sky'
Master sky

See merge request StarlockTeam/app-starlock!116
2025-05-30 06:47:59 +00:00
9452cc2bdc Merge branch 'develop_sky' into 'master_sky'
Develop sky

See merge request StarlockTeam/app-starlock!115
2025-05-30 06:46:43 +00:00
faa88e6668 Merge branch 'develop_sky_testci' into 'develop_sky'
fix:调整tag生成逻辑

See merge request StarlockTeam/app-starlock!114
2025-05-30 06:45:31 +00:00
5231e62550 fix:调整tag生成逻辑 2025-05-30 14:44:46 +08:00
5d40153907 Merge branch 'develop_sky' into 'master_sky'
增加tag生成时输出日志,ci中判断tag的正则调整为增加sky后缀之后的

See merge request StarlockTeam/app-starlock!113
2025-05-30 06:38:10 +00:00
64a5fde201 Merge branch 'develop_sky_testci' into 'develop_sky'
fix:增加tag生成时输出日志,ci中判断tag的正则调整为增加sky后缀之后的

See merge request StarlockTeam/app-starlock!112
2025-05-30 06:37:05 +00:00
f8b3303d0b fix:增加tag生成时输出日志,ci中判断tag的正则调整为增加sky后缀之后的 2025-05-30 14:36:08 +08:00
c30dfdc1eb Merge branch 'develop_sky' into 'master_sky'
Develop sky

See merge request StarlockTeam/app-starlock!111
2025-05-30 06:20:18 +00:00
4c9422bc5b Merge branch 'master_sky' into 'develop_sky'
# Conflicts:
#   lib/blue/blue_manage.dart
2025-05-30 06:19:57 +00:00
de73ffe64b Merge branch 'develop_sky_testci' into 'develop_sky'
Develop sky testci

See merge request StarlockTeam/app-starlock!109
2025-05-30 06:01:30 +00:00
78ae2c3239 Merge remote-tracking branch 'origin/develop_sky' into develop_sky_testci
# Conflicts:
#	.gitlab-ci.yml
#	android/Gemfile.lock
#	lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart
2025-05-30 14:00:52 +08:00
34eabe7eee fix:测试开发ci流程 2025-05-30 13:57:18 +08:00
2b29e510ce fix:调整rbenv global版本,修复build_android失败问题 2025-05-30 13:50:48 +08:00
a94e80e670 fix:调整rbenv global版本,修复build_android失败问题 2025-05-30 13:48:19 +08:00
0e399c5831 fix:调整rbenv global版本,修复build_android失败问题 2025-05-30 12:34:35 +08:00
285211804b fix:调整rbenv global版本,修复build_android失败问题 2025-05-30 12:29:36 +08:00
9af93869a8 fix:测试skyci流程 2025-05-30 12:19:58 +08:00
dac34b8824 fix:测试skyci流程 2025-05-30 11:49:54 +08:00
c26f241b2b fix:测试skyci流程 2025-05-30 11:36:17 +08:00
5af587466c fix:ci流程调整为sky分支构建 2025-05-30 11:34:03 +08:00
35f7dd38e3 fix:同步修复后的ci文件 2025-05-30 10:54:37 +08:00
Liuyf
1dbb7497ff fix: 写入通讯录权限移除 2025-05-30 08:51:23 +08:00
Liuyf
6290fe36e5 fix: ios release构建错误 2025-05-29 16:59:15 +08:00
DaisyWu
14fe6223e4 Merge branch 'release' into develop_address_book 2025-05-28 14:44:31 +08:00
DaisyWu
9a11a5b0f7 fix: 修复我的--授权管理员的通讯录获取问题 2025-05-28 14:44:06 +08:00
刘燕峰
fcfff0e590 Merge branch 'develop_address_book' into 'release'
Develop address book

See merge request StarlockTeam/app-starlock!100
2025-05-28 03:08:39 +00:00
DaisyWu
600212aee5 Merge branch 'release' into develop_address_book 2025-05-28 11:04:10 +08:00
DaisyWu
879f42bd81 fix: 修复iOS端通讯录点击获取手机号问题 2025-05-28 11:03:09 +08:00
DaisyWu
c66b994c12 Merge branch 'develop' into develop_address_book 2025-05-28 10:11:25 +08:00
刘燕峰
fa18888df9 Merge branch 'develop_address_book' into 'release'
Develop address book

See merge request StarlockTeam/app-starlock!99
2025-05-27 06:16:37 +00:00
Liuyf
7e5970b76a Merge branch 'release' into develop_address_book 2025-05-27 14:15:36 +08:00
Liuyf
79539325af Merge branch 'develop' into develop_address_book 2025-05-27 14:15:19 +08:00
Liuyf
dc77d6e318 fix: 发送电子钥匙直接点通讯录获取不到电话号码,要手动输入 2025-05-27 14:14:51 +08:00
Liuyf
9135f6f2a9 fix: 修复蓝牙开锁成功后,最后一条锁记录偶尔不同步bug诊断埋点 2025-05-27 10:33:54 +08:00
DaisyWu
2c316d427f fix: 安卓选中通讯录失败问题排查 2025-05-26 19:51:06 +08:00
Liuyf
8a601f1596 Merge branch 'develop_liuyf' into release 2025-05-26 16:27:56 +08:00
Liuyf
e4649655b4 fix: 修复蓝牙开锁成功后,锁记录同步不完整bug 2025-05-26 16:27:35 +08:00
DaisyWu
307a96d562 fix: 完善提交 2025-05-26 16:12:45 +08:00
DaisyWu
4b3a74cc58 fix: 授权管理员—各个类型下点击通讯录无法直接获取通讯录联系人手机号及姓名问题修复及自测 2025-05-26 16:11:54 +08:00
DaisyWu
8c0ae4f349 fix: 修复测试部门问题-发送钥匙各个类型下点击通讯录无法直接获取通讯录联系人手机号及姓名 2025-05-26 15:58:52 +08:00
Liuyf
e1e29a02da Merge branch 'develop' into release 2025-05-26 14:21:17 +08:00
Liuyf
5d0da71780 fix: 修复构建失败问题。 2025-05-26 14:15:27 +08:00
Liuyf
261a0363e5 fix: 修复构建失败问题。 2025-05-26 12:05:01 +08:00
Liuyf
09f75dbd4a fix: 修复构建失败问题。 2025-05-26 11:57:28 +08:00
Liuyf
9f9c31862e fix: 修复构建失败问题。 2025-05-26 11:55:16 +08:00
Liuyf
f770a11e68 fix: 修复构建失败问题 2025-05-26 11:23:35 +08:00
Liuyf
ab327e1a4f fix: 修复构建失败问题 2025-05-23 19:20:41 +08:00
Liuyf
130cc8f133 fix: 修复构建失败问题 2025-05-23 19:02:47 +08:00
刘燕峰
d31dfd509e Merge branch 'develop_sync_record' into 'release'
Develop sync record

See merge request StarlockTeam/app-starlock!98
2025-05-23 10:52:42 +00:00
DaisyWu
2cc53de610 Merge branch 'release' into develop_sync_record 2025-05-23 18:42:53 +08:00
Liuyf
f938a17576 Merge branch 'release' into develop 2025-05-23 15:51:11 +08:00
Liuyf
08b8924937 Merge branch 'master' into release 2025-05-23 15:50:51 +08:00
092a0d00b7 fix:恢复原有ci 2025-05-19 10:13:30 +08:00
6a3992b8e2 fix:恢复原有ci 2025-05-19 09:23:21 +08:00
0b5fb23eec fix:恢复原有ci 2025-05-17 18:12:39 +08:00
cb48492f38 fix:恢复原有ci 2025-05-17 18:06:55 +08:00
d046167518 fix:恢复原有ci 2025-05-17 17:50:15 +08:00
eeff5f0665 fix:恢复原有ci 2025-05-17 17:45:53 +08:00
da85d65fa2 fix:恢复原有ci 2025-05-17 17:36:57 +08:00
78ad994cc4 fix:恢复原有ci 2025-05-17 17:10:30 +08:00
48603c7daa fix:恢复原有ci 2025-05-17 16:32:39 +08:00
4787759694 fix:调整ci 2025-05-17 15:40:12 +08:00
de3722292e fix:取消截图时必须接听的逻辑 2025-05-17 15:12:36 +08:00
9c4cea5224 fix:移除高德同时移除锁基本信息中的位置信息 2025-05-17 15:12:13 +08:00
03c24b3c97 fix:增加android构建日志,避免并发构建 2025-05-17 14:44:46 +08:00
7dde0cdf8e fix:增加android构建日志 2025-05-17 14:00:46 +08:00
aa6f01ad5c fix:调整镜像源 2025-05-17 11:42:23 +08:00
1ee2ca5a54 fix:调整ci 2025-05-17 11:22:56 +08:00
804cdba152 fix:调整ci 2025-05-17 10:42:19 +08:00
46bec40eb7 fix:调整ci 2025-05-17 10:17:43 +08:00
f42659c8ac fix:调整ci 2025-05-17 09:28:28 +08:00
c1c4a4a675 fix:调整不根据tag昵称进行区分构建 2025-05-16 18:46:45 +08:00
219e0e794f fix:调整出现Could not find的问题,显式指定 2025-05-16 18:24:58 +08:00
5ddfbe46d1 fix:调整出现Could not find的问题,显式指定 2025-05-16 18:18:10 +08:00
84b821b6eb Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整tag昵称判断规则

See merge request StarlockTeam/app-starlock!75
2025-05-16 10:01:56 +00:00
bed58065b0 fix:调整tag昵称判断规则 2025-05-16 18:01:08 +08:00
8e92ac6ebb Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整source源让bundle_install_retry脚本管理

See merge request StarlockTeam/app-starlock!73
2025-05-16 09:53:47 +00:00
a44be677c5 fix:调整source源让bundle_install_retry脚本管理 2025-05-16 17:52:48 +08:00
6863f20879 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整tag触发构建的正则判断

See merge request StarlockTeam/app-starlock!71
2025-05-16 09:40:38 +00:00
e035d5105e fix:调整tag触发构建的正则判断 2025-05-16 17:39:53 +08:00
4c544a462e Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:增加bundle install重试脚本

See merge request StarlockTeam/app-starlock!69
2025-05-16 09:27:12 +00:00
e809adf98f fix:增加bundle install重试脚本 2025-05-16 17:26:15 +08:00
a83d26e368 Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!67
2025-05-16 09:07:58 +00:00
8e122e5a09 fix:增加出现混mjpeg期望数据的日志 2025-05-16 17:07:05 +08:00
7d4e257404 fix:调整开关静音时使用选择的清晰度作为期望数据发送 2025-05-16 17:06:49 +08:00
84ca900ddf fix:调整ci 2025-05-16 16:45:21 +08:00
faca7eae3e fix:调整ci 2025-05-16 16:39:49 +08:00
a053e23843 fix:调整ci 2025-05-16 16:25:38 +08:00
448268ecc7 fix:调整ci 2025-05-16 16:21:41 +08:00
3201f839eb fix:调整ci 2025-05-16 16:00:39 +08:00
3ab1e5e451 fix:调整ci 2025-05-16 15:43:00 +08:00
ac0d8073ee fix:调整ci 2025-05-16 15:25:03 +08:00
47d9c4d2eb fix:调整ci 2025-05-16 15:17:58 +08:00
7a73356ed2 fix:调整ci 2025-05-16 12:02:34 +08:00
755ec4965c fix:调整ci 2025-05-16 11:42:03 +08:00
b8f1c984f7 Merge branch 'canary_release' into 'develop_sky_liyi'
# Conflicts:
#   lib/blue/blue_manage.dart
#   pubspec.yaml
2025-05-15 08:51:07 +00:00
17e9c0e5ed fix:更新对讲插件依赖 2025-05-15 16:48:50 +08:00
e2f8400ddc fix:调整对讲支持项判断逻辑 2025-05-15 16:47:08 +08:00
90f94e1a9a fix:完成切换清晰度逻辑 2025-05-15 16:46:50 +08:00
069ef1b592 fix:调整远程开锁获取lockId逻辑 2025-05-15 16:46:14 +08:00
e754d008c5 fix:调整图传标题 2025-05-15 16:45:56 +08:00
4de271603d fix:调整常开模式蓝牙命令发送顺序问题 2025-05-14 14:53:30 +08:00
160c4d33ac fix:调整缓冲区大小 2025-05-14 09:08:41 +08:00
7d27de087d fix:增加滑动窗口 2025-05-13 14:30:10 +08:00
a7a70f41b1 fix:增加视频分辨率判断 2025-05-13 10:19:43 +08:00
06fc544f1a fix:增加视频分辨率判断 2025-05-13 10:05:05 +08:00
f887bd37c4 fix:增加支持项属性 2025-05-13 09:48:08 +08:00
57a171b993 fix:增加密码按照锁支持项目显示 2025-05-13 09:47:55 +08:00
6dc1627622 fix:调整蓝牙命令时的搜索逻辑 2025-05-13 09:47:35 +08:00
905368ec8d fix:增加图传全自动锁通话页面 2025-05-13 09:45:57 +08:00
4a725be23f fix:调整蓝牙搜索时判断搜索到的设备是否配对的逻辑 2025-05-12 13:57:50 +08:00
310062513b fix:修复添加锁之后不出现在列表的问题 2025-05-12 13:57:10 +08:00
cf2fd775ec fix:修复添加锁之后不出现在列表的问题 2025-05-12 09:59:48 +08:00
2f9328bd33 fix:测试ci 2025-05-09 18:28:32 +08:00
c7cc02c045 fix:调整流水线tag判断规则 2025-05-09 18:21:04 +08:00
b99a4a99d4 fix:测试ci 2025-05-09 17:52:58 +08:00
5b9d9f77d9 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:测试ci

See merge request StarlockTeam/app-starlock!49
2025-05-09 09:37:03 +00:00
9ac54cc971 fix:测试ci 2025-05-09 17:36:13 +08:00
0d8e818f4d fix:测试ci 2025-05-09 17:34:18 +08:00
7cb051ed56 Merge branch 'master_sky' into 'release_sky'
fix:调整sky下的ci为master_sky进行生成tag时增加前缀

See merge request StarlockTeam/app-starlock!48
2025-05-09 09:19:11 +00:00
f426cbb749 Merge branch 'develop_sky' into 'master_sky'
fix:调整sky下的ci为master_sky进行生成tag时增加前缀

See merge request StarlockTeam/app-starlock!47
2025-05-09 09:12:41 +00:00
1a44e03755 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整sky下的ci为master_sky进行生成tag时增加前缀

See merge request StarlockTeam/app-starlock!46
2025-05-09 09:11:59 +00:00
10a67ddf93 fix:调整sky下的ci为master_sky进行生成tag时增加前缀 2025-05-09 17:11:06 +08:00
52e93c7b39 Merge branch 'develop_sky' into 'master_sky'
fix:调整sky下的ci为master_sky进行生成tag时增加前缀

See merge request StarlockTeam/app-starlock!45
2025-05-09 09:05:49 +00:00
2f08628758 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整sky下的ci为master_sky进行生成tag时增加前缀

See merge request StarlockTeam/app-starlock!44
2025-05-09 09:04:49 +00:00
d3080bba7d fix:调整sky下的ci为master_sky进行生成tag时增加前缀 2025-05-09 17:03:55 +08:00
133e151586 Merge branch 'master_sky' into 'release_sky'
fix:测试ci

See merge request StarlockTeam/app-starlock!43
2025-05-09 08:58:46 +00:00
ca8c07087f Merge branch 'develop_sky' into 'master_sky'
fix:调整sky下的ci为master_sky进行生成tag时增加前缀

See merge request StarlockTeam/app-starlock!42
2025-05-09 08:53:11 +00:00
abba613a4f Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整sky下的ci为master_sky进行生成tag时增加前缀

See merge request StarlockTeam/app-starlock!41
2025-05-09 08:52:06 +00:00
9939685c94 fix:调整sky下的ci为master_sky进行生成tag时增加前缀 2025-05-09 16:51:18 +08:00
94fb405eb3 Merge branch 'develop_sky' into 'master_sky'
fix:调整sky下的ci为master_sky进行生成tag和version

See merge request StarlockTeam/app-starlock!40
2025-05-09 08:46:28 +00:00
231d2fd21d Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整sky下的ci为master_sky进行生成tag和version

See merge request StarlockTeam/app-starlock!39
2025-05-09 08:45:04 +00:00
bbfaec71c8 fix:调整sky下的ci为master_sky进行生成tag和version 2025-05-09 16:44:21 +08:00
c95b0b9721 Merge branch 'develop_sky' into 'master_sky'
fix:测试ci

See merge request StarlockTeam/app-starlock!38
2025-05-09 08:39:14 +00:00
f5f52043d0 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:测试ci

See merge request StarlockTeam/app-starlock!35
2025-05-09 08:24:56 +00:00
08d41a6925 fix:测试ci 2025-05-09 16:23:57 +08:00
25fcca811b Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:测试ci

See merge request StarlockTeam/app-starlock!32
2025-05-09 08:17:03 +00:00
869beca8f1 fix:测试ci 2025-05-09 16:16:06 +08:00
7b02bc7a8a Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:测试ci

See merge request StarlockTeam/app-starlock!30
2025-05-09 08:00:49 +00:00
eed97a4825 fix:测试ci 2025-05-09 15:59:45 +08:00
2cdcd69108 fix:增加sky的ci分支规则 2025-05-09 15:47:41 +08:00
刘燕峰
2ad72c27cf Merge branch 'develop_sync_record' into 'develop'
fix: “上传数据成功后,指纹列表没显示出来,必须下拉刷新才显示”问题修复完成

See merge request StarlockTeam/app-starlock!28
2025-05-09 06:02:44 +00:00
DaisyWu
d6dba6e3dd fix: “上传数据成功后,指纹列表没显示出来,必须下拉刷新才显示”问题修复完成 2025-05-09 13:39:05 +08:00
29fc822b91 fix:根据后端判断开始时间上传锁板的指纹列表数据时需要改为255 2025-05-09 09:30:40 +08:00
e9c06cc66d Merge branch 'develop' into 'canary_release'
Develop

See merge request StarlockTeam/app-starlock!27
2025-05-08 08:28:18 +00:00
Liuyf
15adae81e8 Merge branch 'develop' into release 2025-05-08 15:54:22 +08:00
79f2d95314 fix:调整点击静音时发送期望数据被改为iamge的问题 2025-05-08 15:37:10 +08:00
7f7bb49d8c fix:调整为原有的864*480对讲视频 2025-05-08 15:23:30 +08:00
47f5096a9c fix:增加native解码插件支持720P对讲页面 2025-05-08 15:23:30 +08:00
203b625ddd fix:移除h264、mjpeg切换debug按钮 2025-05-08 15:23:30 +08:00
d27c4e2f9f fix:调整无音频问题 2025-05-08 15:23:30 +08:00
9b755e2993 fix:增加原生插件解码的页面、增加h264、mjpeg切换的debug按钮 2025-05-08 15:23:30 +08:00
443b14450b fix:清除角标 2025-05-08 15:23:30 +08:00
81b1fdd43d fix:搜索蓝牙设备区分,sky改为76 2025-05-08 15:23:30 +08:00
刘燕峰
def413943e Merge branch 'develop_clean_subscript' into 'develop'
fix:清除角标

See merge request StarlockTeam/app-starlock!26
2025-05-08 07:18:54 +00:00
刘燕峰
2100964073 Merge branch 'develop_bluetooth_separate' into 'develop'
fix:搜索蓝牙设备区分,sky改为76

See merge request StarlockTeam/app-starlock!25
2025-05-08 07:18:13 +00:00
10d4fa78fa fix:搜索蓝牙设备区分,sky改为76 2025-05-08 15:11:08 +08:00
b6552b4802 fix:清除角标 2025-05-08 14:01:03 +08:00
b2d2c75b54 fix:增加peerId长度补齐逻辑但不使用 2025-05-08 13:43:11 +08:00
1a67783d7a fix:调整mjpeg的渲染逻辑 2025-05-08 11:33:38 +08:00
a0895927c4 Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2025-05-08 11:04:48 +08:00
4e6f546019 fix:插件依赖更新 2025-05-08 11:03:25 +08:00
34da68e16c fix:调整缓冲区大小 2025-05-08 11:03:25 +08:00
2f03a98cc4 fix:调整解码插件依赖模式 2025-05-08 11:03:25 +08:00
6ef92e2340 fix:取消本地状态栏弹窗 2025-05-08 11:03:25 +08:00
723a803e17 fix:调整ios端渲染白边问题 2025-05-08 11:03:25 +08:00
2fbb4695b4 fix:调整猫眼监控支持项 2025-05-08 11:03:25 +08:00
c84e053172 fix:SKY环境下不显示设置管理员开关 2025-05-08 11:03:25 +08:00
7ea2694878 fix:修复胁迫通知列表时的文本错误 2025-05-08 11:03:25 +08:00
66dd5de9f1 fix:SKY环境下不显示设置管理员开关 2025-05-08 11:03:25 +08:00
e1bf2f2fdc fix:调整为原有的864*480对讲视频 2025-05-08 11:03:25 +08:00
07d20dfbf2 fix:调整为原有的864*480对讲视频 2025-05-08 11:03:25 +08:00
357eaac746 fix:增加native解码插件支持720P对讲页面 2025-05-08 11:03:25 +08:00
e806987fa0 fix:完成720P 20帧渲染需求 2025-05-08 11:03:25 +08:00
419912c590 fix:增加视频旋转角度,调整监控时获取锁peerId的逻辑 2025-05-08 11:03:25 +08:00
84431d17c4 fix:增加视频旋转角度 2025-05-08 11:03:25 +08:00
1543de142f fix:增加插件播放页注释 2025-05-08 11:03:25 +08:00
bf8d0511c1 fix:移除h264、mjpeg切换debug按钮 2025-05-08 11:03:24 +08:00
37f4e6d78e fix:调整回到列表偶尔出现相同锁记录 2025-05-08 11:03:24 +08:00
ea01d79bbd fix:调整配网逻辑 2025-05-08 11:03:24 +08:00
d75754e14e fix:SKY环境下注释该锁已被重置的弹窗 2025-05-08 11:03:24 +08:00
ea96419e05 fix:回复按钮原有的禁用逻辑 2025-05-08 11:03:24 +08:00
db2fe012d7 fix:退出后台时自动挂断 2025-05-08 11:03:24 +08:00
2de9d32b61 fix:调整无音频问题 2025-05-08 11:03:24 +08:00
a09237bc02 fix:修复进入指纹不自动获取指纹列表问题 2025-05-08 11:03:24 +08:00
96367baaea fix:调整配网逻辑 2025-05-08 11:03:24 +08:00
5f079fb3d4 fix:调整蓝牙写入逻辑,增加重试机制;处理GATT错误133 2025-05-08 11:03:24 +08:00
61316051de fix:调整禁用按钮逻辑 2025-05-08 11:03:24 +08:00
113803d97d fix:注释CRC验证 2025-05-08 11:03:24 +08:00
2a89d0110c fix:梳理配网逻辑 2025-05-08 11:03:24 +08:00
1784f75c47 fix:增加原生插件解码的页面、增加h264、mjpeg切换的debug按钮 2025-05-08 11:03:24 +08:00
07aa71c679 fix:调整优化h264播放逻辑并增加音频 2025-05-08 11:03:24 +08:00
34698971af fix:插件依赖更新 2025-05-08 10:14:53 +08:00
1217ea7d3e fix:调整缓冲区大小 2025-05-08 10:14:34 +08:00
刘燕峰
a106fe6bbf Merge branch 'develop_toggle_register' into 'develop'
feat: xhj、sky 注册页面手机邮箱类型修改:“如果系统语言是非中文简体,默认邮箱注册”

See merge request StarlockTeam/app-starlock!24
2025-05-08 01:41:14 +00:00
DaisyWu
6af8d36184 feat: xhj、sky 注册页面手机邮箱类型修改:“如果系统语言是非中文简体,默认邮箱注册” 2025-05-07 18:30:19 +08:00
ce6c02b736 fix:调整解码插件依赖模式 2025-05-07 16:32:57 +08:00
557da4c5a1 fix:取消本地状态栏弹窗 2025-05-07 15:25:14 +08:00
4c47b65b0e fix:调整ios端渲染白边问题 2025-05-07 15:06:57 +08:00
Liuyf
a4a6459d69 Merge branch 'develop_delete_amap' 2025-05-07 15:02:25 +08:00
DaisyWu
cace002228 feat: 1,修复xhj、sky添加锁之后空白卡死问题 2,移除安卓内高德相关配置依赖 2025-05-06 19:32:13 +08:00
3db24c3303 fix:调整猫眼监控支持项 2025-05-06 16:44:21 +08:00
44cdd31b3d fix:SKY环境下不显示设置管理员开关 2025-05-06 16:44:02 +08:00
de52becc21 fix:修复胁迫通知列表时的文本错误 2025-05-06 16:43:47 +08:00
1e71efc2e5 fix:SKY环境下不显示设置管理员开关 2025-05-06 16:43:28 +08:00
DaisyWu
c49e7cab03 feat: 移除地图相关业务、添加锁新增安全性判断 2025-05-06 15:05:22 +08:00
b84dbf4e62 fix:调整为原有的864*480对讲视频 2025-05-06 14:00:38 +08:00
e8e297d95b fix:调整为原有的864*480对讲视频 2025-05-06 11:42:16 +08:00
89eeb4f0b3 fix:增加native解码插件支持720P对讲页面 2025-04-30 17:55:57 +08:00
5968c4a980 fix:完成720P 20帧渲染需求 2025-04-30 10:25:19 +08:00
a546989a25 fix:增加视频旋转角度,调整监控时获取锁peerId的逻辑 2025-04-28 11:47:26 +08:00
0af232e42c fix:增加视频旋转角度 2025-04-28 10:59:48 +08:00
00b2d036cf fix:增加插件播放页注释 2025-04-28 09:21:50 +08:00
51bc375d31 fix:移除h264、mjpeg切换debug按钮 2025-04-28 09:21:11 +08:00
7e81313372 fix:调整回到列表偶尔出现相同锁记录 2025-04-28 09:20:52 +08:00
77c09923f2 fix:调整配网逻辑 2025-04-28 09:20:25 +08:00
942a4f3658 fix:SKY环境下注释该锁已被重置的弹窗 2025-04-28 09:20:11 +08:00
3831083f77 fix:回复按钮原有的禁用逻辑 2025-04-27 11:27:31 +08:00
48d4081b3e fix:退出后台时自动挂断 2025-04-27 10:12:34 +08:00
25fb142765 fix:调整无音频问题 2025-04-27 09:53:05 +08:00
3e2009069a fix:修复进入指纹不自动获取指纹列表问题 2025-04-27 09:22:18 +08:00
9d8f005127 fix:调整配网逻辑 2025-04-26 15:51:16 +08:00
de71435ba1 fix:调整蓝牙写入逻辑,增加重试机制;处理GATT错误133 2025-04-26 15:16:39 +08:00
6a848ac23e fix:调整禁用按钮逻辑 2025-04-26 15:16:02 +08:00
3a262d80dd fix:注释CRC验证 2025-04-26 15:15:46 +08:00
df23655822 fix:梳理配网逻辑 2025-04-26 15:15:27 +08:00
f10351626a fix:增加原生插件解码的页面、增加h264、mjpeg切换的debug按钮 2025-04-25 10:21:05 +08:00
Liuyf
9e4d10e107 Merge branch 'develop' into release 2025-04-24 11:54:51 +08:00
Liuyf
a091bc2869 Merge branch 'develop_liuyf' into develop 2025-04-24 11:54:31 +08:00
Liuyf
c776965b66 fix: 修复电信一键登录失败问题 2025-04-24 09:50:05 +08:00
Liuyf
977f4929c8 Merge branch 'develop' into release 2025-04-23 18:21:29 +08:00
Liuyf
674eee4548 Merge branch 'develop_liuyf' into develop 2025-04-23 18:21:12 +08:00
Liuyf
aa8e600ed1 fix: 锁定jverify:3.0.0版本 2025-04-23 18:20:01 +08:00
Liuyf
79b7efe7da Merge branch 'develop' into release 2025-04-23 18:18:24 +08:00
Liuyf
28b8ba66d1 Merge branch 'develop_liuyf' into develop 2025-04-23 18:18:07 +08:00
Liuyf
73001530ea fix: 锁定jverify:3.0.0版本 2025-04-23 18:17:53 +08:00
Liuyf
4eb654660c Merge branch 'develop' into release 2025-04-23 18:09:09 +08:00
Liuyf
4dcbd4d447 Merge branch 'develop_liuyf' into develop 2025-04-23 18:06:58 +08:00
Liuyf
29667873a7 fix: 修复星锁android手机平台一键登录失败率比较高问题 2025-04-23 18:03:04 +08:00
Liuyf
5313c6ecea fix: 有锁的账号退出,再用一键登录会闪过之前账号的锁列表 2025-04-23 14:04:50 +08:00
刘燕峰
253e49ecd1 Merge branch 'develop' into 'release'
fix: - 一键登录逻辑,UI完善

See merge request StarlockTeam/app-starlock!23
2025-04-23 03:37:04 +00:00
刘燕峰
ce7684171b Merge branch 'develop_liuyf' into 'develop'
fix: - 一键登录逻辑,UI完善

See merge request StarlockTeam/app-starlock!22
2025-04-23 03:21:44 +00:00
Liuyf
c3e7998146 fix: 调整iOS一键登录UI和android保持一致交互 2025-04-23 10:43:06 +08:00
Liuyf
8a4da1f719 fix: 调整iOS一键登录UI和android保持一致交互 2025-04-23 10:42:43 +08:00
Liuyf
6cd0bedb93 fix: 调整iOS一键登录UI和android保持一致交互 2025-04-23 10:23:28 +08:00
Liuyf
b0ba3f711a fix: 调整iOS一键登录UI和android保持一致交互 2025-04-23 09:18:04 +08:00
Liuyf
7f81827a9c other: merge develop 2025-04-22 19:02:42 +08:00
Liuyf
f9c31f7239 fix: - 一键登录逻辑,UI完善
- 一键登录页面以及二次协议确认页面UI样式完善
         - 一键登录逻辑完善,边界异常处理
2025-04-22 19:00:51 +08:00
Liuyf
1c3c61239b fix: - 一键登录逻辑,UI完善
- 一键登录页面以及二次协议确认页面UI样式完善
         - 一键登录逻辑完善,边界异常处理
2025-04-22 18:43:15 +08:00
Liuyf
841ef69381 fix: - 一键登录逻辑,UI完善
- 一键登录页面以及二次协议确认页面UI样式完善
         - 一键登录逻辑完善,边界异常处理
2025-04-22 16:49:34 +08:00
8478dd33d1 fix:调整优化h264播放逻辑并增加音频 2025-04-22 15:17:42 +08:00
Liuyf
60a6666d22 fix: 一键登录逻辑没有触发以及执行一键登录逻辑失败后没有任何提示信息。 2025-04-21 19:24:04 +08:00
Liuyf
bb1607235d fix: 一键登录逻辑没有触发以及执行一键登录逻辑失败后没有任何提示信息。 2025-04-21 19:21:58 +08:00
Liuyf
07f66a5477 fix: 一键登录逻辑没有触发以及执行一键登录逻辑失败后没有任何提示信息。 2025-04-21 19:15:41 +08:00
Liuyf
749f2a1919 Merge branch 'develop_liyi' into canary_release 2025-04-21 18:41:07 +08:00
Liuyf
4242ac0a80 fix: 一键登录逻辑没有触发以及执行一键登录逻辑失败后没有任何提示信息。 2025-04-21 18:40:47 +08:00
5628b3f31a Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2025-04-18 15:56:39 +08:00
Liuyf
4ee8962824 Merge branch 'develop_liyi' into develop 2025-04-18 14:44:14 +08:00
Liuyf
fd249035a4 Merge branch 'develop_liyi' into canary_release 2025-04-18 14:41:36 +08:00
Liuyf
8fb7ea0fe8 fix: jpush逻辑调整适应应用市场合规要求 2025-04-18 14:41:12 +08:00
88b66be9a1 Merge branch 'develop_liyi' into 'develop'
Develop liyi

See merge request StarlockTeam/app-starlock!21
2025-04-18 05:49:51 +00:00
afcb031bd0 fix:调整添加后列表出现多条记录的问题 2025-04-18 10:46:57 +08:00
a0d2bdaa7a fix:调整默认使用Image对讲 2025-04-18 10:34:42 +08:00
0d8d5cb0c8 fix:调整h264 webview播放效果 2025-04-18 10:33:51 +08:00
815abf9f6b Merge branch 'develop_liyi' into 'canary_release'
fix:调整判断是国内才初始化一键登录的sdk

See merge request StarlockTeam/app-starlock!20
2025-04-17 01:09:17 +00:00
7ca848d61b fix:调整判断是国内才初始化一键登录的sdk 2025-04-16 17:59:21 +08:00
e37415789d Merge branch 'develop_liyi' into 'canary_release'
Develop liyi

See merge request StarlockTeam/app-starlock!19
2025-04-16 06:30:06 +00:00
50944a082b fix:调整异常后中断持续发送 2025-04-16 14:28:18 +08:00
a259ed9dd3 fix:增加缓冲区逻辑 2025-04-16 14:16:27 +08:00
4234464533 fix:增加事件监听对应变量,用于后续取消监听 2025-04-16 14:15:11 +08:00
084f887e89 style:调整一键登录逻辑 2025-04-16 14:14:06 +08:00
7f2d591e67 style:去除多余代码 2025-04-16 14:13:50 +08:00
204affd6b1 fix:调整密码参数格式 2025-04-16 14:13:31 +08:00
2e340921c1 fix:调整出现一键登录的问题 2025-04-16 14:12:00 +08:00
02d0bc49d3 fix:调整指纹刷新多个的问题 2025-04-16 14:11:38 +08:00
c9690430f7 fix:调整管理员已满提示 2025-04-15 16:01:16 +08:00
c4191dbc95 fix:调整获取卡片时会刷新多个列表的问题 2025-04-11 10:06:09 +08:00
807c71b614 fix:固定为20针缓冲区 2025-04-10 18:16:48 +08:00
02cae612bb Merge branch 'develop_liyi' into 'canary_release'
fix:调整配网loading卡主的问题

See merge request StarlockTeam/app-starlock!18
2025-04-10 08:59:06 +00:00
cd41dd4ccf fix:调整配网loading卡主的问题 2025-04-10 16:54:59 +08:00
Liuyf
80e2b62724 Merge branch 'develop_liyi' into canary_release 2025-04-10 14:35:20 +08:00
49ed169506 fix:调整获取配网信息使用事件通知 2025-04-10 11:05:09 +08:00
Liuyf
80787fd0ea fix: 万师傅入口遮盖住了删除账号功能入口,导致审核不通过 2025-04-10 09:50:36 +08:00
c373cc402a fix:调整设置项目超出屏幕时无法下滑的问题 2025-04-09 10:40:15 +08:00
47b0a18ef3 fix:调整视频帧缓冲区逻辑计算逻辑,增加缓冲区最大大小至20帧 2025-04-08 16:43:11 +08:00
5864b29055 fix:调整国际化内容 2025-04-08 14:35:43 +08:00
fe82f87200 fix:调整多个对讲请求时不处理 2025-04-08 14:35:36 +08:00
99813877b6 fix:调整人脸列表加载逻辑 2025-04-08 14:35:15 +08:00
3552d15429 fix:增加同意隐私协议之后进行一键登录初始化事件 2025-04-08 14:34:59 +08:00
823b268380 fix:配网时蓝牙超时进行提示,调整配网成功后的上报流程 2025-04-08 14:34:25 +08:00
066aff8fdf fix:对讲时进入后台关闭链接 2025-04-08 14:33:54 +08:00
eb801de7c3 fix:增加管理员已满提示 2025-04-08 14:33:27 +08:00
Liuyf
7b235718c5 other: 修改联调 ,预发布环境域名配置 2025-04-08 09:07:37 +08:00
306b366f73 Merge branch 'develop_liyi' into 'canary_release'
Develop liyi

See merge request StarlockTeam/app-starlock!17
2025-04-07 10:33:28 +00:00
a9450a7f7b fix:去除录屏插件(goole上架判断权限用途)、增加对讲时的fps调试代码 2025-04-07 18:32:29 +08:00
59fb9384ca fix:调整音频发送缓冲区逻辑 2025-04-07 14:44:49 +08:00
e435b487a0 Merge branch 'develop_liyi' into 'canary_release'
Develop liyi

See merge request StarlockTeam/app-starlock!16
2025-04-07 06:33:12 +00:00
68a13c4b6c fix:调整同意隐私协议后才进行一键登录初始化 2025-04-07 14:31:26 +08:00
8060bf5cbf Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2025-04-07 09:50:59 +08:00
903cacab37 fix:调整字节顺序 2025-04-07 09:50:46 +08:00
Liuyf
7f29cfcbf0 fix: 【[需求确认]我的页-增值服务-高级功能-线上环境点都提示请先添加锁,不能购买(已添加有锁)】 2025-04-07 09:35:44 +08:00
72326851ca fix:去除多余方法引入 2025-04-03 15:39:27 +08:00
2d3bdd693e Merge branch 'develop_liyi' into 'canary_release'
fix:国际化内容调整

See merge request StarlockTeam/app-starlock!15
2025-04-03 05:54:15 +00:00
acb0a5860f fix:国际化内容调整 2025-04-03 13:41:42 +08:00
13a3ac8ab9 Merge branch 'develop_liyi' into 'canary_release'
Develop liyi

See merge request StarlockTeam/app-starlock!14
2025-04-03 02:52:21 +00:00
d7e55f2af6 fix:国际化内容调整 2025-04-03 10:51:12 +08:00
64304bca62 fix:对讲逻辑调整 2025-04-03 10:36:30 +08:00
df215dda60 fix:添加锁后更新锁列表 2025-04-03 10:36:18 +08:00
557576ea5e fix:注释退出登录页后国际化文本不跟随选择的语言 2025-04-03 10:36:00 +08:00
2d4ae94607 fix:排查配网失败原因 2025-04-03 10:35:30 +08:00
16dac17a48 fix:简体中文才显示一键登录 2025-04-03 09:21:51 +08:00
237f8913d4 fix:简体中文才显示一键登录 2025-04-03 09:21:43 +08:00
df439d3fe3 fix:新增完锁后刷新列表 2025-04-03 09:21:27 +08:00
41a197f25e fix:调整音频效果 2025-04-02 17:36:27 +08:00
823f498622 Merge branch 'develop_liyi' into 'canary_release'
Develop liyi

See merge request StarlockTeam/app-starlock!13
2025-04-02 09:07:35 +00:00
295995abd7 fix:调整国际化问题 2025-04-02 17:06:49 +08:00
ee66d43c15 fix:调整对讲时的音频问题 2025-04-02 16:44:46 +08:00
Liuyf
1a389a38ff Merge branch 'canary_release' of code-internal.star-lock.cn:StarlockTeam/app-starlock into canary_release 2025-04-02 13:52:56 +08:00
Liuyf
611bd04b95 Merge branch 'develop_liyi' into canary_release 2025-04-02 13:52:09 +08:00
2e2635cd95 Merge branch 'develop_liyi' into 'canary_release'
feat:合并可视对讲

See merge request StarlockTeam/app-starlock!12
2025-04-02 05:52:07 +00:00
3e565ab7d7 fix:调整繁体语言 2025-04-02 13:39:32 +08:00
Liuyf
9f4ffbe573 Merge branch 'develop_liyi' into canary_release 2025-04-02 13:35:40 +08:00
cb2e5ea03d fix:增加语言包 2025-04-02 12:09:07 +08:00
9be1f93e0e Merge branch 'develop_liyi' into 'canary_release'
feat:合并可是对讲

See merge request StarlockTeam/app-starlock!11
2025-04-02 02:00:40 +00:00
0aaaecede9 fix:取消倒计时结束挂断 2025-04-02 09:58:52 +08:00
e3cf148b50 fix:取消倒计时结束挂断 2025-04-02 09:51:22 +08:00
bd0fac6d46 fix:增加同事进行监视和呼叫时的限制 2025-04-02 09:34:02 +08:00
9cc130cc55 fix:取消h264日志 2025-04-02 09:33:43 +08:00
f1b52437dc fix:暂时注释调rbcu消息 2025-04-02 09:33:26 +08:00
6efbc05225 fix:增加倒计时结束、增加当计时开始时才显示时间 2025-04-02 09:33:11 +08:00
3f022ed878 fix:回滚输入框改动 2025-04-02 09:32:40 +08:00
9f43b3e7c1 fix:调整监控时保证获取到的是最新的锁配网信息 2025-04-01 16:23:02 +08:00
205ddd34f8 fix:调整添加锁时获取wifi列表失败 2025-04-01 16:22:20 +08:00
Liuyf
28e5f2a280 Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2025-04-01 11:10:17 +08:00
Liuyf
81949d1d33 fix: iOS缺少出口合规证明,添加标准加密申明 2025-04-01 11:10:10 +08:00
d37e0c720f fix:调整文本错误 2025-04-01 09:17:17 +08:00
5846c0914d fix:调整登录密码输入框样式 2025-04-01 09:08:13 +08:00
Liuyf
faa5deec84 Merge branch 'canary_release' into develop_liyi 2025-03-31 18:59:11 +08:00
22b063b765 fix:调整登录密码输入框样式 2025-03-31 18:36:39 +08:00
79e21e7e4e fix:调整香港的语言显示错误的问题 2025-03-31 18:07:45 +08:00
Liuyf
ec3d4109b1 fix:【开锁页-设置-双重认证 还未调试 建议隐藏】 2025-03-31 17:20:55 +08:00
Liuyf
fae8e9872f fix:【开锁页-图标线上环境应是绿色图标,现为黑色。另消息提醒应显示】 2025-03-31 16:09:57 +08:00
51e519bd7b fix:调整远程开锁的文本显示 2025-03-31 15:56:47 +08:00
867dadd7b7 fix:修改注册时选中国家出现错误提示的问题 2025-03-31 15:51:31 +08:00
Liuyf
1dd9da1bef fix:【开锁页-密码-修改自定义密码为已存在密码一直转圈无提示,之前正常】 2025-03-31 15:00:14 +08:00
Liuyf
0f9b63b05d Merge branch 'develop_liyi' into canary_release 2025-03-31 12:50:19 +08:00
Liuyf
6546b3ed17 fix:修复错误的权限申请 2025-03-31 12:49:47 +08:00
fbfa027e5a Merge branch 'develop_liyi' into 'canary_release'
Develop liyi

See merge request StarlockTeam/app-starlock!10
2025-03-31 01:13:06 +00:00
d78d4ab957 fix:xhj不初始化星图 2025-03-28 10:43:31 +08:00
fab0f9d4ca fix:增加上传头像时的权限判断 2025-03-28 10:43:18 +08:00
104ea422ee Merge remote-tracking branch 'origin/develop' into develop_liyi 2025-03-28 10:00:41 +08:00
Liuyf
250624daef other: merge develop 2025-03-27 16:43:59 +08:00
Liuyf
3cfefbb86b Merge branch 'release' 2025-03-27 15:54:08 +08:00
85da5a4648 Merge branch 'develop_liyi' into 'canary_release'
bug调整

See merge request StarlockTeam/app-starlock!9
2025-03-27 01:15:37 +00:00
4742dac3ee fix:bug调整 2025-03-27 09:11:36 +08:00
df3b4c65c5 fix:增加crc校验位的校验计算、调整sm4解密逻辑 2025-03-25 14:06:10 +08:00
ea3dfa2286 fix:当搜索到的设备昵称为空时不显示 2025-03-25 14:05:36 +08:00
70d549d04d fix:调整配网后的再次读取一遍上传一遍锁设置 2025-03-25 14:05:18 +08:00
Liuyf
2f6efb09d5 Merge branch 'develop_liyi' into canary_release 2025-03-25 09:14:43 +08:00
6d066a722d fix:增加猫眼设置同步 2025-03-24 16:30:38 +08:00
6bf20abc28 fix:取消添加完成后断开蓝牙连接的操作 2025-03-24 15:16:04 +08:00
09a8d7b344 fix:增加配网后读取锁设置并同步 2025-03-24 15:14:49 +08:00
ff8bfa8fd0 fix:修复测试俄语出现的部分国际化bug 2025-03-24 14:14:12 +08:00
af9a4b9ea1 fix:增加国际化语言 2025-03-22 17:20:21 +08:00
7f33519380 Merge branch 'develop_liyi' into 'canary_release'
fix:调整俄语国际化问题

See merge request StarlockTeam/app-starlock!7
2025-03-22 06:33:05 +00:00
7f2c2369a3 fix:调整俄语国际化问题 2025-03-22 14:25:43 +08:00
65c82a34ab fix:调整对讲流程逻辑,增加对讲请求超时时间为30秒 2025-03-21 16:19:50 +08:00
5ebfbe6e55 Merge branch 'develop_liyi' into 'canary_release'
发布测试版本

See merge request StarlockTeam/app-starlock!6
2025-03-20 10:25:11 +00:00
8b61e3d5a6 fix:修复切换到俄语文本出现溢出的情况 2025-03-20 17:54:14 +08:00
d3aee05534 fix:调整简体中文下才显示图片弹窗 2025-03-20 17:35:11 +08:00
fe6480430f fix:修复切换到俄语文本出现溢出的情况、增加部分国际化内容 2025-03-20 16:52:55 +08:00
Liuyf
4151ad526c Merge branch 'develop_liyi' into canary_release 2025-03-18 17:00:07 +08:00
bb085767d5 fix:更新国际化内容 2025-03-14 16:12:30 +08:00
09ed89f90f fix:删除测试图片 2025-03-14 13:37:07 +08:00
4ff00eb90c fix:增加配网时读取手机系统wifi,并判断是否是5G网络 2025-03-14 11:59:09 +08:00
Liuyf
52dc86018d Merge branch 'develop_liyi' into canary_release 2025-03-14 10:21:03 +08:00
92093b3182 fix:增加自定义铃声 2025-03-13 16:13:14 +08:00
3762ade84a fix:调整昵称过长溢出的问题 2025-03-13 16:04:06 +08:00
a59edfcfff style:增加国际化内容 2025-03-13 15:07:39 +08:00
f4c55687f5 style:格式化整理 2025-03-13 15:07:26 +08:00
face4dfd45 feat:优化帧缓冲区逻辑 2025-03-13 15:07:13 +08:00
0fa0e1f340 feat:当不是监听中文不显示微信通知 2025-03-13 15:06:48 +08:00
5e781a5f00 feat:调整组包逻辑 2025-03-13 13:39:19 +08:00
fc23d8f851 feat:调整对讲时的数据缓冲逻辑 2025-03-13 13:38:59 +08:00
Liuyf
88fc39cce1 Merge branch 'develop_liyi' into canary_release 2025-03-13 10:17:44 +08:00
0cdaa26fe5 feat:调整image格式下对讲的数据逻辑优化 2025-03-12 17:42:02 +08:00
fcdd09fcb2 feat:调整IOS密码分享选模板后和电子钥匙短信通知键盘无法收起的情况 2025-03-12 17:32:26 +08:00
794bf8cf11 feat:调整读取记录时一直转圈的问题 2025-03-12 17:31:54 +08:00
2fb3c7d2b5 feat:增加电机功率操作成功提示、不在锁边应提示操作失败、无网络在点击时应提示网络访问失败 2025-03-12 14:22:56 +08:00
Liuyf
41c5232834 Merge branch 'develop_liyi' into canary_release 2025-03-12 11:52:04 +08:00
Liuyf
1ca854e435 fix:网关名称修改的弹框请输入姓名应是请输入名称 2025-03-12 11:51:14 +08:00
Liuyf
72558db0ab Merge branch 'develop_liyi' into canary_release 2025-03-12 11:29:48 +08:00
Liuyf
42d9bfd2ec fix: 在选择网关界面当显示出网关时网关拔掉电源,左上键返回再点下一步应没有该网关显示 2025-03-12 11:01:55 +08:00
Liuyf
6769e9af5d fix: 在选择网关界面当显示出网关时网关拔掉电源,左上键返回再点下一步应没有该网关显示 2025-03-11 18:55:23 +08:00
1ffcf02cad Merge remote-tracking branch 'origin/develop' into develop_liyi 2025-03-11 16:50:50 +08:00
e1b9c1868e feat:调整校准时间逻辑 2025-03-11 16:50:23 +08:00
cd00d3159d feat:调整国际化内容 2025-03-11 16:49:56 +08:00
5b84cfdffd feat:调整国际化内容 2025-03-11 15:51:44 +08:00
bae56ad094 feat:恢复锁校准时间至原有逻辑 2025-03-11 15:50:50 +08:00
ec3990b0af feat:修复获取权限时await DeviceInfoPlugin().androidInfo;出现的异常 2025-03-11 15:49:01 +08:00
1548934d34 feat:优化查找帧函数逻辑 2025-03-11 15:48:08 +08:00
9972b5ddeb feat:修复登录页面选择国家时不自动进行切换的问题 2025-03-11 15:47:31 +08:00
ee5772da02 feat:调整登录密码输入框的密码样式 2025-03-11 15:47:05 +08:00
982a41cffe feat:调整操作流程和关闭、开启只有一种简体中文 2025-03-11 15:36:14 +08:00
97a36b5840 feat:修复当选择跟随系统是简体中文时不显示微信公众号推送 2025-03-11 15:26:28 +08:00
Liuyf
12dcd5984a fix: 锁记录同步时,单条记录解析失败直接跳过,继续解析后续记录,并重置时间线. 2025-03-11 14:47:38 +08:00
f8eb6ea977 feat:增加猫眼设置、开门方向国际化内容 2025-03-11 14:46:00 +08:00
f132fa1a1a feat:修复密码详情中的有效期显示异常 2025-03-11 14:38:20 +08:00
e276672507 feat:修复IOS点击头像选择相册时出现的异常 2025-03-11 13:57:39 +08:00
e6b6672ceb feat:校准时间改为收到应答直接使用系统时间 2025-03-11 12:08:16 +08:00
ef46fb8860 feat:增加32bit的锁uuid兼容 2025-03-11 12:02:32 +08:00
Liuyf
074938c2f7 Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2025-03-10 18:12:42 +08:00
Liuyf
cdc83eb400 fix: 修复半自动锁远程无法开锁问题 2025-03-10 18:12:35 +08:00
e9d8c071af feat:增加国际化内容 2025-03-10 17:43:49 +08:00
8fae519072 Merge remote-tracking branch 'origin/develop' into develop_liyi 2025-03-10 17:39:15 +08:00
Liuyf
0794b2fe75 fix: 修改网关配对引导提示信息 2025-03-10 11:13:54 +08:00
Liuyf
16dc021943 fix: 权限请求逻辑错误导致所有权限都无法正常请求成功 2025-03-08 19:09:44 +08:00
01e695d8df feat:合并 2025-03-08 15:40:12 +08:00
Liuyf
c3dfe8a366 Merge branch 'develop_liyi' into canary_release 2025-03-07 15:46:49 +08:00
Liuyf
458ad33147 fix: 退出登录后需要传storageNonce清理推送绑定信息 2025-03-07 15:46:31 +08:00
Liuyf
b3558813e9 Merge branch 'develop_liyi' into canary_release 2025-03-07 09:54:02 +08:00
Liuyf
829e06a3dd fix:多语言问题翻译 2025-03-07 09:27:28 +08:00
Liuyf
e32b2191f3 build trigger 2025-03-06 15:43:50 +08:00
Liuyf
48d888e8f5 other: 统一使用apm进行事件上报 2025-03-04 17:44:57 +08:00
Liuyf
d6dfca589e other:依赖文件版本更新 2025-03-04 17:41:36 +08:00
Liuyf
a4303bde77 feat: 一键登录 2025-03-04 17:32:43 +08:00
Liuyf
7fd68e6abc fix: 修复honor平台token上报错误 2025-03-04 12:02:47 +08:00
50c0d8dc7a Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2025-03-04 09:42:20 +08:00
a2fd315e86 feat:修复跳过配网后使用物理返回键又返回到添加锁的页面 2025-03-04 09:42:12 +08:00
Liuyf
49d2797619 bug:1001991 没有获取锁信息成功时,不允许对锁进行设置操作 2025-03-03 19:24:57 +08:00
“DaisyWu”
95d457c63c Merge branch 'develop_liyi' of code-internal.star-lock.cn:StarlockTeam/app-starlock into develop_liyi 2025-03-03 18:42:06 +08:00
“DaisyWu”
484416255f fix: 修复开锁页-给邮箱发电子钥匙、授权管理员、群发钥匙-接收者、批量授权选其他国家都能发送—关联多个bug 2025-03-03 18:41:57 +08:00
dc37b42977 feat:增加兼容32bit广播信号 2025-03-03 18:29:41 +08:00
Liuyf
e22a510307 fix: 修复切换语言没有成功,依然更新了外部当前语言表示 2025-03-03 17:55:47 +08:00
Liuyf
23c6430fb8 fix: 修复切换语言没有成功,依然更新了外部当前语言表示 2025-03-03 17:42:54 +08:00
Liuyf
0d77d3aff4 other: 添加推送调试信息 2025-03-03 14:59:09 +08:00
4ec711fcc7 Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2025-03-03 10:05:08 +08:00
2afc6f4ac6 fix:调整猫眼设置返回的数据类型不一致导致锁设置无法加载的问题 2025-03-03 10:04:53 +08:00
“DaisyWu”
46fa893f7a Merge branch 'develop_liyi' of code-internal.star-lock.cn:StarlockTeam/app-starlock into develop_liyi 2025-03-03 09:34:06 +08:00
2fb2731011 fix:调整猫眼设置返回的数据类型不一致导致锁设置无法加载的问题 2025-03-03 09:20:41 +08:00
“DaisyWu”
12dd82b74d fix:修复开门通知报opendoorID问题 2025-02-28 17:09:41 +08:00
30864b5b2f fix:调整短信模版只有第二部分内容无法通过审核导致出现不存在的问题 2025-02-28 14:52:04 +08:00
f23fdea62a fix:修复添加完锁之后查询锁设置失败时跳转页面白屏的问题 2025-02-28 14:16:04 +08:00
278e970931 fix:增加视频日志下载时同时申请权限 2025-02-28 11:52:53 +08:00
681b96a478 fix:完善猫眼设置 2025-02-27 18:51:10 +08:00
86854e8f3f fix:增加跳过配网流程 2025-02-27 16:22:53 +08:00
f6f10f1bcd fix:重新优化猫眼设置项逻辑,增加省电模式下的监控和远程开锁限制 2025-02-27 16:22:38 +08:00
602050b90c fix:重新优化猫眼设置项逻辑 2025-02-27 15:56:03 +08:00
42a3231f96 fix:放开音频数据代码 2025-02-27 09:32:07 +08:00
Liuyf
ead52de362 Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2025-02-26 19:10:29 +08:00
0e20fd57f2 fix:增加视频日志中的“已下载”功能和“云存”当中的下载功能 2025-02-26 19:10:16 +08:00
98fadea001 fix:改为只支持当日循环 2025-02-26 19:10:16 +08:00
f474ad2f2a fix:处理添加锁后wifi配网loading中断的问题 2025-02-26 19:10:16 +08:00
7817d414c6 fix:猫眼协议调整为蓝牙发送 2025-02-26 19:10:16 +08:00
Liuyf
50257a7ffe fix: 1.优化上报逻辑,防止一样的token重复上报
2.请求头添加deviceId,为后续设备管理业务预留数据
2025-02-26 19:10:15 +08:00
Liuyf
07e7d1dc91 Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2025-02-26 19:08:52 +08:00
Liuyf
97ab7d03b5 fix: 优化上报逻辑,防止一样的token重复上报 2025-02-26 19:08:46 +08:00
d7ad32d3c2 fix:增加视频日志中的“已下载”功能和“云存”当中的下载功能 2025-02-26 16:47:27 +08:00
3be6f98358 fix:改为只支持当日循环 2025-02-26 11:35:46 +08:00
5145bae229 fix:处理添加锁后wifi配网loading中断的问题 2025-02-26 11:35:29 +08:00
8ff338452e fix:猫眼协议调整为蓝牙发送 2025-02-26 09:48:57 +08:00
a77cb10caf fix:猫眼协议调整为蓝牙发送 2025-02-26 09:03:42 +08:00
Liuyf
77232dc0c6 Merge branch 'canary_release' into develop_liyi 2025-02-25 15:53:00 +08:00
Liuyf
1a61d080f7 fix: 处理厂商平台token一定时间内不会重复获取问题 2025-02-25 15:52:14 +08:00
567b85f03d Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2025-02-25 15:18:51 +08:00
53694a0621 fix:密码分享到微信的纯文本内容修改 2025-02-25 15:18:42 +08:00
88af212844 fix:猫眼协议调整为蓝牙发送 2025-02-25 15:18:21 +08:00
“DaisyWu”
7a7e8aa408 feat: APP到锁声音调优 2025-02-25 14:54:27 +08:00
Liuyf
5aa6958acc fix: 处理厂商平台有时候获取到registrationId和token为空的情况 2025-02-25 11:49:11 +08:00
Liuyf
c6dce9eb00 fix: 处理厂商平台有时候获取到registrationId和token为空的情况 2025-02-25 11:31:36 +08:00
“DaisyWu”
1c74b54cd4 Merge branch 'develop_liyi' of code-internal.star-lock.cn:StarlockTeam/app-starlock into develop_liyi 2025-02-24 19:01:43 +08:00
“DaisyWu”
cc2950410b feat: iOS端APP到锁声音的调优 2025-02-24 19:01:38 +08:00
Liuyf
8cfc64de31 other: revert Podfile.lock commit 2025-02-24 18:03:09 +08:00
Liuyf
64563c90a1 Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2025-02-24 18:01:19 +08:00
Liuyf
dadf0cbd5d feat: jpush 统一android和ios 推送token上报逻辑 2025-02-24 18:00:48 +08:00
09b52561dc fix:修复视频日志中图片颠倒的问题 2025-02-24 17:22:09 +08:00
38fa1d7c19 fix:修复设置中国际化选项出现错误页面 2025-02-24 17:13:55 +08:00
43eeef237f fix:优化h264组装帧方法,增加调试日志 2025-02-24 17:03:31 +08:00
b59dafc37c fix:增加添加锁后判断是否wifi锁,如果是wifi锁则直接进入配网页面 2025-02-24 17:02:38 +08:00
“DaisyWu”
ca48b7e9c3 feat: 对讲修改默认数据期望类型 2025-02-24 14:00:44 +08:00
“DaisyWu”
6a1c1c9c53 feat: 修改默认数据对讲期望类型 2025-02-24 10:17:30 +08:00
“DaisyWu”
d0e66e1694 Merge branch 'develop_liyi' of code-internal.star-lock.cn:StarlockTeam/app-starlock into develop_liyi 2025-02-24 09:16:31 +08:00
“DaisyWu”
6adc1b41d3 feat: 对讲中APP发送录音到锁声量增大 2025-02-24 09:16:21 +08:00
Liuyf
70e4a54469 Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2025-02-22 18:08:58 +08:00
Liuyf
1b4305d184 other: jpush 定制化改造说明补充 2025-02-22 18:08:52 +08:00
f2e70fd6f1 Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2025-02-22 17:15:40 +08:00
4cfe8411dc fix:增加h264对讲页面的UI 2025-02-22 17:15:33 +08:00
Liuyf
d826f6f205 feat: 统一android和ios 推送token桥接逻辑 2025-02-22 17:12:22 +08:00
344ca40ace fix:增加下拉刷新 2025-02-22 09:42:06 +08:00
6d720e92a2 Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2025-02-21 15:55:49 +08:00
5e1979d8b3 fix:增加h264调试页面 2025-02-21 15:55:35 +08:00
Liuyf
9aac85f20e fix: 国家化翻译问题 2025-02-21 14:36:58 +08:00
“DaisyWu”
c1c2556f27 Merge branch 'develop_liyi' of code-internal.star-lock.cn:StarlockTeam/app-starlock into develop_liyi 2025-02-21 14:30:29 +08:00
“DaisyWu”
35d22fd8ab feat: 调整安卓声音卡顿现象 2025-02-21 14:30:21 +08:00
Liuyf
8e3791636f Merge branch 'canary_release' into develop_liyi 2025-02-21 14:16:32 +08:00
Liuyf
63ce6b1070 feat:jpush中各个厂商token截取实现以及原生native层获取token接口桥接到flutter层供业务调用 2025-02-21 14:15:52 +08:00
34ca2a3f75 fix:调整开锁出现数据不存在的问题 2025-02-21 10:21:58 +08:00
Liuyf
3cfe50277e fix: fcm集成 2025-02-20 17:01:46 +08:00
e1943d26d9 Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2025-02-20 09:49:35 +08:00
“DaisyWu”
08b3847e60 feat: 1,注释对讲调试代码2,iOS端APP到锁的声音调优(失真变好)3,新增降噪算法 2025-02-20 09:05:30 +08:00
bee794e801 fix:增加远程开锁前,和监视前的提示,增加静音提示 2025-02-19 16:36:39 +08:00
18d4836fde fix:增加对讲时静音的提示框 2025-02-19 16:22:01 +08:00
Liuyf
148541bcb2 fix:修复门铃码保存后是黑色图片问题 2025-02-19 16:01:58 +08:00
Liuyf
460ca1e2e2 fix:修复门铃码保存后是黑色图片问题 2025-02-19 11:52:38 +08:00
b9fb2bd479 Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2025-02-19 10:23:31 +08:00
ae35692db7 fix:增加对讲时远程开锁前判断锁是否支持 2025-02-19 10:19:43 +08:00
Liuyf
cc008c7edc fix: 修复锁分组添加、删除逻辑和UI显示错误问题 2025-02-19 08:50:31 +08:00
Liuyf
bc34c36c13 Merge branch 'canary_release' into develop_liyi 2025-02-18 20:18:36 +08:00
Liuyf
3b8b5a7c12 fix: 修复锁分组添加、删除逻辑和UI显示错误问题 2025-02-18 20:18:01 +08:00
b28cc249b0 fix:调整超时判断为10秒 2025-02-18 17:51:08 +08:00
94602eed47 fix:增加远程开锁功能前判断是否功能是否启用 2025-02-18 17:50:55 +08:00
“DaisyWu”
9501f90b4d Merge branch 'develop_liyi' of code-internal.star-lock.cn:StarlockTeam/app-starlock into develop_liyi 2025-02-18 15:59:35 +08:00
“DaisyWu”
769fcdff65 feat: 统一呼叫铃声 只是安卓本地呼叫通知声音改为微信铃声 2025-02-18 15:59:30 +08:00
Liuyf
44bc604d70 Merge branch 'build-addGateway-20240814' into develop_liyi 2025-02-18 15:20:48 +08:00
b577825ff7 fix:增加电子反锁,双重认证,双锁联动显示支持项 2025-02-18 14:41:28 +08:00
9682c558b7 fix:增加锁版未配网的提示 2025-02-18 14:20:10 +08:00
214ae198d9 Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2025-02-18 14:03:58 +08:00
b6a63b455a fix:增加未配网的提示 2025-02-18 14:03:44 +08:00
Liuyf
93b14473bd Merge branch 'canary_release' into develop_liyi 2025-02-18 13:48:49 +08:00
“DaisyWu”
6b74cfe9c2 Merge branch 'develop_liyi' of code-internal.star-lock.cn:StarlockTeam/app-starlock into develop_liyi 2025-02-18 10:42:19 +08:00
“DaisyWu”
f33c5c76eb feat: 安卓端本地自定义铃声方案完成 2025-02-18 10:42:08 +08:00
Liuyf
1ef8cecc39 ci: 小版本计算规则修改 2025-02-18 10:29:23 +08:00
Liuyf
a785c0777c ci: 小版本计算规则修改 2025-02-18 10:22:02 +08:00
Liuyf
c60d98386e fix:华为推送问题修复 2025-02-18 10:20:25 +08:00
9cf186dab5 fix:修复设置电机功率出现错误的问题 2025-02-18 09:59:25 +08:00
c9ba5aa769 fix:修改退出远程时销毁时停止定时器 2025-02-17 17:15:54 +08:00
d68bee7e34 fix:修改远程开锁时的文本描述 2025-02-17 17:13:33 +08:00
65d853860b fix:增加wifi标识、设备不在线标识 2025-02-17 17:13:18 +08:00
cf8bc3ad05 fix:增加wifi标识、设备不在线时提示 2025-02-17 17:11:16 +08:00
2f219d1f38 fix:增加wifi标识 2025-02-17 17:10:26 +08:00
e3aa467829 fix:增加进入后台时发送挂断消息 2025-02-17 17:10:11 +08:00
017b18600b fix:挂断消息改为使用定时器重发机制 2025-02-17 09:51:23 +08:00
Liuyf
7d65c45fa9 fix:改为通用方式获取推送调试信息 2025-02-14 14:14:33 +08:00
Liuyf
ad1ca2ec77 fix:推送功能registrationId没有保存,退出登录无法清理掉推送ID 2025-02-13 17:21:14 +08:00
Liuyf
a12c17be7f fix:推送功能配置添加 2025-02-13 15:54:59 +08:00
Liuyf
da9dfb172a Merge branch 'develop_liyi' into canary_release 2025-02-13 15:13:01 +08:00
b45507fabb Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2025-02-13 11:35:51 +08:00
fdf9c4d448 fix:修复Jpush解析服务端消息时出现json格式错误的问题 2025-02-13 11:33:27 +08:00
Liuyf
f65226d7e2 Merge branch 'develop_liyi' into canary_release 2025-02-13 10:58:11 +08:00
“DaisyWu”
ffca9f36af Merge branch 'develop_liyi' of code-internal.star-lock.cn:StarlockTeam/app-starlock into develop_liyi 2025-02-13 10:56:42 +08:00
“DaisyWu”
2f41195d8b fix: 修复iOS收不到推送问题 2025-02-13 10:56:24 +08:00
Liuyf
f0572b5530 Merge branch 'develop_liyi' into canary_release 2025-02-13 10:24:01 +08:00
Liuyf
481e8fff06 fix:构建android时 注入key 没有默认值报错 2025-02-13 10:12:13 +08:00
Liuyf
ef8aa255e2 fix: 修复android第一次进入锁地址定位页面定位异常需要退出重新进入才能正常那个获取定位信息的问题 2025-02-13 09:38:50 +08:00
刘燕峰
1a235bcb62 Merge branch 'develop_liyi' into 'canary_release'
Develop liyi

See merge request StarlockTeam/app-starlock!4
2025-02-12 09:10:33 +00:00
044990cad5 fix:调整解析中继地址时兼容域名地址 2025-02-12 16:07:03 +08:00
eed848a554 fix:增加对讲结束时重置期望数据格式 2025-02-12 15:13:07 +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
2bca1e285c fix:增加配网超时逻辑 2025-02-12 11:26:58 +08:00
7308429c24 fix:注释多余的加解密插件 2025-02-12 11:26:47 +08:00
835669e027 fix:注释多余的加解密插件 2025-02-12 11:26:45 +08:00
7bbe910e48 fix:动态获取星图url 2025-02-12 11:01:17 +08:00
f79e5daa47 fix:调整兼容域名解析 2025-02-12 11:00:57 +08:00
e6b90d9651 fix:修复ios签名失败的问题 2025-02-12 10:49:31 +08:00
6c73250481 fix:增加使用登陆接口的scdUrl动态设置星图的url 2025-02-12 09:39:09 +08:00
5b5f804fe2 Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2025-02-12 09:21:35 +08:00
“DaisyWu”
057eef285f feat: 完善推送绑定设备逻辑:与后台约定新增Device数组字段 2025-02-12 09:19:48 +08:00
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
abb27b717a Merge branch 'release' 2025-02-07 15:41:46 +08:00
Liuyf
0f246f3067 fix:xhj,sky 微信相关配置分离 2025-02-07 15:27:06 +08:00
Liuyf
f345830c13 Merge branch 'release' 2025-02-07 11:05:07 +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
Liuyf
20c3b50efc ci: 修复xhj apkbundle上传release问题 2025-02-06 13:57:18 +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
“DaisyWu”
e4534e8a28 feat: 1,调试代码增加说明 2,降噪声音处理 3,新增调试服务器延迟添加 2025-01-22 13:55:43 +08:00
5b96705633 fix:增加视频日志中的视频缩略图、修复监控时锁板不在线状态不变更的问题 2025-01-22 13:53:17 +08:00
“DaisyWu”
2ee6782714 Merge branch 'develop_liyi' of code-internal.star-lock.cn:StarlockTeam/app-starlock into develop_liyi
# Conflicts:
#	pubspec.yaml
2025-01-21 15:14:22 +08:00
“DaisyWu”
f20a1efb50 feat: 补充提交 2025-01-21 15:12:44 +08:00
“DaisyWu”
0dad04d51c feat: 新增对讲收发包调试信息 2025-01-21 15:12:13 +08:00
Liuyf
f28237c7c7 other:临时打包sky pre 2025-01-21 14:34:40 +08:00
e990a0806b fix:增加视频日志中的视频缩略图 2025-01-21 14:09:21 +08:00
de6d7bca58 fix:增加视频日志中的视频缩略图 2025-01-21 14:09:09 +08:00
4f6781a0b0 fix:视频日志下载时需要增加dio依赖 2025-01-21 10:26:15 +08:00
592940c3ba fix:视频日志显示逻辑、视频/图片下载 2025-01-21 10:25:40 +08:00
c8b305a4f2 fix:视频日志显示逻辑、视频/图片下载 2025-01-21 10:24:47 +08:00
Liuyf
e2af53b58b ci: 修复xhj apkbundle上传release问题 2025-01-20 18:07:00 +08:00
Liuyf
7866a5c601 fix: sky 锁通通应用内英文名称显示 2025-01-20 17:19:53 +08:00
9504a97bde fix:增加对讲时的通话计时、调整对讲时画布旋转逻辑 2025-01-20 16:23:01 +08:00
9527f8e019 fix:增加操作记录中图片加载失败的显示的默认图片 2025-01-20 16:22:01 +08:00
1c73158577 fix:优化序列化逻辑 2025-01-20 16:21:41 +08:00
Liuyf
a960136c7b other: xhj google appbundle
独立打包入口
2025-01-20 14:38:41 +08:00
Liuyf
20b21f6c88 other: xhj google appbundle
独立打包入口
2025-01-20 14:31:41 +08:00
e2ef3bb2e9 fix:调整对讲时的国际化内容 2025-01-20 14:28:11 +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
6d8451ae9f fix:调整对讲时的国际化内容 2025-01-20 14:13:56 +08:00
Liuyf
c14b397bd3 other: xhj google appbundle
独立打包入口
2025-01-20 14:10:55 +08:00
Liuyf
e9921f1180 other: xhj google上架避免更换包名和签名,防止关联。 2025-01-20 13:46:12 +08:00
“DaisyWu”
87f315f79d Merge branch 'develop_liyi' of code-internal.star-lock.cn:StarlockTeam/app-starlock into develop_liyi 2025-01-17 17:58:00 +08:00
“DaisyWu”
5d5f913260 feat: 添加降噪处理 2025-01-17 17:57:54 +08:00
3503de0207 fix:调整视频日志 2025-01-17 15:03:25 +08:00
6f76a7d5b5 fix:调整发送g711音频数据、增加回声消除、增大缓冲区、调整A律解码效果 2025-01-17 13:58:30 +08:00
Liuyf
f0a5d142ad other:其他环境ummeng和firebase key配置 2025-01-16 16:25:20 +08:00
911396e1f3 fix:调整发送g711音频数据、增加回声消除、增大缓冲区、调整A律解码效果 2025-01-16 15:55:14 +08:00
b876f608e4 fix:调整发送g711音频数据、增加回声消除、增大缓冲区 2025-01-16 14:02:22 +08:00
Liuyf
973a1384fe feat: 新增app版本发布说明 2025-01-16 09:13:42 +08:00
Liuyf
7e25bb01a9 feat: 新增app版本发布说明 2025-01-15 19:08:23 +08:00
1fb9a5a188 fix:调整发送g711音频数据 2025-01-15 15:43:53 +08:00
6df3783f90 fix:调整发送g711音频数据 2025-01-14 18:00:48 +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
4e7af4fdf8 fix:调整发送g711音频数据 2025-01-14 17:58:24 +08:00
df71e2ceb7 fix:调整发送g711音频数据 2025-01-14 17:57:33 +08:00
7a0e8f9e28 fix:增加p2p消息协议代码、优化对讲时应用卡死、调整StreamController处理数据时的逻辑、调整在寻找图片帧时的代码逻辑 2025-01-14 13:43:12 +08:00
641ff4a2b6 fix:增加获取锁板peerId的逻辑 2025-01-14 13:41:23 +08:00
88fbd1cac9 fix:移除多余talkDataStream监听 2025-01-14 13:40:40 +08:00
3205918212 fix:增加音频解码、降噪 2025-01-14 13:40:20 +08:00
Liuyf
0dde7c8c1d other: pubspec.lock文件提交 2025-01-13 18:33:32 +08:00
Liuyf
65e0656956 fix:sky umeng key配置 2025-01-13 18:19:10 +08:00
魏少阳
d1513c4e3a Merge branch 'develop' into build-addGateway-20240814 2025-01-13 17:47:17 +08:00
魏少阳
65cdddcf3c fix: 1、修复发送电子钥匙输入框没有下划线。2、简体中文选择年月日显示简称 2025-01-13 17:46:23 +08:00
Liuyf
4d6ca7ac20 fix:修复android平台无法显示地图和定位信息问题 2025-01-13 16:52:21 +08:00
魏少阳
5e818c9d67 Merge branch 'develop' into build-addGateway-20240814 2025-01-11 18:57:01 +08:00
魏少阳
89feec402e fix: 1、修复操作记录右上角记录上传缺少蓝牙上传功能 2025-01-11 18:55:40 +08:00
Liuyf
95ddd037a5 other: 移除原生umeng导包 2025-01-11 18:40:36 +08:00
Liuyf
1dad437743 other: 补充xhj google firebase 配置 2025-01-11 18:30:14 +08:00
Liuyf
ab363e4967 ci: cn、com区域打包逻辑分离。 2025-01-11 18:12:42 +08:00
ci_bot
394573499c fix: 关闭iOS自动签名 2025-01-11 17:06:18 +08:00
Liuyf
9bfac8fe20 Merge branch 'develop' into feat_devops 2025-01-11 16:33:25 +08:00
Liuyf
5e62a568bf ci: cn、com区域打包逻辑分离。 2025-01-11 16:27:37 +08:00
Liuyf
a8acd70148 ci: cn、com区域打包逻辑分离。 2025-01-11 16:18:48 +08:00
Liuyf
2b80a68d11 ci: cn、com区域打包逻辑分离。 2025-01-11 16:05:41 +08:00
Liuyf
037588926f ci: cn、com区域打包逻辑分离。 2025-01-11 15:22:16 +08:00
Liuyf
0424166eb0 ci: cn、com区域打包逻辑分离。 2025-01-11 15:19:24 +08:00
Liuyf
01f43048ea ci: cn、com区域打包逻辑分离。 2025-01-11 15:06:32 +08:00
Liuyf
e42d4be863 ci: cn、com区域打包逻辑分离。 2025-01-11 14:57:02 +08:00
Liuyf
997266c3bf ci: cn、com区域打包逻辑分离 2025-01-11 14:55:08 +08:00
Liuyf
668ee177e1 ci: cn、com区域打包逻辑分离 2025-01-11 14:53:41 +08:00
魏少阳
49b042d62b fix: 1、修复进入万师傅白屏问题。2、iOS原生添加34国权限文案 2025-01-11 14:52:12 +08:00
Liuyf
da80c1fc67 ci: cn、com区域打包逻辑分离 2025-01-11 14:51:35 +08:00
Liuyf
9de2bdd044 ci:新增清理工作 2025-01-11 11:09:42 +08:00
Liuyf
62a894b3f3 ci:新增清理工作 2025-01-11 10:54:14 +08:00
Liuyf
0d9d608289 Merge branch 'develop_liuyf' into feat_devops 2025-01-11 10:51:27 +08:00
Liuyf
5094348f85 feat:firebase统计和事件上报接入. 2025-01-11 10:50:20 +08:00
Liuyf
3bccec750b feat:firebase统计和事件上报接入 2025-01-10 19:19:17 +08:00
784ea4c31b fix:增加猫眼设置消息指令 2025-01-10 17:47:51 +08:00
ci_bot
b908abd89d other: 初始化firebase 2025-01-10 15:02:50 +08:00
59ad5b6b14 fix:修复视频日志--本地--下载列表页面报错问题 2025-01-10 14:56:23 +08:00
63eb726c3b fix:增加对讲时的开锁命令 2025-01-10 14:47:50 +08:00
50d7ea78d9 fix:完善视频日志、操作记录页面功能 2025-01-10 14:46:51 +08:00
Liuyf
26310031af fix: umeng和firebase动态接入方案 2025-01-10 14:39:47 +08:00
Liuyf
e066768866 fix: umeng初始化步骤优化 2025-01-09 19:35:02 +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
Liuyf
851afc36d9 fix: sky登录页面logo图标替换 2025-01-09 08:58:34 +08:00
魏少阳
fd3d721881 Merge branch 'develop' into build-addGateway-20240814 2025-01-08 19:36:35 +08:00
魏少阳
a61ebda710 fix: 1、修复wifi锁、网关配网传入的gatewayJson长度1字节改为2字节bug 2025-01-08 19:35:42 +08:00
Liuyf
79cc72efdc Merge branch 'master' into develop 2025-01-08 18:18:50 +08:00
Liuyf
d2f54efded fix: umeng 隐私合规问题修复 2025-01-08 18:17:07 +08:00
7943aef0c2 Merge remote-tracking branch 'origin/develop' into develop_liyi 2025-01-08 18:16:45 +08:00
魏少阳
ff6c5524a3 Merge remote-tracking branch 'origin/develop' into develop 2025-01-08 18:11:22 +08:00
魏少阳
a90a6a387a Merge branch 'develop' into build-addGateway-20240814 2025-01-08 18:05:43 +08:00
Liuyf
22fda75602 Merge branch 'release' 2025-01-08 18:05:03 +08:00
Liuyf
daeb0205d6 Merge branch 'develop' into release 2025-01-08 18:04:50 +08:00
Liuyf
cf5f23619d fix: umeng 隐私合规问题修复 2025-01-08 18:04:25 +08:00
魏少阳
f21e49ae68 fix: 1、修复wifi锁、网关配网传入的gatewayJson长度1字节改为2字节 2025-01-08 18:03:30 +08:00
Liuyf
357a8661dd Merge branch 'release' 2025-01-08 17:20:17 +08:00
Liuyf
6228f17fb8 Merge branch 'develop' into release 2025-01-08 17:20:00 +08:00
Liuyf
d099e81e92 fix: umeng 隐私合规问题修复 2025-01-08 17:19:07 +08:00
Liuyf
3159f5d02e Merge branch 'release' 2025-01-08 14:59:57 +08:00
Liuyf
108bc6944b Merge branch 'develop' into release 2025-01-08 14:59:35 +08:00
Liuyf
6e50905f8b fix: umeng 隐私合规问题修复 2025-01-08 14:58:58 +08:00
Liuyf
d7eccec7f3 Merge branch 'release' 2025-01-08 11:53:46 +08:00
Liuyf
6776992b90 Merge branch 'develop' into release 2025-01-08 11:53:30 +08:00
Liuyf
25e6a906de fix: google play不允许清单文件重复列举申请相同权限 2025-01-08 11:52:43 +08:00
0b65d905b9 Merge remote-tracking branch 'origin/develop' into develop_liyi 2025-01-08 11:30:53 +08:00
Liuyf
ca9e5d8ecd Merge branch 'release' 2025-01-08 11:09:24 +08:00
Liuyf
e85ad4698a Merge branch 'develop' into release 2025-01-08 11:09:12 +08:00
Liuyf
b7ed39388a fix: umeng初始化隐私合规问题修复。 2025-01-08 11:08:26 +08:00
92fcf4a4fa fix:完善对讲流程、增加蓝牙透传消息指令 2025-01-08 09:14:29 +08:00
Liuyf
56515adb41 Merge branch 'release' 2025-01-08 08:51:11 +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
848b89841c Merge branch 'release' 2025-01-07 16:45:35 +08:00
Liuyf
5dd0423c59 fix: 隐私合规问题修复 2025-01-07 16:44:55 +08:00
Liuyf
64d1cd902b fix: 隐私合规问题修复 2025-01-07 16:43:00 +08:00
c16c9be4c6 fix:增加p2p调试命令 2025-01-06 09:52:14 +08:00
Liuyf
3aea843bfc Merge branch 'release' 2025-01-03 15:32:07 +08:00
魏少阳
404fcb7a8d Merge branch 'develop' into build-addGateway-20240814 2025-01-03 14:36:22 +08:00
魏少阳
c5e473d24e fix: 1、修复繁体台湾翻译之后简体中文较多问题 2025-01-03 14:35:12 +08:00
Liuyf
0ee31a0f62 ci: 修复gitlab域名更换后无法通过域名推送tag 2025-01-03 11:45:26 +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
Liuyf
8159c7ceda ci: 修复gitlab域名更换后无法通过域名推送tag 2025-01-03 11:35:58 +08:00
Liuyf
830d4ae938 fix: 修复alexa 支持语言列表为空问题 2025-01-02 18:52:25 +08:00
Liuyf
42f873d5c3 fix: 1、添加设备功能入口开发 2025-01-02 18:14:53 +08:00
魏少阳
687eea4031 fix: 1、添加设备功能入口开发 2025-01-02 17:52:24 +08:00
魏少阳
00a6a113a9 fix: 1、修复国际化bug 2025-01-02 16:15:41 +08:00
魏少阳
de1ec20ef5 Merge branch 'develop' into build-addGateway-20240814 2025-01-02 10:48:59 +08:00
魏少阳
e219c240bf fix: 1、修复一键登录sky环境登录问题。2、完善一键登录bug 2025-01-02 10:43:41 +08:00
ff9564b55a fix:完善各个对讲状态下的逻辑 2025-01-02 10:30:07 +08:00
01885f8a7c fix:调整对讲请求未接听时的超时时间为60秒 2025-01-02 10:29:23 +08:00
87ed175fed fix:整理对讲状态、增加视频页面的旋转角度 2025-01-02 10:28:56 +08:00
4044b9b1e1 fix:取消接听中状态 2025-01-02 10:27:59 +08:00
25bbd0cd19 fix:调整挂断后的逻辑、增加账号未登录时不初始化星图逻辑、增加修改预期接收数据方法 2025-01-02 10:27:40 +08:00
Liuyf
40112dfb37 other: pre,dev签名保持一致 2024-12-31 14:24:58 +08:00
魏少阳
ddf590c321 fix: 1、修改网关模块、远程开锁超时时间为60秒 2024-12-31 13:57:22 +08:00
魏少阳
ff1932689a fix: 1、修复国家化繁体台湾、繁体香港问题 2024-12-31 09:35:02 +08:00
魏少阳
64e5a03f77 fix: 1、完成一键登录功能 2024-12-30 18:17:28 +08:00
13e3839d67 fix:调整定时器超时逻辑 2024-12-30 17:26:30 +08:00
63501088e1 Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2024-12-30 11:54:02 +08:00
e850179c92 fix:增加录音发送功能 2024-12-30 11:53:42 +08:00
“DaisyWu”
cc8babf730 Merge branch 'develop_liyi' of http://code.star-lock.cn/StarlockTeam/app-starlock into develop_liyi 2024-12-28 15:00:32 +08:00
“DaisyWu”
8fe74cc22b feat: 星锁:猫眼设置页面—新增“呼叫目标”入口相关UI 2024-12-28 14:59:48 +08:00
c865db7a9f fix:增加页面播放逻辑、调整proto文件 2024-12-28 14:58:01 +08:00
133f863448 fix:增加页面播放逻辑、调整proto文件 2024-12-27 13:35:56 +08:00
44ba4c2920 fix:调整心跳包解析 2024-12-27 13:35:07 +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
f98d1ab05c fix:增加解析模拟对讲服务的数据并显示到屏幕上、增加异常类、增加发送消息前的状态判断 2024-12-25 18:30:10 +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
cdbd0c3d03 fix:补充测试代码 2024-12-25 09:41:46 +08:00
0f65751f48 Merge remote-tracking branch 'origin/develop' into develop_liyi 2024-12-25 09:10:56 +08:00
006af6e751 fix:补充测试代码 2024-12-24 16:21:44 +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
a029c4b4e0 fix:更新组包缓冲区的key 2024-12-24 15:38:36 +08:00
1108d4c665 fix:更新talk_data.proto结构 2024-12-24 15:17:44 +08:00
685591e652 Merge remote-tracking branch 'origin/develop' into develop_liyi 2024-12-24 14:22:25 +08:00
d642d79aa1 fix:增加收到TalkData之后的处理方法 2024-12-24 14:21:49 +08:00
4ab5d77473 fix:增加组包时的最大组包超时时间 2024-12-24 14:20:59 +08:00
a20206dfaf fix:调整星图上线消息包结构 2024-12-24 14:20:30 +08:00
魏少阳
3586b480f9 Merge branch 'develop' into build-addGateway-20240814 2024-12-24 14:12:34 +08:00
魏少阳
136da703cc fix: 1、添加跟随系统功能。2、修复网关bug。3、修复其他bug 2024-12-24 14:11:54 +08:00
f91f1714c8 style:整理udp返回数据的反序列化逻辑,使用工厂模式处理 2024-12-24 10:50:32 +08:00
558b9418cb fix:增加test.proto 2024-12-23 18:52:58 +08:00
d8680ac7df Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2024-12-23 18:41:43 +08:00
db9e1d4e33 fix:增加test.proto 2024-12-23 18:35:47 +08:00
“DaisyWu”
5b56557444 Merge branch 'develop_liyi' of http://code.star-lock.cn/StarlockTeam/app-starlock into develop_liyi
# Conflicts:
#	lib/main/lockMian/lockMain/lockMain_page.dart
2024-12-23 18:26:49 +08:00
“DaisyWu”
7437add645 fix:修复数据类型转换导致的分包组包问题 2024-12-23 18:25:18 +08:00
ffda80fb01 fix:增加echo调试代码 2024-12-23 17:13:32 +08:00
eadd667511 fix:增加app切换到后台或进入前台时的监听 2024-12-23 17:12:42 +08:00
3a2721c96e fix:调整重复进行绑定时,不显示接口回复的弹窗 2024-12-23 17:12:13 +08:00
8e6b1a047b fix:补充echo测试代码 2024-12-23 15:59:46 +08:00
6147b86e8b fix:增加talkData的组包逻辑 2024-12-23 15:21:48 +08:00
75985e0600 fix:蓝牙WIFI配网时增加peerID字段 2024-12-23 15:20:54 +08:00
e6b14a50eb fix:蓝牙WIFI配网时增加peerID字段 2024-12-23 15:19:57 +08:00
5e862a2919 fix:跳转页面状态跟对讲状态不更新问题 2024-12-23 11:58:20 +08:00
“DaisyWu”
50366de1d0 feat: 接听按钮新增部分处理 2024-12-23 09:56:12 +08:00
5574dc8043 fix:增加分包发送、接收分包数据后的组包逻辑、增加部分测试代码 2024-12-20 14:38:52 +08:00
ba47b2731b fix:增加分包发送、接收分包数据后的组包逻辑 2024-12-19 17:47:44 +08:00
Liuyf
4eee3d541a Merge branch 'master' into release 2024-12-19 17:14:10 +08:00
Liuyf
42197e7d19 ci: 发布版本前sky,xhj各自执行一次api检查 2024-12-19 17:10:53 +08:00
Liuyf
5bbd84896d Merge remote-tracking branch 'origin/feat_devops' into feat_devops 2024-12-19 17:06:38 +08:00
Liuyf
6b3766f0d6 ci: 发布版本前sky,xhj各自执行一次api检查 2024-12-19 16:48:41 +08:00
d6322c21ad Merge remote-tracking branch 'origin/develop' into develop_liyi 2024-12-19 15:47:16 +08:00
3ac717f41a Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2024-12-19 14:48:47 +08:00
f2ea43e4ab fix:同步调试echo分包逻辑代码、增加同一个会话时保持messageId进行递增 2024-12-19 14:48:19 +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
“DaisyWu”
65e28cd553 fix: 星图呼叫对讲页面点击挂断报错问题 2024-12-18 18:11:45 +08:00
“DaisyWu”
1c1556b0b1 Merge branches 'develop_liyi' and 'develop_liyi' of http://code.star-lock.cn/StarlockTeam/app-starlock into develop_liyi 2024-12-18 10:32:48 +08:00
“DaisyWu”
59d6bc1ea7 fix: 修复登录正式环境无法正常跳转到锁详情页问题 2024-12-18 10:32:34 +08:00
094e4c1662 Merge remote-tracking branch 'origin/develop' into develop_liyi 2024-12-18 09:26:51 +08:00
“DaisyWu”
c9a7ad72bb fix: 隔离补充提交 2024-12-17 17:52:41 +08:00
“DaisyWu”
589d258055 feat: 星图协议与旧对讲协议逻辑及页面分离 2024-12-17 17:49:26 +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”
140da9113b fix: 优化登录后星图初始化流程 2024-12-17 17:08:34 +08:00
“DaisyWu”
eb1c018581 feat: 1,新增电子反锁UI及本地功能
2,新增可视门铃码国际化UI及本地功能
	3,新增双重认证UI及本地功能
	4,新增双锁联动UI及本地功能
2024-12-17 17:07:59 +08:00
ebd632d3c2 Merge remote-tracking branch 'origin/develop' into develop_liyi 2024-12-17 16:52:28 +08:00
f421f59325 Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2024-12-17 16:52:11 +08:00
fdd4461f90 style:调整流控制器数据类型 2024-12-17 09:17:50 +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
1bafcd535a style:增加对讲状态,整理部分代码 2024-12-16 16:04:41 +08:00
74708b505e fix:处理心跳响应失败后:停止发送心跳消息,并启动重新上线 2024-12-16 13:59:21 +08:00
67fa0bc1ba fix:处理心跳响应失败后:停止发送心跳消息,并启动重新上线 2024-12-16 13:54:23 +08:00
2bdcc2f888 Merge remote-tracking branch 'origin/develop' into develop_liyi 2024-12-16 10:14:01 +08:00
2c5554e53e Merge remote-tracking branch 'origin/develop' into develop_liyi 2024-12-16 09:19:29 +08:00
魏少阳
2636f19619 fix: 1、进入修改国际化语言界面重启APP界面变灰问题。2、wifi密码输错一次再次提交没反应的问题 2024-12-14 09:20:21 +08:00
3200df7793 fix:增加对讲数据发送逻辑 2024-12-13 14:30:33 +08:00
aad509e7b9 fix:将webview拉伸为全屏、整理代码 2024-12-13 14:30:07 +08:00
23b8257779 style:整理代码 2024-12-13 14:29:33 +08:00
魏少阳
de24d8b3fb Merge branch 'develop' into build-addGateway-20240814 2024-12-13 11:06:22 +08:00
魏少阳
4d98561545 fix: 1、添加繁体香港。2、修复简体、繁体(台湾)、繁体(香港)传入显示问题。3、修复网关模块bug。4、添加网关强制删除功能。5、添加网关扫描设备功能。6、修复国际化其他bug 2024-12-13 10:59:42 +08:00
b7da72a1ce style:取消显示测试入口 2024-12-12 16:29:41 +08:00
“DaisyWu”
e78780a052 Merge branch 'develop_liyi' of http://code.star-lock.cn/StarlockTeam/app-starlock into develop_liyi 2024-12-12 16:28:05 +08:00
“DaisyWu”
909b2a7d49 fix:1,优化绑定星图配置流程—修复重复绑定问题
2,登录后增加星图相关配置本地存储处理—以免重复注册节点问题
	3,退出登录销毁星图相关资源处理
2024-12-12 16:27:50 +08:00
95d6016b58 fix:销毁星图资源时同时清除缓存 2024-12-12 16:06:28 +08:00
16ca0a012c fix:调整定时器 2024-12-12 16:05:53 +08:00
f3e42e3ac8 fix:增加读取h264文件后使用定时器发送,调整html样式 2024-12-12 15:48:15 +08:00
5b2cd50879 fix:增加接听后延迟2秒再启动通话数据检查和预期数据 2024-12-12 11:41:54 +08:00
“DaisyWu”
f9bf6a15bb feat: 补充提交 2024-12-12 10:38:24 +08:00
“DaisyWu”
6cda1953ba Merge branch 'develop_liyi' of http://code.star-lock.cn/StarlockTeam/app-starlock into develop_liyi
# Conflicts:
#	lib/login/login/starLock_login_page.dart
2024-12-12 10:32:59 +08:00
“DaisyWu”
c6be67cc46 feat: 1,绑定星图配置接口对接及逻辑处理
2,获取个人信息新增星图配置相关未绑定成功校验处理
2024-12-12 10:30:48 +08:00
bb682226af fix:增加html测试 2024-12-12 10:28:03 +08:00
cd63c0924b style:整理星图模块代码 2024-12-11 09:32:51 +08:00
“DaisyWu”
165f9dd080 Merge branch 'develop_liyi' of http://code.star-lock.cn/StarlockTeam/app-starlock into develop_liyi 2024-12-10 18:34:17 +08:00
“DaisyWu”
1e9d68be6e fix: 1,修复接听、挂断铃声未取消问题
2,修复挂断后未退出对讲问题
2024-12-10 18:33:32 +08:00
0f1dc9e666 fix:调整停止播放铃声 2024-12-10 18:26:47 +08:00
“DaisyWu”
343e9c101a fix:修复对讲页面报错问题 2024-12-10 18:07:07 +08:00
17111c7dc3 fix:调整通话中时改为发送通话中挂断消息 2024-12-10 17:46:24 +08:00
c6e9730b43 fix:调整挂断、拒绝后逻辑 2024-12-10 17:32:06 +08:00
9cfccf38c7 fix:调整中继数据的判断方式 2024-12-10 17:27:37 +08:00
92f3b90cb7 fix:调整中继数据的判断方式 2024-12-10 16:31:56 +08:00
de2e09aada fix:调整通话保持的MessageType 2024-12-10 16:31:41 +08:00
e6b89de80c Merge remote-tracking branch 'origin/develop' into develop_liyi 2024-12-10 09:46:19 +08:00
14eb5c448e fix:代码合并 2024-12-10 09:45:50 +08:00
Liuyf
4a368185be Merge branch 'develop_liuyf' into develop 2024-12-09 18:57:14 +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
魏少阳
5e4a08e803 Merge branch 'develop' into build-addGateway-20240814 2024-12-09 18:22:35 +08:00
魏少阳
7516813a1c fix: 1、修复扭力设置bug。2、星星锁添加万师傅入口。3、添加蓝牙、网关扫描类型区分。4、删除项目中废弃的协议 2024-12-09 18:11:17 +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
“DaisyWu”
fe00a366c7 Merge branch 'develop_liyi' of http://code.star-lock.cn/StarlockTeam/app-starlock into develop_liyi 2024-12-09 15:59:03 +08:00
“DaisyWu”
23a9797e38 feat: 1,新增星图对讲协议逻辑类与原始图片流方式区分隔离处理
2,新增星图对讲接听指令具体细节逻辑处理
2024-12-09 15:58:28 +08:00
3b53a44887 fix:完善状态变更和通知 2024-12-09 15:57:41 +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
c7d26096fb fix:完善状态变更和通知 2024-12-09 13:44:57 +08:00
Liuyf
23cd12a7b3 ci:构建完成发送企微通知 2024-12-09 13:44:28 +08:00
041c0b7775 fix:完善状态变更和通知 2024-12-09 12:05:34 +08:00
7a9464dfa1 fix:增加eventBus状态通知 2024-12-09 11:47:41 +08:00
86b985c4a4 fix:增加对讲通话状态类 2024-12-09 11:37:27 +08:00
Liuyf
323ed1d868 Merge branch 'develop' into release 2024-12-09 11:14:13 +08:00
Liuyf
77f555249f ci:构建完成发送企微通知 2024-12-09 11:11:35 +08:00
661ba90f08 fix:调整对讲接听逻辑 2024-12-09 11:06:35 +08:00
Liuyf
ad5b729aa8 fix: 提供sky,xhi本地调试配置以及app名称错误配置修复 2024-12-09 11:03:37 +08:00
4e0fdd6f29 fix:增加不同消息类型的对应处理方法 2024-12-09 09:22:58 +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
13fefa0495 fix:增加序列化时判断是请求体还是响应体 2024-12-06 15:13:03 +08:00
Liuyf
3a39886b8f other: 重新生成Podfile.lock文件 2024-12-06 14:49:02 +08:00
298862d153 fix:增加测试发送对话请求消息 2024-12-06 14:21:51 +08:00
a1468b0c3d fix:增加通话数据未收到时定时器判断 2024-12-06 13:51:09 +08:00
bc57e96150 fix:增加通话数据未收到时定时器判断 2024-12-06 13:48:15 +08:00
dee12e09c1 fix:增加通话数据未收到时定时器判断 2024-12-06 13:44:17 +08:00
6736760d3b fix:增加通话数据未收到时定时器判断 2024-12-06 13:38:34 +08:00
Liuyf
c5824f9018 other: 补充sky-pre,xhj-preJPUSH_PKGNAME配置 2024-12-06 11:02:18 +08:00
Liuyf
3b105f8019 Merge branch 'feat_devops' into develop 2024-12-06 10:22:01 +08:00
Liuyf
7305e0337f other: 补充sky-pre,xhj-pre地图key 2024-12-06 10:21:43 +08:00
422c230dfc fix:增加通话数据未收到时定时器判断 2024-12-05 13:55:31 +08:00
f337f6d346 fix:逻辑梳理 2024-12-05 13:51:28 +08:00
a677def7f3 fix:增加铃声、通话保持定时器 2024-12-05 13:50:57 +08:00
8f7ec774c1 fix:增加对讲的主动消息组装 2024-12-05 13:50:20 +08:00
4aeda1bfdf fix:调整proto 2024-12-05 13:49:56 +08:00
05fb0689c9 fix:增加铃声控制 2024-12-05 13:49:37 +08:00
acc16a7889 fix:增加protobuf提供的实体类转换 2024-12-05 10:24:57 +08:00
860c0e3150 fix:完善crc32计算校验 2024-12-04 17:26:33 +08:00
6c96814a68 Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2024-12-04 17:25:20 +08:00
28e346a163 fix:调整udp返回数据为工厂模式处理 2024-12-04 17:24:58 +08:00
“DaisyWu”
d1f12c62b9 feat: 解决星图消息结构中CRC32 算法校验不通过问题并本地验证成功 2024-12-04 17:24:16 +08:00
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
3e25831132 fix:调整udp返回数据为工厂模式处理 2024-12-04 15:10:51 +08:00
9847b572b3 fix:调整udp返回数据为工厂模式处理 2024-12-04 15:00:56 +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
857f9fad2a fix:调整udp返回数据为工厂模式处理 2024-12-04 10:52:05 +08:00
5054f2a68a feat:增加网关初始化发送指令和接收指令的处理 2024-12-03 17:55:33 +08:00
2429a107e1 feat:增加protobuf提供的实体类转换 2024-12-03 16:15:19 +08:00
a51b1c5c7b fix:调整新的中继协议中的上报签名逻辑 2024-12-03 14:47:12 +08:00
063fc90a29 fix:调整新的中继协议中的上报签名逻辑 2024-12-03 14:44:29 +08:00
8c75a8db1c Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi
# Conflicts:
#	lib/network/start_chart_api.dart
2024-12-03 10:28:42 +08:00
ec0a9c6ebc fix:调整新的中继协议中的上报签名逻辑 2024-12-03 10:22:38 +08:00
12c6bbe160 fix:调整新的中继协议中的上报签名逻辑 2024-12-03 10:20:14 +08:00
3d94a65418 feat:增加新的中继协议逻辑 2024-12-03 10:08:54 +08:00
b139414813 fix:调整新的中继协议中的上报签名逻辑 2024-12-03 10:06:28 +08:00
da16a61940 fix:调整新的中继协议中的上报签名逻辑 2024-12-03 10:06:28 +08:00
469849f4a1 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
“DaisyWu”
a588c126bf Merge branch 'develop' into develop_liyi 2024-12-02 18:05:39 +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
f2fbb6468b fix:调整新的中继协议中的上报签名逻辑 2024-12-02 17:19:01 +08:00
b9191d47ba Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2024-12-02 17:11:45 +08:00
834e4e056b fix:调整新的中继协议中的上报签名逻辑 2024-12-02 17:10:16 +08:00
7a4fbe19d8 fix:调整新的中继协议中的上报签名逻辑 2024-12-02 17:10:16 +08:00
a92ae906ef fix:调整新的中继协议中的上报签名逻辑 2024-12-02 17:10:16 +08:00
c240f089c7 fix:调整新的中继协议中的上报签名逻辑 2024-12-02 17:10:16 +08:00
200a6ce44c feat:增加新的中继协议逻辑 2024-12-02 17:10:16 +08:00
Liuyf
ef6e903ec9 other:iOS新增xhj,sky本地调试pre环境配置 2024-12-02 17:05:27 +08:00
0883ddf80b fix:调整新的中继协议中的上报签名逻辑 2024-12-02 16:13:07 +08:00
92490f22af fix:调整新的中继协议中的上报签名逻辑 2024-12-02 15:43:59 +08:00
81cb26682c fix:调整新的中继协议中的上报签名逻辑 2024-11-30 15:39:06 +08:00
625c5d8e93 fix:调整新的中继协议中的上报签名逻辑 2024-11-29 14:18:22 +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
910b3ce4c4 Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2024-11-28 14:59:12 +08:00
974fdd5bc9 feat:增加新的中继协议逻辑 2024-11-28 14:58:31 +08:00
213f40dd35 feat:增加新的中继协议逻辑 2024-11-28 14:57:49 +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' 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
Liuyf
0d8ece613a Merge branch 'develop' into sky_app_rename 2024-10-28 16:21:55 +08:00
魏少阳
ad0c0a2e5f Merge branch 'develop' into bugly 2024-10-28 16:08:05 +08:00
魏少阳
8bd543053c Merge branch 'develop' of code.star-lock.cn:StarlockTeam/app-starlock into develop 2024-10-28 16:02:55 +08:00
Liuyf
a90ba6c9b2 Merge branch 'release' 2024-10-28 15:08:40 +08:00
刘燕峰
3d1c25ee4c Delete .DS_Store 2024-10-28 07:06:48 +00:00
刘燕峰
1b77a60a6d Delete .DS_Store 2024-10-28 07:06:34 +00:00
Liuyf
8ce45c8494 Merge branch 'release' 2024-10-28 15:05:51 +08:00
魏少阳
ccf1f71632 Merge branch 'develop' of code.star-lock.cn:StarlockTeam/app-starlock into develop 2024-10-28 14:59:43 +08:00
Liuyf
f7f9f9056f other: 星锁本地开发调试使用local scheme 2024-10-28 14:59:05 +08:00
魏少阳
2b4eebf6b6 Merge branch 'develop' of code.star-lock.cn:StarlockTeam/app-starlock into develop 2024-10-28 14:51:44 +08:00
Liuyf
e26a2fa364 other: 星锁本地开发调试使用local scheme 2024-10-28 14:46:36 +08:00
魏少阳
814c9e677d Merge branch 'develop' into bugly
# Conflicts:
#	ios/.DS_Store
2024-10-28 11:56:40 +08:00
魏少阳
6543fdd3ca Merge branch 'develop' of code.star-lock.cn:StarlockTeam/app-starlock into develop
# Conflicts:
#	ios/.DS_Store
2024-10-28 11:55:38 +08:00
魏少阳
9ea328968a fix: 修复蓝牙记录问题 2024-10-28 11:53:57 +08:00
Liuyf
16783aded8 other: 锁通通正式更名为斯凯智能 2024-10-25 11:01:06 +08:00
Liuyf
c36fb4b27e Merge branch 'master' into bugly 2024-10-22 10:56:51 +08:00
刘燕峰
8f78b4d485 Delete .DS_Store 2024-10-22 02:56:36 +00:00
刘燕峰
eed1bb1aef Delete .DS_Store 2024-10-22 02:55:37 +00:00
Liuyf
17ecae6b08 other: 忽略.DS_Store临时文件 2024-10-22 10:55:19 +08:00
Liuyf
f12e49b9ca other: 忽略.DS_Store临时文件 2024-10-22 10:53:51 +08:00
Liuyf
d2e365a813 other: 新增canary版本打包逻辑. 2024-10-22 10:07:37 +08:00
Liuyf
92ae64e7a9 other: 新增canary版本打包逻辑 2024-10-22 09:58:30 +08:00
Liuyf
2fde801e2c other: 新增canary版本打包逻辑 2024-10-22 09:57:17 +08:00
Liuyf
cade03ea5a other: 新增canary版本打包逻辑 2024-10-22 09:54:40 +08:00
Liuyf
3f979e57a5 other: 新增canary版本打包逻辑 2024-10-22 09:53:12 +08:00
Liuyf
89e2c50a84 other: 新增canary版本打包逻辑 2024-10-22 09:43:45 +08:00
Liuyf
42c6ebe13c other: 新增canary版本打包逻辑 2024-10-22 09:36:06 +08:00
Liuyf
f51311ee20 other: 新增canary版本打包逻辑 2024-10-22 09:30:20 +08:00
魏少阳
74d8cd57f6 iOS安卓添加并切换Product渠道 2024-10-21 18:13:21 +08:00
魏少阳
dbc5c0bfd5 完成bugly添加 2024-10-21 17:19:56 +08:00
魏少阳
e4eaa97046 1、添加卡指纹bugly统计
2、添加授权管理员、卡、记录、指纹、密码、删除锁、友盟统计
2024-10-21 16:18:53 +08:00
魏少阳
fc18ca5614 修改友盟初始化问题 2024-10-21 11:07:17 +08:00
魏少阳
93b24fec2e 1、添加友盟统计
2、添加埋点
2024-10-19 18:26:41 +08:00
Liuyf
559b26ab6f feat: dev,pre环境打包采用未来真实版本号. 2024-10-19 13:34:13 +08:00
Liuyf
44bb803754 feat: dev,pre环境打包采用未来真实版本号. 2024-10-19 13:31:43 +08:00
魏少阳
6eeb2e9fe3 修复国际化bug 2024-10-19 09:38:57 +08:00
魏少阳
15af50d951 1、完善星锁APP国际化 36种语言。
2、修复国际化问题
2024-10-15 18:32:11 +08:00
魏少阳
2368bb631c 1、完成网关模块国际化
2、删除蓝牙协议模块不用的蓝牙协议文件
2024-10-15 14:24:35 +08:00
liuyanfeng
70619b94be feat: 支持自动根据commitlog生成版本号以及realse changelog采集 2024-10-14 23:03:26 +08:00
liuyanfeng
3b414d3f66 feat: 支持自动根据commitlog生成版本号以及realse changelog采集 2024-10-14 22:51:58 +08:00
ci_bot
baeb2b5544 feat: 配置xhj releae profile证书 2024-10-12 17:47:50 +08:00
ci_bot
9542a7715c feat: 配置xhj releae证书 2024-10-12 17:21:37 +08:00
ci_bot
c4b293ef86 feat: 配置local dev pre证书 2024-10-12 15:50:19 +08:00
ci_bot
408dbf9778 feat: 配置local dev pre证书 2024-10-12 15:01:06 +08:00
ci_bot
9df3a5de49 feat: 关闭iOS证书自动管理功能 2024-10-12 14:08:05 +08:00
Liuyf
a7b1c07976 Merge branch 'develop' into feat_devops
# Conflicts:
#	android/app/build.gradle
#	ios/Runner.xcodeproj/project.pbxproj
2024-10-12 13:43:14 +08:00
Liuyf
e88797ac68 feat: 支持google store制品打包 2024-10-12 12:02:50 +08:00
Liuyf
07aa8a720c feat: Android设备首次直连开锁失败后捅过扫描设备开锁。 2024-10-12 11:27:01 +08:00
Liuyf
a3e333387c feat: release模式制品版本号标识 2024-10-12 09:16:31 +08:00
liuyanfeng
a41feff7a8 feat: 支持android ios不同环境制品包构建 2024-10-11 23:50:08 +08:00
Liuyf
cc3a76e2b5 feat: release模式制品版本号标识 2024-10-11 20:15:52 +08:00
liuyanfeng
dc72af9936 feat: 支持android ios不同环境制品包构建 2024-10-10 22:20:20 +08:00
liuyanfeng
4cc22002fd feat: 支持android ios不同环境制品包构建 2024-10-10 00:18:17 +08:00
liuyanfeng
f2d1efacc0 feat: 支持android ios不同环境制品包构建 2024-10-09 23:53:23 +08:00
liuyanfeng
cfad7de35e feat: 支持android ios不同环境制品包构建 2024-10-09 23:30:56 +08:00
ci_bot
8aefee0ad1 feat: gem依赖库版本锁定 2024-10-09 23:17:01 +08:00
liuyanfeng
d0290d946e feat: 支持android ios不同环境制品包构建 2024-10-09 23:13:50 +08:00
魏少阳
427503c10b 完成网关配网功能 2024-10-08 18:22:31 +08:00
魏少阳
219c70d3cc 修改过建好,打包给谢敬调试网关 2024-10-08 10:30:43 +08:00
Liuyf
6cbc22d237 fix: 将该 高德地图SDK 升级到符合google商店政策规定的版本 2024-10-07 18:12:44 +08:00
魏少阳
c3d9667458 1、添加获取网关状态协议及逻辑
2、添加更新网关信息功能
2024-10-07 14:17:46 +08:00
Liuyf
f5dc9291b9 refactor: sky App打包使用lite模式 2024-10-07 11:18:25 +08:00
Liuyf
b9e6c605d9 fix: google targetSdkVersion最低版本要求 2024-10-07 11:12:31 +08:00
Liuyf
e945be8fe2 refactor: sky App名称还原 2024-10-07 11:10:49 +08:00
魏少阳
b8e6c52afe 添加版本打包 2024-10-07 09:16:21 +08:00
Liuyf
6dabcf4ebb fix:修复授权管理员图标变形 2024-09-30 16:32:18 +08:00
魏少阳
ebc9b677ab 1、优化bugly数据上报到一条数据上
2、添加蓝牙权限、定位权限数据上报
2024-09-30 16:31:29 +08:00
魏少阳
9336e83434 1.0.81版本打包给宿舍门测试 2024-09-30 10:35:44 +08:00
Liuyf
ec3ca583db fix:修复授权管理员图标变形 2024-09-29 18:37:47 +08:00
Liuyf
552c787c5a feat: bugly自定义日志采集逻辑 2024-09-29 13:47:50 +08:00
魏少阳
4bfb11e1d1 添加开锁数据部分上报 2024-09-29 10:05:29 +08:00
Liuyf
1b1c481961 feat: flavor support dev and pre 2024-09-27 23:33:45 +08:00
魏少阳
e80d27ff17 Merge branch 'optimized_startup_wei' into develop 2024-09-27 10:25:38 +08:00
魏少阳
f082212f92 1、修改开锁页-开锁键-蓝牙开锁成功后有英文弹框
2、修改卡、指纹、人脸-详情、遥控、掌静脉修改姓名 为空,弹框黑无内容问题
3、修改操作记录bug
2024-09-27 10:15:24 +08:00
liuyanfeng
f710f9d11e feat: android fastlane 2024-09-26 23:23:53 +08:00
“DaisyWu”
f8fce1540d Merge branch 'develop_daisy' into develop 2024-09-26 16:59:36 +08:00
“DaisyWu”
07a5ac6f18 fix: 1,锁详情图片适配更换
2,sky环境登录、关于更换图标
2024-09-26 16:59:01 +08:00
魏少阳
d947ffeeb2 修复网关调试问题 2024-09-26 13:39:16 +08:00
ci_bot
e002599725 feat: 初始化fastlane配置 2024-09-26 09:52:23 +08:00
ci_bot
27eefdc40f feat: iOS取消证书自动管理 2024-09-24 23:38:47 +08:00
liuyanfeng
4454f11d9e feat: 新增xhj、sky口味对应的dev、pre环境打包配置文件 2024-09-24 23:13:25 +08:00
魏少阳
146944f334 Merge branch 'develop' of code.star-lock.cn:StarlockTeam/app-starlock into develop 2024-09-24 16:05:23 +08:00
Liuyf
2175493751 Merge branch 'develop' into liuyf_feat_minify 2024-09-24 11:08:12 +08:00
魏少阳
2ab9ed497d Merge branch 'develop' of code.star-lock.cn:StarlockTeam/app-starlock into develop 2024-09-24 09:56:40 +08:00
魏少阳
918df59662 1、修改锁详情-记录模块无记录时不上传
2、开完锁上传记录添加password字段
3、修复锁列表单次电子钥匙过期状态不显示问题
4、修复重置密码提交按钮置灰时能点击问题
5、修复我的模块客服不显示问题
2024-09-24 09:55:54 +08:00
Liuyf
adf630b9ae fix:【我的页-增值服务-实名认证 首次购买后点左上箭头退不到APP,在购物车是空的和订单提交成功界面来回切换(首次买高级功能一样)】
https://www.tapd.cn/69273997/bugtrace/bugs/view/1169273997001002869
2024-09-23 20:23:05 +08:00
Liuyf
70431731d3 fix:【我的页-增值服务-实名认证 首次购买后点左上箭头退不到APP,在购物车是空的和订单提交成功界面来回切换(首次买高级功能一样)】
https://www.tapd.cn/69273997/bugtrace/bugs/view/1169273997001002869
2024-09-23 20:20:24 +08:00
“DaisyWu”
3e42092455 fix: 星锁修复1.0.80版本提测问题 2024-09-23 18:20:18 +08:00
Liuyf
72d5d3dc20 Fix:【其他-注册】
https://www.tapd.cn/69273997/bugtrace/bugs/view/1169273997001002903
2024-09-23 15:45:39 +08:00
魏少阳
a81e7ff917 修复掌静脉重置提示 2024-09-23 14:28:52 +08:00
Liuyf
22887609f5 Merge branch 'optimized_startup_wei' into develop 2024-09-20 11:16:31 +08:00
Liuyf
7353e64986 feat: 有所记录上传后,开锁成功后不需要主动上报开锁情况。 2024-09-20 11:13:24 +08:00
魏少阳
6b792df101 1、添加网关获取附近WiFi协议及逻辑
2、添加添加网关协议、接口及逻辑
3、添加网关详情功能
4、添加删除网关功能
2024-09-19 09:26:07 +08:00
Liuyf
70b178a4b9 Merge branch 'optimized_startup_wei' into develop 2024-09-18 10:28:56 +08:00
Liuyf
56e1d4cbff feat: 锁记录数据有效性校正(依据服务器时间) 2024-09-14 18:54:50 +08:00
魏少阳
e494bbf2c7 添加开锁之后数据上传 2024-09-14 16:43:27 +08:00
魏少阳
bcb7643a08 1、添加网关列表调用接口
2、添加扫描网关逻辑
2024-09-14 16:31:45 +08:00
Liuyf
6e41ded2ed Merge remote-tracking branch 'origin/develop' into develop 2024-09-14 09:16:14 +08:00
Liuyf
4fbce85a0f refactor: sky App图标和名称替换 2024-09-14 09:16:08 +08:00
魏少阳
3b9e2b1224 解决冲突合并代码 2024-09-13 15:22:17 +08:00
魏少阳
91df0242f1 Merge branch 'develop' of code.star-lock.cn:StarlockTeam/app-starlock into develop
# Conflicts:
#	lan/lan_en.json
#	lan/lan_keys.json
#	lan/lan_zh.json
2024-09-13 15:01:16 +08:00
魏少阳
baad7fdea0 Merge branch 'optimized_startup_wei' into develop
# Conflicts:
#	lan/lan_en.json
#	lan/lan_keys.json
#	lan/lan_zh.json
2024-09-13 14:59:55 +08:00
魏少阳
60bdbc1b2b 取消锁统统我的设置里面增值服务入口 2024-09-13 14:54:07 +08:00
魏少阳
eb401fb8ef 1、优化注册、忘记密码、重置密码功能,密码限制及密码不一样时显示问题 2024-09-13 14:50:36 +08:00
“DaisyWu”
ab1009b9bf feat: Google Home相关国际化添加 2024-09-12 11:34:17 +08:00
“DaisyWu”
9ded5b34fc fix: 修复增值服务跳转Google Home报错问题 2024-09-11 19:48:50 +08:00
“DaisyWu”
8715c4d7ee Merge branch 'develop_daisy' into develop 2024-09-11 17:50:58 +08:00
“DaisyWu”
2a4f081e2c feat: 1,梳理多口味不同环境新增多个info.plist配置文件
2,完成上线需统一根据口味环境更换启动页
2024-09-11 17:49:36 +08:00
“DaisyWu”
4dd013a447 1,星锁fix—推送偶发性获取不到DeviceID问题
2,星锁fix—登录报错DeviceInfo不能为空问题
3,星锁集成—荣耀厂商通道以提高推送到达率(已测试通过)
4,星锁集成—vivo厂商通道(待vivo机型测试)
2024-09-11 16:08:41 +08:00
魏少阳
c17ac37741 Merge branch 'develop' of code.star-lock.cn:StarlockTeam/app-starlock into develop
# Conflicts:
#	lib/mine/mineSet/mineSet/mineSet_page.dart
2024-09-11 15:38:14 +08:00
魏少阳
6422935562 Merge branch 'optimized_startup_wei' into develop
# Conflicts:
#	lib/mine/mineSet/mineSet/mineSet_page.dart
2024-09-11 15:36:05 +08:00
魏少阳
75b400c0e9 合并优化启动代码 2024-09-11 15:23:46 +08:00
“DaisyWu”
57c7a41742 feat: 对接Google Home接口并完成相关功能 2024-09-11 10:43:59 +08:00
“DaisyWu”
30383710b5 fix: 跟进登录、注册接口入参DeviceInfo内容不完善问题 2024-09-10 17:20:28 +08:00
“DaisyWu”
ef19316501 Merge branch 'develop_daisy' into develop 2024-09-10 09:31:05 +08:00
Liuyf
c6e8cf84a3 Merge branch 'liuyf_feat_minify' into develop 2024-09-10 09:06:55 +08:00
“DaisyWu”
0438a25a4b feat: 完成Amazon Alexa相关功能 2024-09-09 16:35:36 +08:00
Liuyf
41a7bf9080 feat: xhj和sky采用不同的规则进行代码混淆 2024-09-09 15:55:45 +08:00
Liuyf
4be14d21b6 feat: 微信支付混淆规则支持 2024-09-09 12:02:00 +08:00
“DaisyWu”
7a00665a9f feat: 补充提交 2024-09-09 11:33:36 +08:00
“DaisyWu”
b387c7ef03 feat: 新增Amazon Alexa入口及UI框架 2024-09-09 11:30:15 +08:00
liuyanfeng
887492ea58 feat: android混淆支持R8 2024-09-08 02:00:00 +08:00
Liuyf
105f029470 feat: android代码混淆 2024-09-07 20:41:09 +08:00
魏少阳
bb97183c18 Merge branch 'release' of code.star-lock.cn:StarlockTeam/app-starlock into build-addGateway-20240814 2024-09-04 09:55:06 +08:00
魏少阳
ef693c5429 Merge branch 'release' into build-addGateway-20240814
# Conflicts:
#	pubspec.yaml
2024-09-04 09:53:59 +08:00
“DaisyWu”
c0ab54b994 1,星锁fix—推送偶发性获取不到DeviceID问题
2,星锁fix—登录报错DeviceInfo不能为空问题
3,星锁集成—荣耀厂商通道以提高推送到达率(已测试通过)
4,星锁集成—vivo厂商通道(待vivo机型测试)
2024-09-04 09:09:40 +08:00
魏少阳
a7336b79cc 1、添加开完锁之后数据上传
2、打包apk上传到pre下载页
3、完成App启动数据请求优化问题
2024-09-02 18:09:57 +08:00
魏少阳
b241008de8 完成国际化功能(包括中英文在内的34种语言) 2024-08-29 18:13:00 +08:00
魏少阳
0e99d60cb8 完善国际化信息 2024-08-27 11:08:44 +08:00
魏少阳
e9d4a0bf72 vivo被拒 修改构建号重新提交 2024-08-22 15:07:57 +08:00
魏少阳
377963c41d 适配部分国际化UI 2024-08-22 14:53:03 +08:00
魏少阳
75c38697b5 星锁项目需要国际化字段已经全部寻找完毕 共1024个 2024-08-21 18:31:19 +08:00
魏少阳
5afd588b5c 添加项目中未国际化字段到类addFace_state.dart 2024-08-21 14:12:15 +08:00
魏少阳
fd095031c7 修改版本1.0.76上架锁通通 2024-08-20 11:01:57 +08:00
魏少阳
e817883575 修改未完成国际化字段 2024-08-20 09:53:39 +08:00
魏少阳
001cff8bc5 1、修改电子钥匙详情修改仅管理自己创建的用户、远程开锁不成功问题
2、修改同一把锁重置之后重新添加之后详情不刷新功能
2024-08-19 18:22:11 +08:00
魏少阳
b25bf61db1 删除多余的类 2024-08-19 15:24:34 +08:00
魏少阳
813a09abc0 修改项目中未国际化的中文 2024-08-19 15:24:14 +08:00
魏少阳
8f25e1bf04 添加网关UI 2024-08-19 11:01:37 +08:00
魏少阳
915be9fb52 Merge branch 'release' into International-language+20240725
# Conflicts:
#	.DS_Store
#	lan/lan_zh.json
#	lib/login/login/starLock_login_xhj_page.dart
#	lib/login/register/starLock_register_xhj_page.dart
#	lib/main/lockDetail/lockDetail/lockDetail_page.dart
#	lib/main/lockDetail/lockSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_page.dart
#	lib/mine/minePersonInfo/minePersonInfoResetPassword/minePersonInfoResetPassword_page.dart
#	lib/mine/mineSet/hideInvalidUnlockPermissions/hideInvalidUnlockPermissions_page.dart
#	lib/mine/mineSet/mineSet/mineSet_page.dart
#	lib/mine/valueAddedServices/valueAddedServicesHighFunction/valueAddedServicesHighFunction_page.dart
#	lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart
2024-08-14 13:58:08 +08:00
魏少阳
f17a168999 修改版本号 2024-08-14 13:40:35 +08:00
魏少阳
9d00deb505 Merge branch 'release' of code.star-lock.cn:StarlockTeam/app-starlock into release 2024-08-14 13:37:21 +08:00
魏少阳
f32f2b5a6c shell脚本添加打包aab包命令 2024-08-14 13:37:02 +08:00
“DaisyWu”
eeef2a773c 补充提交 2024-08-12 14:31:32 +08:00
“DaisyWu”
75ffd0a68f 最新上架版本号备注1.0.76 2024-08-12 14:30:55 +08:00
魏少阳
d756d1cc0c 修改版本上架 2024-08-12 10:05:14 +08:00
魏少阳
6e0a314a71 1、修改了打包是lite版本
2、修复锁通通点击开锁按钮,没有动效问题
3、修改版本上架
2024-08-12 10:04:40 +08:00
魏少阳
43f969b6c2 锁定版本1.0.75+2024081001,上架商城 2024-08-10 14:14:26 +08:00
魏少阳
85d7401ed2 修复添加锁时从所有锁进入引起的权限问题 2024-08-10 14:10:43 +08:00
魏少阳
a527b4337f 1、修复无网络情况下点击隐藏无效开锁权限bug
2、修复发送授权管理员必须要输入姓名问题
3、修复无网络情况下,无效授权管理员点击仅管理创建用户问题
2024-08-10 10:38:00 +08:00
魏少阳
33a1cecb8e 修复卡、指纹、人脸、遥控、掌静脉、密码数据超过三页之后删除进入详情删除最后一条数据列表卡顿情况 2024-08-09 14:00:36 +08:00
魏少阳
496bf744e5 1.0.73+2024080801修改版本提交测试 2024-08-08 14:29:32 +08:00
魏少阳
7092b552ab Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-08-08 11:00:11 +08:00
魏少阳
2a66f5e8c5 修改TAPD 优2优bug 2024-08-08 11:00:03 +08:00
“DaisyWu”
e97d78fe99 修复星锁bug 2024-08-07 18:00:35 +08:00
“DaisyWu”
004a38b341 对现存需求疑点和未完成项在线上环境隐藏 2024-08-07 13:37:14 +08:00
“DaisyWu”
01db54a346 1,操作记录bug修复
2,微信公众号推送打开后二维码报错修复
2024-08-07 10:54:36 +08:00
魏少阳
4b0d3d13fe 增加版本号发布版本,回归测试 2024-08-05 11:39:30 +08:00
魏少阳
7cea406489 Merge branch 'release' into International-language+20240725
# Conflicts:
#	lan/lan_en.json
2024-08-05 10:21:44 +08:00
魏少阳
ac8760f5cc 修改锁详情国际化兼容 2024-08-05 10:20:40 +08:00
魏少阳
c8dd57a500 删除文件 2024-08-05 09:57:31 +08:00
魏少阳
ab8d555f23 统一国际化风格 2024-08-05 09:57:16 +08:00
魏少阳
cde870128a 完成国际化风格统一 2024-08-02 13:52:37 +08:00
魏少阳
1d1406e3fc 国际化统一到openNow字段 2024-08-01 18:54:32 +08:00
魏少阳
9f473d9909 Merge branch 'release' into International-language+20240725 2024-08-01 11:10:59 +08:00
魏少阳
0d2dd5f585 蓝牙控制类修改方法 修复首次添加完锁之后,部分机型开锁提示锁已被重置问题 2024-08-01 11:10:46 +08:00
魏少阳
90dcb35f76 统一国际化到消息字段 2024-07-31 20:02:38 +08:00
魏少阳
5682ccdffb 修改国际化到lanEnglish字段 2024-07-31 17:24:30 +08:00
魏少阳
9628cf0aa3 Merge branch 'release' into International-language+20240725
# Conflicts:
#	lib/main/lockDetail/lockSet/burglarAlarm/burglarAlarm_page.dart
2024-07-31 14:06:36 +08:00
魏少阳
696a2884d2 修复首次添加完锁之后,iOS系统开锁提示锁已被重置问题 2024-07-31 13:54:48 +08:00
魏少阳
1aa818402b 1、修复安卓低版本手机扫描蓝牙慢、开锁慢的情况
2、修复遥控、掌静脉添加问题
2024-07-30 20:00:06 +08:00
魏少阳
577a056e53 修改记录不能上传问题 2024-07-29 19:52:38 +08:00
魏少阳
f2b46b3b41 更新到单休字段 2024-07-29 19:30:29 +08:00
魏少阳
b687ffd154 Merge branch 'release' into International-language+20240725 2024-07-29 18:07:27 +08:00
魏少阳
b023ff6fd6 1、修复添加遥控问题
2、修复上传数据显示超过总数的问题
3、添加版本号回归测试
2024-07-29 17:36:48 +08:00
魏少阳
d945ff5bb8 添加掌静脉删除、修改有限期 2024-07-29 11:56:34 +08:00
魏少阳
706003021c 添加掌静脉列表、添加、详情、修改掌静脉名字等功能 2024-07-27 18:18:54 +08:00
魏少阳
7b7e04669b Merge branch 'release' into International-language+20240725 2024-07-27 14:37:09 +08:00
魏少阳
6505ec535a 修改测试部门提出bug 2024-07-27 14:36:35 +08:00
魏少阳
d4c37f9f4a Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-07-26 14:13:17 +08:00
魏少阳
7c2b7f1a2f 统一国际化到常开日期字段 2024-07-26 14:12:26 +08:00
“DaisyWu”
142f641416 修复偶现无法收到推送问题 2024-07-26 10:03:40 +08:00
魏少阳
b0dec4471c 修改记录上传添加密码上传问题 2024-07-26 10:03:40 +08:00
魏少阳
dfa1ecc005 Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-07-26 10:01:08 +08:00
魏少阳
eb80ce287d 修改记录上传添加密码上传问题 2024-07-26 10:00:58 +08:00
魏少阳
9235b66e9e 统一国际化到添加手掌 2024-07-26 09:57:44 +08:00
魏少阳
0de849f4cf 国际化统一到cancel 2024-07-26 09:21:22 +08:00
“DaisyWu”
811b3ea356 修复偶现无法收到推送问题 2024-07-25 18:33:27 +08:00
魏少阳
f5b79303a8 修改登录、卡、指纹、人脸、遥控国际化 2024-07-25 14:40:02 +08:00
魏少阳
8401514838 修改自动闭锁模块功能问题 2024-07-25 11:36:54 +08:00
XieHaoLiang
e22d3fbe99 自动化国际化脚本 2024-07-25 11:27:52 +08:00
XieHaoLiang
e7745d945b Merge remote-tracking branch 'origin/release' into release 2024-07-25 10:47:17 +08:00
XieHaoLiang
2bbf7ca613 自动化国际化脚本 2024-07-25 10:47:09 +08:00
魏少阳
fbbefab330 修复面容开锁设置近距离跟远距离显示问题 2024-07-25 10:38:33 +08:00
魏少阳
8d6276e22f 改变lan国家化文件路径 2024-07-24 18:12:33 +08:00
魏少阳
86f98e25e2 添加版本,打包回归测试 2024-07-24 17:33:15 +08:00
魏少阳
a4e93f7794 添加更新云用户时区偏移与语言功能 2024-07-24 11:45:33 +08:00
魏少阳
626e9561b1 Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-07-24 10:12:40 +08:00
魏少阳
caac5f2a55 添加电子钥匙开锁成功上报功能 2024-07-24 10:12:36 +08:00
XieHaoLiang
5deb1bbc6c 纠正自动检测废弃接口脚本 fix 2024-07-24 09:59:38 +08:00
XieHaoLiang
e34841ad87 纠正自动检测废弃接口脚本 2024-07-23 18:02:47 +08:00
XieHaoLiang
08ac829803 纠正自动检测废弃接口脚本 2024-07-23 17:40:25 +08:00
魏少阳
3977d18664 修改遥控数据上传问题 2024-07-23 15:44:35 +08:00
魏少阳
63fa85f5fe 1、添加获取遥控开锁记录问题。2、添加遥控数据同步问题 2024-07-23 15:02:57 +08:00
魏少阳
ee97a645f7 Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-07-23 11:16:28 +08:00
魏少阳
629b8ca17e 添加遥控模块 2024-07-23 11:16:18 +08:00
“DaisyWu”
9c35559272 修复不能成功绑定推送ID问题 2024-07-23 09:25:45 +08:00
“DaisyWu”
38002914ab 补充提交 2024-07-18 17:06:08 +08:00
“DaisyWu”
bfe66f89f3 1,开锁页-电子钥匙-详情里操作对永久的普通钥匙冻结和解冻,实际锁列表页授权和普通钥匙未改变状态
2,修复发出的授权管理员永久时限并在超级管理员端操作冻结未生效问题
2024-07-18 17:05:45 +08:00
“DaisyWu”
f86c35a5ee Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release 2024-07-17 17:29:40 +08:00
“DaisyWu”
38dcf47ec0 1.修改姓名提示更新成功,但未刷新;应限制50位。
2.修改提醒方式点确定没有操作成功的提示,实际没有修改成功

3.修改开锁方式点击进去锁用户的勾应在对应的用户上,现勾都是在第一个。

4.家人详情,更改不成功,应有操作成功的提示,选了新的用户应直接刷新。
2024-07-17 17:29:30 +08:00
魏少阳
109ff2a253 Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-07-17 16:29:34 +08:00
魏少阳
5b3535ab38 1、完成面容开锁设置功能
2、修复操作记录密码添加序号问题
3、修复自动闭锁设置问题
2024-07-17 16:29:25 +08:00
“DaisyWu”
f07618faa2 更新sky环境下的图片 2024-07-16 16:40:52 +08:00
“DaisyWu”
d98f39721d 1,fix提测问题:蓝牙APP侧滑删除,默认有登录密码存在已修改
2,fix提测问题:修改人脸姓名时,名字跟时效一起修改后,退出再进入,姓名未修改过来
2024-07-16 15:45:36 +08:00
“DaisyWu”
76ba648bc9 补充提交 2024-07-16 09:21:22 +08:00
“DaisyWu”
aee06bd71e Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release 2024-07-16 09:18:16 +08:00
“DaisyWu”
812fb19e84 fix提测问题:APP进入设置遥控,点击添加遥控后界面会变为“添加指纹”显示 2024-07-16 09:18:07 +08:00
魏少阳
e72f08830a Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-07-13 17:41:11 +08:00
魏少阳
559336a81e 1、修改了忘记密码点击按钮没反应问题。
2、修改开锁setstate报错问题
2024-07-13 17:40:56 +08:00
“DaisyWu”
4e7bbfa139 记录下拉问题修复 2024-07-10 13:56:10 +08:00
魏少阳
834fdc80d7 Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-07-09 18:04:34 +08:00
魏少阳
c3d391090b 1、添加人脸添加过程的功能
2、修改账号页-设置-锁用户管理-即将到期,密码删除未刷新,删除的是最下面的一个密码不是当前选的问题
3、修改账号页-设置-锁用户管理-即将到期,卡、指纹、人脸删除未刷新问题
4、修改账号页-设置-锁用户管理-即将到期,密码修改提示用户未登记
5、添加修改账号页-设置-锁用户管理-即将到期模块,卡、指纹、人脸修改循环功能
2024-07-09 18:04:29 +08:00
“DaisyWu”
5c0e5deba2 更新短信条数不准确问题修复 2024-07-09 16:34:45 +08:00
“DaisyWu”
f9738cdcf7 Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release 2024-07-09 16:06:08 +08:00
“DaisyWu”
7cd575009b 1,接入最新添加短信、邮件模版API并修改部分逻辑代码
2,接入最新获取默认模版API并修改部分逻辑代码
3,新建短信、邮件模版新增国内、国际模版选择
4,重构新建模版、编辑模版模块代码
5,梳理最新获取已有模版列表API修改
2024-07-09 16:04:56 +08:00
anfe
2eac3ee478 fix:修复华为拒审的问题 2024-07-09 10:11:19 +08:00
anfe
7703f5949e Merge branch 'release_hyx' into release 2024-07-08 18:25:47 +08:00
anfe
ea57d1058f fix:修复锁升级因为不兼容问题,导致无法升级。提高了对 固件 json 结构的解析 2024-07-08 18:25:06 +08:00
“DaisyWu”
3373b16d74 Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release 2024-07-08 18:18:26 +08:00
“DaisyWu”
7f1642b09f 1,修复星锁点分享界面少了发送密码到、分享
2,修复星锁类型选择的文字,少了句号。系统短信多了那字,是软件里。
3,修复接收者少了通讯录的头像。及选择通讯录相关逻辑操作
4,修复建议限制50位。接收者如是汉字或位数不够,英文弹框,通通锁提示操作失败。
5,星星锁电子钥匙、密码模块发送成功后,发送短信、邮箱接入最新API,解决发送不成功问题
2024-07-08 18:18:20 +08:00
anfe
a8414d1876 fix:修复锁升级因为不兼容问题,导致无法升级。提高了对 固件 json 结构的解析 2024-07-08 17:25:26 +08:00
anfe
6041290ebd fix:修复开锁页-考勤-设置-员工 删除后点编辑后打卡方式在有上,应显示无处。之前已修复又出现 2024-07-08 15:33:20 +08:00
anfe
3b606d0adf fix:修复我的页-增值服务-高级功能-已购买如增加锁数量要再购买没有入口,不能再买 2024-07-08 14:44:24 +08:00
anfe
98886b7d9f feat:xhj 去除商城页面 2024-07-05 09:37:05 +08:00
anfe
af09a2b29c Merge branch 'release_hyx' into release 2024-07-03 15:23:34 +08:00
anfe
eacd605650 feat:添加版本 2024-07-03 15:22:52 +08:00
“DaisyWu”
2a4d0f1d86 Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release 2024-07-03 15:21:45 +08:00
“DaisyWu”
d10de9b3bc 修复开锁页-操作记录-卡、密码、指纹、人脸的增加和删除应有姓名,因锁记录里有编号问题 2024-07-03 15:21:34 +08:00
anfe
35496a0827 fix:修复删除密码/ 卡/指纹会偶尔出现无网络的问题 2024-07-03 15:19:41 +08:00
anfe
ea771f29c0 feat:添加版本 2024-07-03 09:12:34 +08:00
“DaisyWu”
30d8e8d525 1,预计产生短信条数,短信和邮件差异化处理
2,模板内容没有对应的,已参考通通锁修改
3,列表和点开详情,只有自己输入的内容已修改
2024-07-02 17:42:26 +08:00
“DaisyWu”
d4437f0ed9 新建短信模版、邮件模版修复名称应限制50位位数,可分3行全部显示出来,应不能重名问题 2024-07-02 14:03:25 +08:00
“DaisyWu”
b823b25199 补充提交 2024-07-02 11:38:08 +08:00
“DaisyWu”
3bd2a5e56a Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release
# Conflicts:
#	ios/Podfile.lock
2024-07-02 10:57:09 +08:00
“DaisyWu”
5e4256a766 1,统一短信、邮件、实名认证、高级功能模块中使用记录和购买记录实体类并根据类型显示数据
2,修复增值服务--邮件 使用记录:少了接收方账号和查询多久的备注问题
3,修复增值服务--短信 少了接收方账号、条数和查询多久的备注。记录进入有时不显示需下拉,下拉有英文提示问题
2024-07-02 10:56:33 +08:00
魏少阳
8ce45c56c8 Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-07-01 18:33:07 +08:00
魏少阳
3b9e2ea68c 修改TAPDbug 2024-07-01 18:33:03 +08:00
anfe
9031329f52 Merge branch 'release_hyx' into release 2024-07-01 18:31:49 +08:00
anfe
5a342d5715 fix:修复锁打开联网开锁的单次钥匙开锁提示异常,再次恢复网络后无法开锁 2024-07-01 18:31:15 +08:00
anfe
208dc9ff8a fix:修复锁列表和锁页面没有显示钥匙过期的时间状态提示 2024-07-01 17:46:33 +08:00
“DaisyWu”
89c7f57e2b 1,修复开锁页-操作记录-点进去后圈几圈的加载图标后(也有提示操作失败后)空白显示,手动刷新后才出现数据
2,修复我的页-增值服务-邮件 购买后进入,短信当前剩余数量会先显示0再跳到500,有时只显示0不跳转到数量 问题
3,修复我的页-增值服务-短信 购买后进入,短信当前剩余数量会先显示0再跳到500,有时只显示0不跳转到数量 问题
4,操作记录实体类更新 新增keyboardPwd字段
5,增值服务--短信、邮件请求方法逻辑顺序更改
2024-07-01 16:36:12 +08:00
anfe
1b97722657 fix:修复自定义消息刷新设备列表的问题 2024-07-01 16:30:59 +08:00
anfe
58fb182534 Merge branch 'master' into release 2024-06-26 09:42:27 +08:00
anfe
24479ffb8d feat:添加版本号 2024-06-26 09:40:27 +08:00
anfe
4765f36975 fix:修复打开 App 设备列表有加载页 2024-06-26 09:38:38 +08:00
魏少阳
1e9e350add Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-06-25 16:10:51 +08:00
魏少阳
539cef3ac4 修复指纹、卡、人脸,删除/重置之前校验是否有网络功能 2024-06-25 16:10:46 +08:00
anfe
15f98ca9bd feat: 添加版本号 2024-06-25 11:46:57 +08:00
魏少阳
51d4664d3c Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-06-25 11:35:25 +08:00
魏少阳
2384d326ea 添加指纹、卡、人脸、密码,删除/重置之前校验是否有网络功能 2024-06-25 11:35:20 +08:00
吴亚茜
00c1004c77 Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release 2024-06-25 10:44:32 +08:00
吴亚茜
8b9bbb012f 1,修复卸载后首次登录问题
2,完成Android端操作记录文件在线查看及分享功能
2024-06-25 10:44:26 +08:00
魏少阳
e18fa5c7e5 Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-06-25 10:02:37 +08:00
魏少阳
79b387b390 1、 在锁端操作“分组删除”后,不管删除那个分组。App 都显示删除所有用户应该区分删除的类型
2、开锁不在同步操作记录,在操作记录页同步(曹总提出)
3、 锁定系统锁定,App操作记录显示“手机用错误报警”,应该直接显示“错误报警”
2024-06-25 10:02:32 +08:00
anfe
90e7742c2e feat: 完善编译检测脚本,新增版本号控制接口逻辑 2024-06-24 18:31:37 +08:00
anfe
e56685be9c fix:修复 人脸修改姓名后回退到问题 2024-06-24 18:02:56 +08:00
anfe
3de600acda fix:修复 无网络状态可以点击设备删除,卡/密码/指纹等清除操作 2024-06-24 17:38:34 +08:00
anfe
103570a97b fix:修复 锁分组修改名字后没有侧滑按钮 2024-06-24 16:37:33 +08:00
anfe
d6c7115418 fix:修复 进入 App 会显示加载框的问题 2024-06-24 14:51:13 +08:00
anfe
571afae633 Merge branch 'release_hyx' into release 2024-06-24 14:28:57 +08:00
anfe
3ae670fbee fix:修复 android 无法分享文件的问题 2024-06-24 14:28:15 +08:00
吴亚茜
5cbb6b0fc1 Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release 2024-06-24 13:41:11 +08:00
吴亚茜
8a6bcd0871 修复xhj环境极光推送卸载,首次登录未绑定设备,导致无法接收推送问题 2024-06-24 13:41:01 +08:00
anfe
5b09b91c84 feat:完善加强 废弃 APi 的配置检测脚本 2024-06-24 11:53:36 +08:00
Daisy
7d55cc2159 Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release 2024-06-24 09:22:43 +08:00
Daisy
8800f4bebf 安卓查看导出记录及分享代码新增(有问题,需黄总协助) 2024-06-24 09:22:31 +08:00
魏少阳
97efbedfb1 Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-06-21 15:28:58 +08:00
魏少阳
1296f51e52 修复群发钥匙,发送进度bug 2024-06-21 15:28:53 +08:00
Daisy
8cfbb14602 Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release 2024-06-21 10:41:24 +08:00
Daisy
fd449954cf 1,新增下载导出记录相关逻辑
2,iOS端查看导出记录及系统分享文件完成
2024-06-21 10:41:11 +08:00
anfe
4ff86f33e2 Merge branch 'release_hyx' into release 2024-06-21 10:36:29 +08:00
anfe
0dd00b4250 feat:完成 废弃 api 检测脚本 2024-06-21 10:36:10 +08:00
魏少阳
56ddcb8498 Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-06-21 09:32:52 +08:00
魏少阳
4b2ebf5d85 添加群发电子钥匙进度功能,修改群发电子钥匙bug 2024-06-21 09:32:47 +08:00
Daisy
e86c6a8dc9 Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release 2024-06-21 09:28:30 +08:00
Daisy
356c671ae7 补充提交 2024-06-21 09:28:25 +08:00
Daisy
50f0cc554a 1,fix提测问题:操作记录部分bug
2,新增操作记录—查看导出记录页面
3,新增导出锁记录API对接
4,新增批量导出操作记录API对接
2024-06-21 09:15:38 +08:00
anfe
dc32db0ee7 Merge branch 'release_hyx' into release 2024-06-20 18:09:50 +08:00
anfe
60fd4f635d fix:修复限时密码的起始时间问题,修复设置页面上传数据后没有刷新 2024-06-20 18:09:24 +08:00
Daisy
b237d827ac 1,新增批量导出页面布局及逻辑
2,新增导出操作记录—选择锁页面
3,新增操作记录导出成功页面及相应分享调起
4,根据角色(超级管理员/授权管理员/普通用户)展示不同操作记录操作权限
2024-06-20 13:54:39 +08:00
Daisy
4cf9c99e5d Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release
# Conflicts:
#	images/lan/lan_en.json
#	images/lan/lan_keys.json
#	images/lan/lan_zh.json
解决冲突
2024-06-19 11:04:52 +08:00
Daisy
8725be3487 新增操作记录—导出记录Dialog相关UI及逻辑 2024-06-19 11:02:21 +08:00
anfe
f23e2390c5 fix:修复极光推送 ios 报错的问题 2024-06-18 17:51:17 +08:00
anfe
2f248c74b2 feat:补充私有化 2024-06-18 15:56:03 +08:00
anfe
55ca41e8b4 feat:修复锁详情页面报错,简化翻译单词 2024-06-18 15:49:59 +08:00
anfe
62c7ea2892 feat:添加版本号 2024-06-18 15:09:06 +08:00
anfe
178dbdb937 fix:修复登录时设备列表会显示无数据 2024-06-18 15:01:15 +08:00
anfe
e30530f3d5 Merge branch 'release_hyx' into release 2024-06-18 14:13:23 +08:00
anfe
17231d7ad7 feat:修复锁详情 ui报错 2024-06-18 14:12:08 +08:00
魏少阳
1b66698504 Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-06-18 10:36:46 +08:00
魏少阳
36b1729ee1 修改群发电子钥匙、锁用户管理、我的-授权管理员模块问题 2024-06-18 10:36:41 +08:00
Daisy
062c5c0397 Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release 2024-06-17 17:17:11 +08:00
Daisy
fa06dc6837 1,修复超级管理员用户改变锁设置,授权管理员和普通用户未更新问题
2,新增自定义消息--锁设置变更类型及相应逻辑处理
3,开锁页-设置-开锁时是否需联网 设置开关返回开锁页的标志未刷新。另授权和普通用户标志和使用没实时更新,会出现设置了不生效的情况。问题修复
4,修复bugID:ID1002246
2024-06-17 17:16:59 +08:00
anfe
f9cffeb49f feat:修改开锁页 ui 2024-06-17 15:52:21 +08:00
anfe
3238359c54 feat:处理代码合并错误 2024-06-17 14:29:13 +08:00
anfe
1681c86769 feat:领锁 接口改成 v2 2024-06-17 14:13:30 +08:00
anfe
a633205287 Merge branch 'release_hyx' into release 2024-06-17 11:13:50 +08:00
anfe
c3cc220729 feat:添加版本号 2024-06-17 10:52:06 +08:00
魏少阳
5de9d05914 Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release
# Conflicts:
#	images/lan/lan_en.json
#	images/lan/lan_keys.json
#	images/lan/lan_zh.json
#	lib/main/lockDetail/lockDetail/lockDetail_page.dart
#	lib/main/lockMian/entity/lockListInfo_entity.dart
2024-06-15 18:20:15 +08:00
魏少阳
7d93f2fbc4 修改群发电子钥匙问题 2024-06-15 18:09:20 +08:00
Daisy
58b898980b Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release 2024-06-15 17:21:08 +08:00
Daisy
738c9e19b4 1,操作记录完善部分缺失UI布局
2,新增操作记录读取记录功能
3,新增PopupMenuButton组件及公用弹窗
4,修复我的设置、锁设置—锁需联网标识 关联锁详情页面问题
2024-06-15 17:20:55 +08:00
anfe
787e2ef9ed fix:修复 ota 升级 2024-06-15 16:41:31 +08:00
anfe
5aa5ea9116 Merge branch 'release_hyx' into release 2024-06-15 15:17:05 +08:00
anfe
111897c7a7 feat:适配 ios 自定义推送 2024-06-15 15:14:50 +08:00
anfe
0c85af9d0f feat:接入自定义消息,完成锁列表状态改变和新增和删除 2024-06-15 13:35:23 +08:00
魏少阳
6bfa8cdb08 Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-06-14 15:46:49 +08:00
魏少阳
3ff1d01d19 添加转移锁功能,修复转移锁模块问题 2024-06-14 15:46:43 +08:00
Daisy
7b59e9056a dev环境下xhj布局高级功能vip状态更新检查完善 2024-06-14 10:03:22 +08:00
Daisy
9d6259cf4c xhj环境新增设置—微信公众号推送功能 2024-06-14 09:15:07 +08:00
Daisy
282bae9f7c xhj布局高级功能vip状态更新检查完善 2024-06-13 18:07:00 +08:00
Daisy
a524642a88 1,通过个人手机短信发送密码给用户,Android端差异化处理
2,授权管理员模块发送成功后,通过邮件、短信发送给用户
2024-06-13 17:35:14 +08:00
anfe
74393a3d64 feat:添加版本号 2024-06-13 10:10:48 +08:00
魏少阳
c3d6f208d7 Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-06-13 09:18:52 +08:00
anfe
0f8b8b1144 :wMerge branch 'release_hyx' into release 2024-06-13 09:16:36 +08:00
魏少阳
003b213ba8 Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-06-13 09:15:24 +08:00
anfe
f0b09950e1 feat:添加版本号 2024-06-13 09:14:44 +08:00
Daisy
44f3daf810 Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release 2024-06-13 09:12:58 +08:00
Daisy
177c32a9f4 密码、电子钥匙模块新增通过手机系统发送个人邮件、个人信息 2024-06-13 09:12:47 +08:00
魏少阳
aa8c8dacfa Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-06-13 09:12:44 +08:00
魏少阳
179af115cb 1、修复锁分组模块问题
2、修复电子钥匙、授权管理员、密码、卡、指纹、人脸名字过长不显示问题
3、修复App开锁时需手机连网的锁问题
2024-06-13 09:12:39 +08:00
anfe
8bf853e998 fix:修复增值服务无法购买的情况 2024-06-13 09:10:49 +08:00
anfe
2deeef6f7a merge:合并代码 2024-06-12 18:15:55 +08:00
anfe
abba31956d feat:设备升级版本号从锁版获取,优化整体逻辑。固件升级成功后更新后的版本 2024-06-12 18:13:13 +08:00
Daisy
4c9dd152ca 1,修复密码详情分享报错问题
2,完成密码模块系统邮件通知、短信通知发送的对接及兼容
2024-06-12 16:49:39 +08:00
Daisy
17b5a76d2d Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release 2024-06-12 13:54:10 +08:00
Daisy
cd44d44fb8 1,电子钥匙发送短信、邮件通知API对接及逻辑处理
2,电子钥匙模块发送系统短信、系统邮件通知对接及自测完成
2024-06-12 13:53:59 +08:00
魏少阳
3e04c0de5f Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-06-12 09:51:53 +08:00
魏少阳
f7d3ae59c9 修改自动闭锁问题,修改个人信息未绑定显示问题 2024-06-12 09:51:48 +08:00
Daisy
b3f0794f84 Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release 2024-06-11 17:55:05 +08:00
Daisy
e6592bf06b 1,新增邮件类型选择公用组件
2,新增获取电子钥匙通知模版API对接
3,完善电子钥匙发送成功后邮件通知相关页面及逻辑
4,根据后台返回电子钥匙类型显示短信、邮件通知
2024-06-11 17:55:00 +08:00
anfe
81166803d4 feat:升级版本 2024-06-11 15:50:45 +08:00
anfe
27ef3cdbb3 fix:修复 google 上架被拒问题:获取已安装应用列表,修复华为被拒问题:同意协议前获取设备信息 2024-06-11 15:48:02 +08:00
魏少阳
57a39ee3b6 Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-06-11 14:03:53 +08:00
魏少阳
3096eb41ef 1、修复开锁之后上传记录密码问题
2、跟陈智讨论数据上传问题,修复数据上传分页问题
3、修复更新锁电量问题
2024-06-11 14:03:48 +08:00
anfe
63a65cfdf4 eat:添加版本号 2024-06-11 10:35:43 +08:00
anfe
4aa056f8de fix:修复首次进入首页没有设备列表的问题 2024-06-11 10:34:44 +08:00
anfe
99b7a443ed fix:修复电量更新被忽略的 bus 2024-06-11 09:38:16 +08:00
anfe
4213ad2d86 Merge branch 'release_hyx' into release 2024-06-11 09:23:08 +08:00
anfe
e07ac18bd9 fix:修复微信支付调用 2024-06-11 09:22:36 +08:00
Daisy
c78c892a31 Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release 2024-06-07 15:58:29 +08:00
Daisy
8593088ab0 1,新增与后台约定code值弹出公用组件提示
2,修复开锁页-消息提醒-半自动锁和XHJ 的锁应没有有人出现在门口
2024-06-07 15:58:24 +08:00
Daisy
1b4a6aaee3 修复添加虹膜、添加手掌页面报错问题 2024-06-07 15:56:43 +08:00
anfe
6d19e44259 feat:添加版本号 2024-06-07 15:17:21 +08:00
anfe
aa9665610c Merge branch 'release_hyx' into release 2024-06-07 15:16:25 +08:00
anfe
de98d9270e fix:修复增值服务不出现的问题 2024-06-07 15:15:58 +08:00
魏少阳
a8c6cb5977 Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-06-07 15:14:57 +08:00
魏少阳
37480a1a02 添加考勤选择月份弹窗,修复修改密码名字报红问题,添加密码列表未生效状态 2024-06-07 15:14:52 +08:00
anfe
3467094050 feat:添加版本号 2024-06-07 11:39:58 +08:00
anfe
3e6868c395 fix:修复首页未加载的问题 2024-06-07 11:39:08 +08:00
anfe
33fd29d81d Merge branch 'release_hyx' into release 2024-06-07 11:21:26 +08:00
anfe
bc62d026c9 feat:添加版本号 2024-06-07 11:20:24 +08:00
Daisy
71f7d3a3b2 Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release 2024-06-07 11:16:32 +08:00
Daisy
a07fcb95a5 修复电子钥匙/授权管理员发送或修改实名认证流程问题 2024-06-07 11:16:20 +08:00
anfe
6759c5ff0a Merge branch 'release_hyx' into release 2024-06-07 11:13:08 +08:00
anfe
ed12b39f5b feat:调通微信支付 2024-06-07 11:12:45 +08:00
魏少阳
8f63629e4a Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release
# Conflicts:
#	images/lan/lan_en.json
#	images/lan/lan_keys.json
#	images/lan/lan_zh.json
2024-06-07 10:55:11 +08:00
魏少阳
87bbce3d9f 删除文件 2024-06-07 10:53:36 +08:00
魏少阳
fe7cb98cf9 1、修改关于时间的3点讨论结果
a,领锁,点击+号时,如果获取网络时间失败,不进入下一页,提示必须联网
b. 开锁时:有网络时间则同步,无网络则不同步时间
c. 同步时间功能:必须有网才同步时间,确定和通通锁不一致
2、修改登录、注册、修改密码选择跟当前ip不是用一个国家的时候,弹窗提示
2024-06-07 10:53:24 +08:00
anfe
e7d5fa9f13 merge:合并代码 2024-06-06 17:43:46 +08:00
anfe
d5853eaace fix:修复群发所钥匙的添加解锁者逻辑,无法添加,无法第一个删除,删除按钮点击不灵敏。输入手机号或邮箱格式识别 2024-06-06 17:42:03 +08:00
Daisy
425a68843e 1,修复IOSAPP上有显示数字,并不是未读消息的数量
2,修改设备页-设置-重置键备注文本
2024-06-06 15:56:23 +08:00
Daisy
4fa11a4a0a Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release 2024-06-06 13:58:35 +08:00
Daisy
7d01b9a056 1,新建邮件模版(电子钥匙、密码)API对接及兼容短信模版
2,删除邮件模版API对接及对应逻辑处理
3,新增计算短信条数函数及更新布局
2024-06-06 13:58:21 +08:00
anfe
7f0087d153 feat:搜索模式,判断设备被重置的时候重置设备缓存列表 2024-06-06 11:28:02 +08:00
anfe
023067cdc0 Merge branch 'release_hyx' into release 2024-06-06 09:58:13 +08:00
anfe
5e40916e56 feat:主动引导用户开启推送设置 2024-06-06 09:57:36 +08:00
魏少阳
b86fef2b55 Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-06-05 18:40:40 +08:00
魏少阳
a0f819285c 1、指纹卡密码人脸列表等搜索的时候,底部按钮不随着键盘弹起而弹起。2、我的里面App开锁时需手机连网的锁问题 2024-06-05 18:40:35 +08:00
anfe
1e1ebd22be Merge branch 'release_hyx' into release 2024-06-05 18:38:24 +08:00
anfe
ce46917c48 fix:修复 test文件报错 2024-06-05 18:38:03 +08:00
Daisy
fe5b3089a3 Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release 2024-06-05 18:25:05 +08:00
Daisy
9158ce71e7 1,新增获取邮件模版列表API对接及逻辑处理
2,新增获取默认邮件模版(电子钥匙、密码类型)API对接
2024-06-05 18:24:59 +08:00
anfe
5f190aa587 fix:修复 上传电池后,其他页面的电池没有试试刷新 2024-06-05 17:36:46 +08:00
魏少阳
c53a60a95a Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-06-05 16:38:48 +08:00
魏少阳
25f4159706 修改卡、指纹、人脸、密码修改完锁详情内容之后,再修改日期,第一次修改内容重置的问题 2024-06-05 16:38:43 +08:00
anfe
eb650460ad fix:修复 华为隐私的问题,修复设备列表报错 2024-06-05 16:13:56 +08:00
魏少阳
9c8f722710 Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-06-05 14:36:35 +08:00
魏少阳
436ee3d50f 1、修改锁分组bug。2、修改群发电子钥匙问题 2024-06-05 14:36:31 +08:00
anfe
0a99c6663d Merge branch 'release_hyx' into release 2024-06-05 14:21:50 +08:00
anfe
53408ad526 fix:修复 华为隐私的问题,修改首次跳转登录或者主页的逻辑防止getAppInfo接口多次调用 2024-06-05 14:21:14 +08:00
Daisy
9ed5160617 Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release 2024-06-05 11:02:36 +08:00
Daisy
5caa8a598f 1,自定义SMS模版页面新增上拉加载下拉刷新
2,新增删除模版API对接及逻辑处理
2024-06-05 11:02:26 +08:00
魏少阳
54db74b4ba Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-06-05 09:30:09 +08:00
魏少阳
c69295d432 1、修改获取私钥上传时间为UTC时间。2、修复群发钥匙问题。3、考勤员工问题 2024-06-05 09:30:04 +08:00
anfe
3035a53ff7 fix:修复 添加没有默认是设置多长时间,初始化前锁上设的什么时间在添加后就显示这个时间。如是关闭的再添加显示为0秒,打开进入界面异常 2024-06-04 18:32:36 +08:00
anfe
7d6b080573 Merge branch 'release_hyx' into release 2024-06-04 18:14:48 +08:00
anfe
110bdc0aac feat:注册后将直接登录 2024-06-04 18:14:18 +08:00
Daisy
efd475394d Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release 2024-06-04 18:09:49 +08:00
Daisy
2df1d2dacc 新增更新模版信息接口对接且兼容新建模版逻辑 2024-06-04 18:09:38 +08:00
anfe
a515433345 fix:修复删除密码/卡/指纹/管理员/不会消失的问题 2024-06-04 18:05:33 +08:00
anfe
9174935452 fix:修复设备列表显示异常的问题,补充代码 2024-06-04 16:50:08 +08:00
anfe
0593da7598 fix:修复设备列表显示异常的问题 2024-06-04 16:38:23 +08:00
anfe
46caa46338 fix:修复分享的 url 2024-06-04 15:48:39 +08:00
anfe
f44c86a512 fix:修复删除设备,设备列表没有刷新 2024-06-04 15:09:22 +08:00
anfe
f1fd311bf5 Merge branch 'release_hyx' into release 2024-06-04 14:57:38 +08:00
anfe
5d689749d1 fix:修复版本号,并且修复发送钥匙的 bug 2024-06-04 14:57:18 +08:00
Daisy
088331a847 Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release
# Conflicts:
#	images/lan/lan_en.json
#	images/lan/lan_keys.json
#	images/lan/lan_zh.json
#	lib/network/api.dart
解决冲突
2024-06-04 14:47:05 +08:00
Daisy
caf62a7413 1,新增自定义短信模版列表接口对接
2,新增获取默认短信模版接口对接及相应逻辑处理
3,新增电子钥匙、密码模版相关逻辑及布局处理
4,新增添加短信模版(电子钥匙、密码)接口对接
5,修复新建短信模版点击报错不能展示问题
2024-06-04 14:44:04 +08:00
anfe
bd2f9fa4ac fix:修复发送钥匙页面,缺少短信通知,邮箱通知,微信通知的问题 2024-06-04 14:29:51 +08:00
anfe
b5836fb683 Merge branch 'release_hyx' into release 2024-06-04 09:30:26 +08:00
anfe
c31c771ee9 feat:添加版本号 2024-06-04 09:29:55 +08:00
魏少阳
2610e4fea0 取消flutter_image_compress插件 2024-06-04 09:24:58 +08:00
魏少阳
bc440ec377 1、修改上传锁时间、更新电量上传UTC时间问题。2、修改拍照头像上传比较慢问题 2024-06-04 09:16:32 +08:00
魏少阳
0e38550b94 修改拍照头像上传慢的问题 2024-06-04 09:16:32 +08:00
anfe
0fe024bc9f fix:修复消息列表页没有红点显示 2024-06-04 09:12:41 +08:00
anfe
5baa5830ac fix:开锁页-电子钥匙、授权管理员 输入姓名30位,通通锁50位。另在详情页姓名显示不全,通通锁会显示3行 2024-06-03 18:04:11 +08:00
anfe
4f75d1a43a feat: xhj 设备列表 添加搜索功能 2024-06-03 17:26:32 +08:00
anfe
f9fdb1b6ce fix:修复锁设备名字过长的问题 2024-06-03 16:11:49 +08:00
anfe
22d6388bff fix:修复闭锁时,提示语一直闪动 2024-06-03 15:27:15 +08:00
anfe
1c36f11194 merge:合并代码 2024-06-03 14:54:20 +08:00
anfe
ae0fcafb9e fix:修复卡/指纹/密码/授权管理员列表修改名字后不更新的问题 2024-06-03 14:49:29 +08:00
魏少阳
8381506bdd Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release
# Conflicts:
#	lib/login/register/starLock_register_logic.dart
#	lib/login/register/starLock_register_page.dart
#	lib/login/register/starLock_register_state.dart
#	lib/main/lockDetail/face/faceDetail/faceDetail_logic.dart
#	lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart
#	lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart
2024-06-03 14:00:23 +08:00
魏少阳
7aa487038c 1、修改循环 23:00~24:00 不能开锁问题。2、修改TAPD问题 2024-06-03 13:50:07 +08:00
Daisy
6114044991 修复xhj布局下增值服务购买后状态未刷新不能使用问题 2024-06-03 11:34:04 +08:00
anfe
0d51c46393 Merge branch 'release_hyx' into release 2024-06-01 17:45:38 +08:00
anfe
29e8793729 fix:修复首页设备列表无网络状态下进入没有出现缓存数据 2024-06-01 17:45:14 +08:00
Daisy
778fcffe1d fix提测问题: 卡/密码/指纹 列表超过 20 条删除单条后下拉卡顿问题 2024-06-01 17:29:41 +08:00
anfe
1d5c745454 Merge branch 'release_hyx' into release 2024-06-01 17:26:18 +08:00
anfe
d5db2db672 feat:完成循环日期大写 2024-06-01 17:25:55 +08:00
Daisy
87d6655849 修复xhj的release模式下不能进入设备详情页 2024-06-01 16:33:24 +08:00
Daisy
487ff04a8d Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release 2024-06-01 14:10:17 +08:00
Daisy
af155c80c5 fix提测问题:锁设置-开锁提醒无法设置 2024-06-01 14:10:01 +08:00
anfe
443ea7731b fix: 将极光推送分开 2024-06-01 13:35:03 +08:00
Daisy
ba0b9c0fab 1,锁详情页面新增手机需联网字段及标识
2,xhj锁详情页面部分调整
2024-05-31 15:10:57 +08:00
anfe
5127456bad Merge branch 'release_hyx' into release 2024-05-31 14:29:24 +08:00
anfe
1be9cfab22 feat:完成云 OTA 升级 2024-05-31 14:28:52 +08:00
Daisy
457999f15d Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release 2024-05-31 14:11:35 +08:00
Daisy
fd4dab3e2e 1,新增获取设备信息的公用方法
2,用户登录新增入参:设备信息
3,注册接口新增入参:设备信息
2024-05-31 14:11:16 +08:00
魏少阳
ad91e4d17a Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-05-31 11:43:16 +08:00
魏少阳
a4ccb32cf2 修改TAPDbug 2024-05-31 11:43:11 +08:00
Daisy
0a9aeb2027 Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release 2024-05-30 18:22:44 +08:00
Daisy
e2c5066bec 1,新增短信/邮件购买记录、使用记录接口对接
2,修改发送电子钥匙报错问题
2024-05-30 18:22:31 +08:00
anfe
f2e439b3be fix:修复 sky 布局不显示客服按钮 2024-05-30 18:12:15 +08:00
anfe
c0faa26c44 fix:修复错别字 2024-05-30 17:55:23 +08:00
anfe
8d149ef4b3 feat:为了上架,新增客服功能 2024-05-30 17:43:09 +08:00
anfe
dafb40954a fix:修复无网络下点击开锁会报错 2024-05-30 15:31:14 +08:00
anfe
26792c6c7f feat:消息页面添加全部清除功能 2024-05-30 15:02:15 +08:00
anfe
23ccd71b06 feat:添加版本号 2024-05-30 14:07:09 +08:00
魏少阳
a04f3523df Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-05-30 13:37:25 +08:00
魏少阳
c8dc3b3d47 1、修复从锁设置进入数据上传界面弹框问题
2、修复卡指纹胁迫数据错误问题
2024-05-30 13:37:20 +08:00
Daisy
958ebb4c2d xhj修改增值服务顺序 2024-05-30 12:00:11 +08:00
Daisy
7c03f48511 Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release 2024-05-30 11:53:36 +08:00
Daisy
ad8eda0345 1,新增增值服务相关网页购买统一处理
2,新增短信余量接口、购买流程对接逻辑
3,新增邮件余量接口、购买流程对接逻辑
2024-05-30 11:53:25 +08:00
anfe
67be602754 feat:添加版本号 2024-05-30 10:51:42 +08:00
anfe
8ced06c9ba Merge branch 'release_hyx' into release 2024-05-30 10:10:53 +08:00
anfe
4bc5c46a60 feat:修改鑫锁为 星星锁 2024-05-30 10:10:22 +08:00
anfe
34cbccbd42 fix:修复 ios 无法编译的问题 2024-05-30 10:09:20 +08:00
魏少阳
ed442e1792 Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-05-30 09:27:34 +08:00
魏少阳
6daf8a45f0 升级flutter版本3.19.6 2024-05-30 09:27:29 +08:00
Daisy
23fe07c920 Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release 2024-05-29 17:32:06 +08:00
Daisy
6db55c8e37 极光推送方法拆分 2024-05-29 17:31:55 +08:00
anfe
3bd902b670 Merge branch 'release_hyx' into release 2024-05-29 15:29:56 +08:00
anfe
7678b8989c fix:修复 android 蓝牙不稳定的情况 2024-05-29 15:29:24 +08:00
魏少阳
19221dc666 Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-05-29 14:31:47 +08:00
魏少阳
c0ff6200fc 1、添加重置密码前校验接口能否调用成功功能
2、修改卡胁迫问题
2024-05-29 14:31:38 +08:00
Daisy
cd2686d1d6 Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release 2024-05-29 14:13:10 +08:00
Daisy
0d22a42796 1,修复webview_flutter版本过高导致的安卓项目无法运行问题
2,xhj集成OPPO厂商通道远程推送并配置相关(自测通过)
3,修改增值服务-实名认证问题
2024-05-29 14:12:44 +08:00
anfe
00cb5befc1 feat:提交版本号 2024-05-29 11:55:15 +08:00
魏少阳
ad29462882 Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release
# Conflicts:
#	lib/appRouters.dart
#	lib/main/lockDetail/lockSet/lockSet/lockSet_logic.dart
2024-05-29 09:14:15 +08:00
魏少阳
df75462647 1、添加上传锁设置功能。2、添加我的设置-锁用户管理-即将到期-电子钥匙、密码、卡、指纹、人脸的修改跟删除功能 2024-05-29 09:06:26 +08:00
anfe
ca9011a598 fix:修复xhj删除锁的时候, 无法跳转页面 2024-05-28 18:23:20 +08:00
anfe
24b1b0c3e5 fix:修复鑫泓佳列表页设备名字显示不全的问题 2024-05-28 18:14:06 +08:00
anfe
3225f8fb30 feat:新增版本好,上架提审包 2024-05-28 17:50:37 +08:00
anfe
962cd839f2 fix:修复 开锁页-右上角-电池电量图标一个电池的显示2块电池图标。另点!无反应,应有电量更新显示 2024-05-28 17:45:59 +08:00
anfe
fea93bdf1e fix:去除 xhj 首页列表白边 2024-05-28 17:36:48 +08:00
anfe
fbd1adf4e1 fix:修改 xhj 布局(我的,设置页),修复实名认证 bug 2024-05-28 17:26:02 +08:00
Daisy
8df9c7e0ef Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release 2024-05-28 15:00:07 +08:00
Daisy
b5de86d288 1,新增华为厂商通道配置
2,修改厂商SDK版本
2024-05-28 14:59:52 +08:00
anfe
0ec92eaad0 feat:优化蓝牙工具,android 低配手机新增保底逻辑 2024-05-28 14:58:01 +08:00
Daisy
855ce1fb18 Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release
# Conflicts:
#	android/app/build.gradle
解决冲突
2024-05-28 10:43:43 +08:00
Daisy
5dff718830 华为厂商推送SDK版本号更改 2024-05-28 10:42:34 +08:00
anfe
e33735126a feat:修改 默认布局为 xhj 布局 2024-05-28 10:40:17 +08:00
anfe
57b3621769 feat:修改 xhj 环境配置 2024-05-28 10:07:13 +08:00
anfe
419405946c feat:提交环境 2024-05-28 09:56:40 +08:00
Daisy
f6b50d5514 华为厂商通道版本号更改 2024-05-28 09:48:40 +08:00
anfe
bb1ef339bf feat:添加版本号 2024-05-27 17:44:49 +08:00
anfe
a085a0d7f7 Merge branch 'release_hyx' into release 2024-05-27 17:43:55 +08:00
Daisy
40bd9c3612 1,鑫泓佳iOS端集成极光推送(已自测)
2,鑫泓佳Android端集成极光推送(厂商通道未完成)
3,fix提测问题:密码超过二十个刷新、加载会覆盖问题
2024-05-27 17:41:01 +08:00
anfe
6c897b8f3b feat:优化 android 首次蓝牙策略 2024-05-27 17:38:23 +08:00
anfe
bc08c31a64 feat:修改 xhj 电池的判断 2024-05-24 15:44:03 +08:00
anfe
611a1e06fd feat:添加版本好,修改 xhj 的环境改成预发布 2024-05-24 13:49:51 +08:00
Daisy
199a475f57 修复锁用户列表不能搜索重复问题 2024-05-24 11:34:26 +08:00
魏少阳
9bce7316b9 Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-05-24 10:59:53 +08:00
魏少阳
408a077211 修改测试部门提出的问题 2024-05-24 10:59:48 +08:00
Daisy
cb53450d10 修复锁用户列表不能搜索问题 2024-05-24 10:24:09 +08:00
anfe
7c58c482e4 fix:修复 xhj 开锁按钮显示异常的问题 2024-05-24 09:39:00 +08:00
anfe
903b19700e feat:添加注释 2024-05-23 18:43:41 +08:00
anfe
a937d0a68b feat:新增首次配锁后,静止开锁页面 2 秒防止锁设备未修改完成状态 2024-05-23 18:38:02 +08:00
anfe
a097f882e2 fix:修复 开锁会有时候一直执行动画的问题 2024-05-23 18:10:34 +08:00
Daisy
ffd709a1ae 1,锁设置--开锁提醒接口字段修改
2,购买记录页面bug修改
3,添加指纹/卡/人脸模块限时类型添加时间数据不同步问题修改
2024-05-23 17:14:43 +08:00
Daisy
3feba32a08 fix提测问题:指纹添加成功后,指纹图标异常问题 2024-05-23 14:39:21 +08:00
anfe
ea23b0657d Merge branch 'release_hyx' into release 2024-05-23 13:50:28 +08:00
anfe
2246f448a2 fix:修复 考勤 服务器的用户默认头像显示报错的问题 2024-05-23 13:49:57 +08:00
魏少阳
d0174fdf3e Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release 2024-05-23 10:51:38 +08:00
魏少阳
a8c57cc5b0 Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release
# Conflicts:
#	lib/main/lockMian/lockList/lockList_page.dart
#	lib/network/api.dart
#	lib/network/api_provider.dart
#	lib/network/api_repository.dart
2024-05-23 10:51:32 +08:00
Daisy
5f676340dd 1,解决胁迫指纹—指纹列表不能搜索问题
2,修复群发钥匙-接收者 点通讯录无反应问题
2024-05-23 10:39:07 +08:00
魏少阳
30dfff4170 添加锁数据上传功能,修改TAPD功能 2024-05-23 10:35:06 +08:00
Daisy
204cd370d8 Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release 2024-05-22 17:49:40 +08:00
Daisy
dd8d56c012 1,我的设置--授权管理员关联的锁接口对接
2,没有锁也可开通高级功能权限放开
3,修复N天未开门通知页面默认天数报错问题
2024-05-22 17:49:34 +08:00
anfe
a914df7c1b fix:修复首次进入列表不显示锁的问题 2024-05-22 17:38:42 +08:00
anfe
2c3a744a14 fix:修复 锁列表修改设备后无法滑动的问题 2024-05-22 17:19:38 +08:00
anfe
7bc4d7c02c Merge branch 'release_hyx' into release 2024-05-22 15:24:09 +08:00
anfe
9a56b0ae1d fix:修复 批量授权锁 发送完应没有短信、邮件、微信通知,应直接提示操作成功 2024-05-22 15:23:44 +08:00
Daisy
15dd47d2f0 Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release
# Conflicts:
#	lib/network/api.dart
冲突合并
2024-05-22 15:19:05 +08:00
Daisy
b84c448d5e 1,新增我的设置--授权管理员关联锁列表页面
2,获取授权管理员下锁列表接口对接
2024-05-22 15:17:25 +08:00
anfe
25598cd270 feat:修改批量添加管理员完成按钮列表 2024-05-22 14:40:07 +08:00
anfe
624a43fde2 feat:恢复 http 日志打印 2024-05-22 14:07:42 +08:00
1536 changed files with 156878 additions and 42022 deletions

BIN
.DS_Store vendored

Binary file not shown.

251
.gitea/workflows/ci.yml Normal file
View File

@ -0,0 +1,251 @@
name: Flutter CI - Basic Setup
on:
push:
branches:
- master_sky
pull_request:
branches:
- master_sky
jobs:
# 基础设置任务:检出代码、提取版本号
basic-setup:
name: 🔧 Basic Setup
runs-on: sky
steps:
# 1. 检出代码
- name: Checkout Code
uses: actions/checkout@v4
with:
fetch-depth: 1
# 2. 提取版本号
- name: Extract Version
id: version
run: |
# 获取最新的tag按版本号排序匹配vX.X.X_sky格式
LATEST_TAG=$(git tag --list "v*.*.*_sky" --sort=-version:refname | head -1)
# 如果没有找到tag使用默认值
if [ -z "$LATEST_TAG" ]; then
LATEST_TAG="v1.0.0_sky"
echo "📌 No tags found, using default: $LATEST_TAG"
else
echo "📌 Latest tag found: $LATEST_TAG"
fi
# 提取基础版本号去除_sky后缀
BASE_VERSION=$(echo "$LATEST_TAG" | grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+' | head -1)
[ -z "$BASE_VERSION" ] && BASE_VERSION="v1.0.0"
echo "📌 Base version: $BASE_VERSION"
# 解析版本号各部分
MAJOR=$(echo $BASE_VERSION | cut -d'.' -f1 | sed 's/v//')
MINOR=$(echo $BASE_VERSION | cut -d'.' -f2)
PATCH=$(echo $BASE_VERSION | cut -d'.' -f3)
echo "📌 Version components: Major=$MAJOR, Minor=$MINOR, Patch=$PATCH"
# 计算下一个版本号
echo "📊 Calculating next version..."
# 获取当前提交与最新tag之间的所有提交消息
COMMIT_MESSAGES=$(git log --oneline --format=%s $LATEST_TAG..HEAD 2>/dev/null || echo "")
# 统计需要递增的提交次数(过滤重复的提交消息)
INCREMENT_COUNT=0
if [ -n "$COMMIT_MESSAGES" ]; then
# 使用awk过滤重复的提交消息并计数
UNIQUE_MESSAGES=$(echo "$COMMIT_MESSAGES" | awk '!seen[$0]++')
INCREMENT_COUNT=$(echo "$UNIQUE_MESSAGES" | wc -l)
echo "📝 Found $INCREMENT_COUNT unique commit(s) since last tag"
else
echo "📝 No new commits since last tag"
fi
# 计算新的版本号
NEW_PATCH=$((PATCH + INCREMENT_COUNT))
NEW_MINOR=$MINOR
NEW_MAJOR=$MAJOR
# 处理版本号进位逻辑
if [ $NEW_PATCH -ge 1000 ]; then
NEW_MINOR=$((NEW_MINOR + NEW_PATCH / 1000))
NEW_PATCH=$((NEW_PATCH % 1000))
echo "🔄 Patch version overflow, incrementing minor version"
fi
if [ $NEW_MINOR -ge 10 ]; then
NEW_MAJOR=$((NEW_MAJOR + NEW_MINOR / 10))
NEW_MINOR=$((NEW_MINOR % 10))
echo "🔄 Minor version overflow, incrementing major version"
fi
# 生成下一个版本号
NEXT_VERSION="v${NEW_MAJOR}.${NEW_MINOR}.${NEW_PATCH}"
NEXT_TAG="${NEXT_VERSION}_sky"
echo "🚀 Next version: $NEXT_VERSION"
echo "🏷️ Next tag: $NEXT_TAG"
echo "📈 Increment count: $INCREMENT_COUNT"
# 设置输出变量供后续任务使用Gitea Actions格式
echo "NEXT_VERSION=$NEXT_VERSION" >> $GITEA_OUTPUT
echo "NEXT_TAG=$NEXT_TAG" >> $GITEA_OUTPUT
echo "INCREMENT_COUNT=$INCREMENT_COUNT" >> $GITEA_OUTPUT
# 输出版本信息
echo "✅ Version extraction completed"
# 5. 任务完成通知
- name: Task Completion
run: |
echo "🎉 Basic CI setup completed successfully!"
echo ""
echo "📋 Tasks executed:"
echo " ✅ Code checkout"
echo " ✅ Version extraction"
echo ""
echo "🚀 Next steps: Building Flutter artifacts..."
# 构建Flutter制品任务
build-artifacts:
name: 🏗️ Build Flutter Artifacts
runs-on: sky
needs: basic-setup
steps:
# 1. 检出代码
- name: Checkout Code
uses: actions/checkout@v4
with:
fetch-depth: 1
# 4. 构建APK文件
- name: Build APK
run: |
echo "🏗️ Building APK artifact..."
# 生成当前时间作为build-number格式YYYYMMDDHH
BUILD_NUMBER=$(date +%Y%m%d%H)
echo "📅 Build number: $BUILD_NUMBER"
# 获取版本信息从basic-setup任务传递
echo "🔍 Getting version info from basic-setup job..."
# 设置默认版本号,如果环境变量为空
if [ -z "${{ needs.basic-setup.outputs.NEXT_VERSION }}" ]; then
VERSION_FOR_FILENAME="1-0-0"
echo "⚠️ Version not found, using default: $VERSION_FOR_FILENAME"
else
# 格式化版本号用于文件名
VERSION_FOR_FILENAME=$(echo "${{ needs.basic-setup.outputs.NEXT_VERSION }}" | sed 's/v//g' | sed 's/\./-/g')
echo "✅ Version found: $VERSION_FOR_FILENAME"
fi
# 设置APK文件名
APK_FILENAME="sky-star-lock-release-$VERSION_FOR_FILENAME.apk"
echo "📁 APK filename: $APK_FILENAME"
# 构建APK使用新的构建参数
flutter build apk --no-tree-shake-icons --release --flavor sky -t lib/main_sky_full.dart --build-number=$BUILD_NUMBER --build-name="sky-star-lock-release-$VERSION_FOR_FILENAME.apk"
# 重命名APK文件
mv build/app/outputs/flutter-apk/app-sky-release.apk "$APK_FILENAME"
echo "✅ APK build completed: $APK_FILENAME"
# 5. 构建AAB文件
- name: Build AAB
run: |
echo "🏗️ Building AAB artifact..."
# 生成当前时间作为build-number格式YYYYMMDDHH
BUILD_NUMBER=$(date +%Y%m%d%H)
echo "📅 Build number: $BUILD_NUMBER"
# 获取版本信息从basic-setup任务传递
echo "🔍 Getting version info from basic-setup job..."
# 设置默认版本号,如果环境变量为空
if [ -z "${{ needs.basic-setup.outputs.NEXT_VERSION }}" ]; then
VERSION_FOR_FILENAME="1-0-0"
echo "⚠️ Version not found, using default: $VERSION_FOR_FILENAME"
else
# 格式化版本号用于文件名
VERSION_FOR_FILENAME=$(echo "${{ needs.basic-setup.outputs.NEXT_VERSION }}" | sed 's/v//g' | sed 's/\./-/g')
echo "✅ Version found: $VERSION_FOR_FILENAME"
fi
# 设置AAB文件名
AAB_FILENAME="sky-star-lock-release-$VERSION_FOR_FILENAME.aab"
echo "📁 AAB filename: $AAB_FILENAME"
# 构建AAB使用新的构建参数
flutter build appbundle --no-tree-shake-icons --release --flavor sky -t lib/main_sky_full.dart --build-number=$BUILD_NUMBER --build-name="sky-star-lock-release-$VERSION_FOR_FILENAME.aab"
# 重命名AAB文件
mv build/app/outputs/bundle/skyRelease/app-sky-release.aab "$AAB_FILENAME"
echo "✅ AAB build completed: $AAB_FILENAME"
# 6. 构建iOS IPA文件如果支持iOS构建
- name: Build iOS IPA
if: runner.os == 'macos'
run: |
echo "🏗️ Building iOS IPA artifact..."
# 生成当前时间作为build-number格式YYYYMMDDHH
BUILD_NUMBER=$(date +%Y%m%d%H)
echo "📅 Build number: $BUILD_NUMBER"
# 获取版本信息从basic-setup任务传递
echo "🔍 Getting version info from basic-setup job..."
# 设置默认版本号,如果环境变量为空
if [ -z "${{ needs.basic-setup.outputs.NEXT_VERSION }}" ]; then
VERSION_FOR_FILENAME="1-0-0"
echo "⚠️ Version not found, using default: $VERSION_FOR_FILENAME"
else
# 格式化版本号用于文件名
VERSION_FOR_FILENAME=$(echo "${{ needs.basic-setup.outputs.NEXT_VERSION }}" | sed 's/v//g' | sed 's/\./-/g')
echo "✅ Version found: $VERSION_FOR_FILENAME"
fi
# 设置IPA文件名
IPA_FILENAME="sky-star-lock-release-$VERSION_FOR_FILENAME.ipa"
echo "📁 IPA filename: $IPA_FILENAME"
# 配置iOS自动签名CI环境使用自动签名
echo "🔧 Configuring iOS automatic code signing for CI environment..."
# 构建iOS IPA使用自动签名模式
flutter build ipa --no-tree-shake-icons --release --flavor sky -t lib/main_sky_full.dart --build-number=$BUILD_NUMBER --build-name="sky-star-lock-release-$VERSION_FOR_FILENAME.ipa" --codesign
# 重命名IPA文件
mv build/ios/ipa/*.ipa "$IPA_FILENAME"
echo "✅ iOS IPA build completed: $IPA_FILENAME"
# 7. 上传制品
- name: Upload Artifacts
uses: actions/upload-artifact@v4
with:
name: flutter-artifacts-release
path: |
sky-star-lock-release-*.apk
sky-star-lock-release-*.aab
sky-star-lock-release-*.ipa
retention-days: 30
# 8. 构建完成通知
- name: Build Completion
run: |
echo "🎉 Flutter artifacts build completed successfully!"
echo ""
echo "📦 Artifacts generated:"
echo " ✅ APK: sky-star-lock-release-*.apk"
echo " ✅ AAB: sky-star-lock-release-*.aab"
if [ "${{ runner.os }}" == "macos" ]; then
echo " ✅ IPA: sky-star-lock-release-*.ipa"
fi
echo ""
echo "🏷️ Version: ${{ needs.basic-setup.outputs.NEXT_VERSION }}"
echo "📁 Files available in artifacts section"

4
.gitignore vendored
View File

@ -35,7 +35,6 @@
*.lock
# Web related
lib/generated_plugin_registrant.dart
# Symbolication related
app.*.symbols
@ -58,10 +57,9 @@ flutter_plugins/*/example/ios/Flutter/flutter_export_environment.sh
/flutter_plugins/flutter_html-2.1.5/example/ios/Runner/GeneratedPluginRegistrant.h
/flutter_plugins/flutter_html-2.1.5/example/ios/Runner/GeneratedPluginRegistrant.m
/flutter_plugins/flutter_html-2.1.5/example/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java
/flutter_plugins/flutter_html-2.1.5/example/lib/generated_plugin_registrant.dart
https://build_sh.sh
ios/Runner.app.dSYM.zip
ios/Runner.ipa
# 忽略打包生成的文件
script/gen/*
script/gen/*

218
.gitlab-ci.yml Normal file
View File

@ -0,0 +1,218 @@
stages:
- test
- generate_tag_or_version
- build-artifacts
- release-artifacts
- notification
- clean-up
variables:
LC_ALL: "en_US.UTF-8"
LANG: "en_US.UTF-8"
.build_rule:
tags:
- macos
- flutter
rules:
- if: $CI_COMMIT_BRANCH == "develop_sky"
- if: $CI_COMMIT_BRANCH == "release_sky"
- if: $CI_COMMIT_BRANCH =~ /feat_[a-zA-Z]+/
- if: $CI_COMMIT_BRANCH == "canary_release_sky"
- if: $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z]+\.[0-9]+)?(_sky)?$/
.notify_rule:
tags:
- macos
- flutter
rules:
- if: $CI_COMMIT_BRANCH == "develop_sky"
- if: $CI_COMMIT_BRANCH == "release_sky"
- if: $CI_COMMIT_BRANCH =~ /feat_[a-zA-Z]+/
.generate_tag_rule:
tags:
- macos
- flutter
rules:
- if: $CI_COMMIT_BRANCH == "master_sky"
.generate_next_version_rule:
tags:
- macos
- flutter
rules:
- if: $CI_COMMIT_BRANCH == "develop_sky"
- if: $CI_COMMIT_BRANCH == "release_sky"
- if: $CI_COMMIT_BRANCH == "canary_release_sky"
- if: $CI_COMMIT_BRANCH =~ /feat_[a-zA-Z]+/
.print_env:
stage: test
extends: .build_rule
before_script:
- java --version
- printenv | while IFS='=' read -r key value; do echo "$key=$value"; done
after_script:
- echo "finished"
.setup_fastlane_android:
extends: .build_rule
before_script:
- export PUB_HOSTED_URL=https://pub.flutter-io.cn
- export FLUTTER_STORAGE_BASE_URL=https://storage.flutter-io.cn
- ls -li
- export NEXT_VERSION="$(cat app_new.version)"
# - flutter pub get
- export PATH="/opt/homebrew/bin:$PATH"
- eval "$(rbenv init -)"
- rbenv global 2.6.10 # 你实际用的 Ruby 版本
- ruby -v
- which ruby
- gem env
- bundle config mirror.https://rubygems.org https://mirrors.aliyun.com/rubygems/
- bundle install --gemfile android/Gemfile --path vendor/bundle_android --quiet
- flutter clean
cache:
paths:
- app_new.version
.setup_fastlane_ios:
extends: .build_rule
before_script:
- export PUB_HOSTED_URL=https://pub.flutter-io.cn
- export FLUTTER_STORAGE_BASE_URL=https://storage.flutter-io.cn
- ls -li
- export NEXT_VERSION="$(cat app_new.version)"
- export PATH="/opt/homebrew/bin:$PATH"
- eval "$(rbenv init -)"
- rbenv global 2.6.10 # 你实际用的 Ruby 版本
- ruby -v
- which ruby
- gem env
- bundle config mirror.https://rubygems.org https://mirrors.aliyun.com/rubygems/
- bundle install --gemfile ios/Gemfile --path vendor/bundle_ios --quiet
- flutter clean
cache:
paths:
- app_new.version
test_lint_check:
stage: test
extends: .print_env
script:
- echo "run lint check or per-test here"
tags:
- macos
- flutter
generate_git_tag:
stage: generate_tag_or_version
extends: .generate_tag_rule
before_script:
- bash pre_build.sh sky
- project_url=$(echo $CI_PROJECT_URL | sed 's/http:\/\///')
- echo "project_url:$project_url"
- echo "CI_SERVER_FQDN:$CI_SERVER_FQDN/CI_PROJECT_ROOT_NAMESPACE:$CI_PROJECT_ROOT_NAMESPACE/CI_PROJECT_NAME:$CI_PROJECT_NAME"
- git remote set-url origin git@$CI_SERVER_FQDN:$CI_PROJECT_ROOT_NAMESPACE/$CI_PROJECT_NAME.git
script:
- bash tag_generator.sh generate_tag
generate_next_version:
stage: generate_tag_or_version
extends: .generate_next_version_rule
script:
- bash tag_generator.sh generate_version
cache:
paths:
- app_new.version
build_android:
stage: build-artifacts
extends: .setup_fastlane_android
script: bash android/build.sh
artifacts:
paths:
- build/app/outputs/flutter-apk/
build_ios:
stage: build-artifacts
extends: .setup_fastlane_ios
script:
- bash ios/build.sh
artifacts:
paths:
- build/app/outputs/flutter-ipa
create-release:
stage: release-artifacts
extends: .build_rule
dependencies:
- build_android
- build_ios
needs:
- job: build_android
artifacts: true
- job: build_ios
artifacts: true
rules:
- if: $CI_COMMIT_TAG
before_script:
- echo "start create release"
- bash release_description_generator.sh
- export RELEASE_DESCRIPTION="$(cat changelog.md)"
- echo "${RELEASE_DESCRIPTION}"
script:
- export StarLock_VERSION=${CI_COMMIT_TAG#*-}
- echo "Uploading StarLock-${StarLock_VERSION} packages to
${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${StarLock_VERSION}/StarLock-${StarLock_VERSION}-*"
- 'curl -i --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/app/outputs/flutter-apk/starlock-sky-release-${CI_COMMIT_TAG}.apk
"${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${StarLock_VERSION}/starlock-sky-release-${CI_COMMIT_TAG}.apk"'
- 'curl -i --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/app/outputs/flutter-apk/starlock-sky-release-${CI_COMMIT_TAG}.aab
"${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${StarLock_VERSION}/starlock-sky-release-${CI_COMMIT_TAG}.aab"'
- 'curl -i --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/app/outputs/flutter-ipa/starlock-sky-release-${CI_COMMIT_TAG}.ipa
"${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${StarLock_VERSION}/starlock-sky-release-${CI_COMMIT_TAG}.ipa"'
release:
name: '$CI_COMMIT_TAG'
description: '$(cat changelog.md)'
tag_name: '$CI_COMMIT_TAG'
ref: '$CI_COMMIT_TAG'
assets:
links:
- name: 'sky apk binary package'
url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${CI_COMMIT_TAG}/starlock-sky-release-${CI_COMMIT_TAG}.apk'
link_type: 'package'
- name: 'sky bundle binary package'
url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${CI_COMMIT_TAG}/starlock-sky-release-${CI_COMMIT_TAG}.aab'
link_type: 'package'
- name: 'sky ipa binary package'
url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${CI_COMMIT_TAG}/starlock-sky-release-${CI_COMMIT_TAG}.ipa'
link_type: 'package'
notify_success:
stage: notification
extends: .notify_rule
before_script:
- printenv | while IFS='=' read -r key value; do echo "$key=$value"; done
script:
- bash notify.sh success
allow_failure: true
when: on_success
notify_failure:
stage: notification
extends: .notify_rule
before_script:
- printenv | while IFS='=' read -r key value; do echo "$key=$value"; done
script:
- bash notify.sh failure
allow_failure: true
when: on_failure
clean_up:
stage: clean-up
extends: .build_rule
script:
- git reset --hard
when: always

View File

@ -1,5 +1,5 @@
# 星锁APP
测试ci
星云项目组旗下的智能锁应用,其中锁相关数据接入星云平台,业务数据接入星锁自有后台。
基于Flutter技术架构支持Android和iOS平台。
@ -61,7 +61,7 @@ keytool -list -v -keystore android/app/sky.jks
```
输入密码在android/app/build.gradle:38可以看到
测试ci
一般需要的是:证书指纹-SHA1 看起来像 95:6B:***********共59个字符
## 编译
@ -171,3 +171,14 @@ java -jar android/bundletool.jar build-apks --bundle=build/app/outputs/bundle/sk
```bash
java -jar android/bundletool.jar install-apks --apks=build/app/outputs/bundle/skyRelease/app-sky-release.aab.apks
```
## Jpush相关
极光推送目前app这边只依赖极光的透传能力推送能力通过截取极光拿到的各个厂商的推送token然后将推送token上报到自己业务服务器直接调用各个厂商推送通道进行消息推送所以对极光的flutter sdk进行了私有化定制改造改造点如下
* AndroidiOS平台原生代码中截取jpush获取到的厂商推送token将token回传到flutter业务应用层
* Android通过Jpush统一集成的各个厂商推送sdk统一获取到token
* iOS通过原生token回调接口获取到token
* flutter端将获取到的厂商token厂商标识上报到业务服务器
定制jpush_flutterhttp://code-internal.star-lock.cn/StarlockTeam/jpush_flutter

BIN
android/.DS_Store vendored

Binary file not shown.

6
android/Gemfile Normal file
View File

@ -0,0 +1,6 @@
source "https://rubygems.org"
gem "fastlane"
gem 'nkf', '0.2.0'
plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
eval_gemfile(plugins_path) if File.exist?(plugins_path)

231
android/Gemfile.lock Normal file
View File

@ -0,0 +1,231 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.7)
base64
nkf
rexml
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
artifactory (3.0.17)
atomos (0.1.3)
aws-eventstream (1.3.2)
aws-partitions (1.1107.0)
aws-sdk-core (3.224.0)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.992.0)
aws-sigv4 (~> 1.9)
base64
jmespath (~> 1, >= 1.6.1)
logger
aws-sdk-kms (1.101.0)
aws-sdk-core (~> 3, >= 3.216.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.186.1)
aws-sdk-core (~> 3, >= 3.216.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.11.0)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
base64 (0.2.0)
claide (1.1.0)
colored (1.2)
colored2 (3.1.2)
commander (4.6.0)
highline (~> 2.0.0)
declarative (0.0.20)
digest-crc (0.7.0)
rake (>= 12.0.0, < 14.0.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.8.1)
emoji_regex (3.2.3)
excon (0.109.0)
faraday (1.10.4)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
faraday-httpclient (~> 1.0)
faraday-multipart (~> 1.0)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.0)
faraday-patron (~> 1.0)
faraday-rack (~> 1.0)
faraday-retry (~> 1.0)
ruby2_keywords (>= 0.0.4)
faraday-cookie_jar (0.0.7)
faraday (>= 0.8.0)
http-cookie (~> 1.0.0)
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-multipart (1.1.0)
multipart-post (~> 2.0)
faraday-net_http (1.0.2)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.3)
faraday_middleware (1.2.1)
faraday (~> 1.0)
fastimage (2.4.0)
fastlane (2.227.2)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
aws-sdk-s3 (~> 1.0)
babosa (>= 1.0.3, < 2.0.0)
bundler (>= 1.12.0, < 3.0.0)
colored (~> 1.2)
commander (~> 4.6)
dotenv (>= 2.1.1, < 3.0.0)
emoji_regex (>= 0.1, < 4.0)
excon (>= 0.71.0, < 1.0.0)
faraday (~> 1.0)
faraday-cookie_jar (~> 0.0.6)
faraday_middleware (~> 1.0)
fastimage (>= 2.1.0, < 3.0.0)
fastlane-sirp (>= 1.0.0)
gh_inspector (>= 1.1.2, < 2.0.0)
google-apis-androidpublisher_v3 (~> 0.3)
google-apis-playcustomapp_v1 (~> 0.1)
google-cloud-env (>= 1.6.0, < 2.0.0)
google-cloud-storage (~> 1.31)
highline (~> 2.0)
http-cookie (~> 1.0.5)
json (< 3.0.0)
jwt (>= 2.1.0, < 3)
mini_magick (>= 4.9.4, < 5.0.0)
multipart-post (>= 2.0.0, < 3.0.0)
naturally (~> 2.2)
optparse (>= 0.1.1, < 1.0.0)
plist (>= 3.1.0, < 4.0.0)
rubyzip (>= 2.0.0, < 3.0.0)
security (= 0.1.5)
simctl (~> 1.6.3)
terminal-notifier (>= 2.0.0, < 3.0.0)
terminal-table (~> 3)
tty-screen (>= 0.6.3, < 1.0.0)
tty-spinner (>= 0.8.0, < 1.0.0)
word_wrap (~> 1.0.0)
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.4.1)
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
fastlane-plugin-pgyer (0.2.9)
fastlane-sirp (1.0.0)
sysrandom (~> 1.0)
gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.54.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-core (0.11.3)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.16.2, < 2.a)
httpclient (>= 2.8.1, < 3.a)
mini_mime (~> 1.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.a)
rexml
google-apis-iamcredentials_v1 (0.17.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-playcustomapp_v1 (0.13.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-storage_v1 (0.29.0)
google-apis-core (>= 0.11.0, < 2.a)
google-cloud-core (1.6.1)
google-cloud-env (>= 1.0, < 3.a)
google-cloud-errors (~> 1.0)
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
google-cloud-errors (1.3.1)
google-cloud-storage (1.45.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
google-apis-iamcredentials_v1 (~> 0.1)
google-apis-storage_v1 (~> 0.29.0)
google-cloud-core (~> 1.6)
googleauth (>= 0.16.2, < 2.a)
mini_mime (~> 1.0)
googleauth (1.8.1)
faraday (>= 0.17.3, < 3.a)
jwt (>= 1.4, < 3.0)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
highline (2.0.3)
http-cookie (1.0.8)
domain_name (~> 0.5)
httpclient (2.9.0)
mutex_m
jmespath (1.6.2)
json (2.7.6)
jwt (2.10.1)
base64
logger (1.7.0)
mini_magick (4.13.2)
mini_mime (1.1.5)
multi_json (1.15.0)
multipart-post (2.4.1)
mutex_m (0.3.0)
nanaimo (0.4.0)
naturally (2.2.1)
nkf (0.2.0)
optparse (0.6.0)
os (1.1.4)
plist (3.7.2)
public_suffix (5.1.1)
rake (13.2.1)
representable (3.2.0)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rexml (3.4.1)
rouge (3.28.0)
ruby2_keywords (0.0.5)
rubyzip (2.4.1)
security (0.1.5)
signet (0.18.0)
addressable (~> 2.8)
faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simctl (1.6.10)
CFPropertyList
naturally
sysrandom (1.0.5)
terminal-notifier (2.0.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
trailblazer-option (0.1.2)
tty-cursor (0.7.1)
tty-screen (0.8.2)
tty-spinner (0.9.3)
tty-cursor (~> 0.7)
uber (0.1.0)
unf (0.2.0)
unicode-display_width (2.6.0)
word_wrap (1.0.0)
xcodeproj (1.27.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.4.0)
rexml (>= 3.3.6, < 4.0)
xcpretty (0.4.1)
rouge (~> 3.28.0)
xcpretty-travis-formatter (1.0.1)
xcpretty (~> 0.2, >= 0.0.7)
PLATFORMS
ruby
DEPENDENCIES
fastlane
fastlane-plugin-pgyer
nkf (= 0.2.0)
BUNDLED WITH
1.17.2

View File

@ -0,0 +1,13 @@
apply plugin: 'AndResGuard'
andResGuard {
whiteList = [
"R.xml.jpush*",
"R.drawable.jpush*",
"R.layout.jpush*",
"R.layout.push*",
"R.string.jg*",
"R.style.MyDialogStyle",
"R.style.JPushTheme"
]
}

View File

@ -23,28 +23,33 @@ if (flutterVersionName == null) {
}
apply plugin: 'com.android.application'
//<com>
apply plugin: 'com.google.gms.google-services'
//</com>
apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
apply plugin: 'com.android.application'
apply plugin: 'android-junk-code'
//apply plugin: 'android-junk-code'
apply plugin: 'com.huawei.agconnect'
apply from: 'and_res_guard.gradle'
androidJunkCode {
variantConfig {
release {
//release是变体名称productFlavors就是buildType名称productFlavors就是flavor+buildTypefreeReleaseproRelease
packageBase = "cn.hx.plugin.ui" //java类根包名
packageCount = 30 //
activityCountPerPackage = 3 //Activity类数量
excludeActivityJavaFile = false
//Activity的Java文件,false(layout和写入AndroidManifest.xml还会执行)
otherCountPerPackage = 50 //
methodCountPerClass = 20 //
resPrefix = "junk_" //layoutdrawablestring等资源名前缀
drawableCount = 300 //drawable资源数量
stringCount = 300 //string数量
}
}
}
//androidJunkCode {
// variantConfig {
// release {
// //release是变体名称productFlavors就是buildType名称productFlavors就是flavor+buildTypefreeReleaseproRelease
// packageBase = "cn.hx.plugin.ui" //java类根包名
// packageCount = 30 //
// activityCountPerPackage = 3 //Activity类数量
// excludeActivityJavaFile = false
// //Activity的Java文件,false(layout和写入AndroidManifest.xml还会执行)
// otherCountPerPackage = 50 //
// methodCountPerClass = 20 //
// resPrefix = "junk_" //layoutdrawablestring等资源名前缀
// drawableCount = 300 //drawable资源数量
// stringCount = 300 //string数量
// }
// }
//}
android {
signingConfigs {
@ -55,6 +60,10 @@ android {
storePassword '123456'
keyAlias = 'starlock'
keyPassword '123456'
// storeFile file("xhj.jks")
// storePassword 'xhj8872'
// keyAlias = 'upload'
// keyPassword 'xhj8872'
}
sky {
// CN=Unknown, OU=Unknown, O=Unknown, L=Unknown, ST=Unknown, C=Unknown
@ -69,6 +78,13 @@ android {
keyAlias = 'upload'
keyPassword 'xhj8872'
}
xhj_bundle {
storeFile file("xhj_bundle.jks")
storePassword 'xhj8872'
keyAlias = 'xhj'
keyPassword 'xhj8872'
}
}
// ----- BEGIN flavorDimensions (autogenerated by flutter_flavorizr) -----
@ -79,36 +95,105 @@ android {
dimension "flavor-type"
applicationId "com.starlock.lock.local"
signingConfig signingConfigs.debug
resValue "string", "app_name", "星锁-local"
resValue "string", "app_name", "Star Lock"
manifestPlaceholders.JPUSH_PKGNAME = "com.starlock.lock.local"
}
dev {
dimension "flavor-type"
applicationId "com.starlock.lock.dev"
signingConfig signingConfigs.debug
resValue "string", "app_name", "星锁-dev"
resValue "string", "app_name", "Star Lock"
manifestPlaceholders.JPUSH_PKGNAME = "com.starlock.lock.dev"
}
pre {
dimension "flavor-type"
applicationId "com.starlock.lock.pre"
signingConfig signingConfigs.debug
resValue "string", "app_name", "星锁"
resValue "string", "app_name", "Star Lock-P"
manifestPlaceholders.JPUSH_PKGNAME = "com.starlock.lock.pre"
}
sky {
dimension "flavor-type"
applicationId "com.skychip.lock"
signingConfig signingConfigs.sky
resValue "string", "app_name", "锁通通"
manifestPlaceholders.JPUSH_PKGNAME = "com.skychip.lock"
resValue "string", "app_name", "TTLock Pro"
manifestPlaceholders = [
JPUSH_PKGNAME : "com.skychip.lock",
JPUSH_APPKEY : "7ff37d174c1a568a89e98dad",//--skyAppKey
JPUSH_CHANNEL : "flutter_channel",
XIAOMI_APPID : "MI-2882303761520287291",
XIAOMI_APPKEY : "MI-5352028744291",
OPPO_APPKEY : "OP-ccae67a4a8c1470a8350b0d6a89f8105",
OPPO_APPID : "OP-31586713",
OPPO_APPSECRET: "OP-2339389233094ca297de7b10213f7bd8",
VIVO_APPKEY : "6a18657357d176364a91f50e4c9cd7c4",
VIVO_APPID : "105724810",
HONOR_APPID : "104437184",
]
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules-sky.pro'
}
sky_pre {
dimension "flavor-type"
applicationId "com.skychip.lock.pre"
signingConfig signingConfigs.sky
resValue "string", "app_name", "TTLock Pro-P"
manifestPlaceholders.JPUSH_PKGNAME = "com.skychip.lock.pre"
}
sky_dev {
dimension "flavor-type"
applicationId "com.skychip.lock.dev"
signingConfig signingConfigs.sky
resValue "string", "app_name", "TTLock Pro"
manifestPlaceholders.JPUSH_PKGNAME = "com.skychip.lock.dev"
}
xhj {
dimension "flavor-type"
applicationId "com.xhjcn.lock"
signingConfig signingConfigs.xhj
resValue "string", "app_name", "鑫锁"
manifestPlaceholders.JPUSH_PKGNAME = "com.xhjcn.lock"
resValue "string", "app_name", "Star Lock"
manifestPlaceholders = [
JPUSH_PKGNAME : "com.xhjcn.lock",
JPUSH_APPKEY : "251fc8074820d122b6de58d2",//--AppKey
JPUSH_CHANNEL : "flutter_channel",
XIAOMI_APPID : "MI-2882303761520314939",
XIAOMI_APPKEY : "MI-5312031456939",
OPPO_APPKEY : "OP-47f668c9943248118502aa58d066393b",
OPPO_APPID : "OP-31726001",
OPPO_APPSECRET: "OP-05723986bba64183a71530b496922450",
VIVO_APPKEY : "75fe8e570425b714e08d0390b14797cb",
VIVO_APPID : "105752244",
HONOR_APPID : "104458196",
]
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules-xhj.pro'
}
xhj_bundle {
dimension "flavor-type"
applicationId "ltd.xhjcn.lock"
signingConfig signingConfigs.xhj_bundle
resValue "string", "app_name", "Star Lock"
manifestPlaceholders = [
JPUSH_PKGNAME: "ltd.xhjcn.lock",
JPUSH_APPKEY : "5ccdb9b8d3faaae66ba5d02e",
JPUSH_CHANNEL: "flutter_channel",
]
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules-xhj.pro'
}
xhj_pre {
dimension "flavor-type"
applicationId "com.xhjcn.lock.pre"
signingConfig signingConfigs.xhj
resValue "string", "app_name", "Star Lock-P"
manifestPlaceholders.JPUSH_PKGNAME = "com.xhjcn.lock.pre"
}
xhj_dev {
dimension "flavor-type"
applicationId "com.xhjcn.lock.dev"
signingConfig signingConfigs.xhj
resValue "string", "app_name", "Star Lock"
manifestPlaceholders.JPUSH_PKGNAME = "com.xhjcn.lock.dev"
}
}
@ -117,7 +202,7 @@ android {
compileSdkVersion flutter.compileSdkVersion
ndkVersion flutter.ndkVersion
lintOptions{
lintOptions {
checkReleaseBuilds false
abortOnError false
}
@ -141,9 +226,10 @@ android {
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
minSdkVersion 25
targetSdkVersion 33
targetSdkVersion 35
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
// 使 flutter build apk --split-per-abi
// ndk在同一个个包中包含多个架构
@ -161,13 +247,23 @@ android {
manifestPlaceholders = [
JPUSH_PKGNAME : "这里不重要,在口味配置",
//JPush Appkey.
JPUSH_APPKEY : "7ff37d174c1a568a89e98dad",
//.
JPUSH_CHANNEL : "flutter_channel",
// JPUSH_APPKEY : "7ff37d174c1a568a89e98dad",//--skyAppKey
JPUSH_APPKEY : "default",//--AppKey
JPUSH_CHANNEL : "default",
//
XIAOMI_APPID : "MI-2882303761520287291",
XIAOMI_APPKEY : "MI-5352028744291",
//sky的配置
// XIAOMI_APPID : "MI-2882303761520287291",
// XIAOMI_APPKEY : "MI-5352028744291",
//
XIAOMI_APPID : "default",
XIAOMI_APPKEY : "default",
OPPO_APPKEY : "default",
OPPO_APPID : "default",
OPPO_APPSECRET: "default",
VIVO_APPKEY : "default",
VIVO_APPID : "default",
HONOR_APPID : "default",
]
splits {
abi {
@ -183,7 +279,7 @@ android {
}
buildTypes {
release {
debug {
// release编译模式下应用闪退[Debug模式下运行正常但是打Release包时则闪退解决办法](https://blog.csdn.net/weixin_39370093/article/details/109631210)
// release模式设置混淆可以解决地图闪退问题
//
@ -193,7 +289,33 @@ android {
productFlavors.dev.signingConfig signingConfigs.debug
productFlavors.pre.signingConfig signingConfigs.debug
productFlavors.sky.signingConfig signingConfigs.sky
productFlavors.sky_dev.signingConfig signingConfigs.sky
productFlavors.sky_pre.signingConfig signingConfigs.sky
productFlavors.xhj.signingConfig signingConfigs.xhj
productFlavors.xhj_dev.signingConfig signingConfigs.xhj
productFlavors.xhj_pre.signingConfig signingConfigs.xhj
}
release {
// release编译模式下应用闪退[Debug模式下运行正常但是打Release包时则闪退解决办法](https://blog.csdn.net/weixin_39370093/article/details/109631210)
// release模式设置混淆可以解决地图闪退问题
//
minifyEnabled true
shrinkResources true
productFlavors.local.signingConfig signingConfigs.debug
productFlavors.dev.signingConfig signingConfigs.debug
productFlavors.pre.signingConfig signingConfigs.debug
productFlavors.sky.signingConfig signingConfigs.sky
productFlavors.sky_dev.signingConfig signingConfigs.sky
productFlavors.sky_pre.signingConfig signingConfigs.sky
productFlavors.xhj.signingConfig signingConfigs.xhj
productFlavors.xhj_dev.signingConfig signingConfigs.xhj
productFlavors.xhj_pre.signingConfig signingConfigs.xhj
}
}
applicationVariants.all { variant ->
variant.outputs.all {
outputFileName = "app-starlock-${variant.buildType.name}-${variant.flavorName}-${defaultConfig.versionName}.apk"
}
}
}
@ -204,11 +326,46 @@ flutter {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation('com.amap.api:location:5.6.0')
implementation('com.amap.api:3dmap:8.1.0')
// implementation('com.amap.api:location:5.6.0')
// implementation('com.amap.api:3dmap:8.1.0')
// implementation('com.amap.api:3dmap-location-search:latest.integration')
implementation 'cn.jiguang.sdk:jpush:5.2.3'
//
implementation 'com.huawei.agconnect:agconnect-core:1.8.1.300'
implementation 'com.huawei.hms:push:6.12.0.300'
implementation 'cn.jiguang.sdk.plugin:huawei:5.2.3'
//
implementation 'cn.jiguang.sdk.plugin:xiaomi:5.2.3'
//OPPO厂商
implementation 'cn.jiguang.sdk.plugin:oppo:5.2.3'
// libs aar
implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
//OPPO 3.1.0 aar
implementation 'com.google.code.gson:gson:2.6.2'
implementation 'commons-codec:commons-codec:1.6'
implementation 'androidx.annotation:annotation:1.1.0'
// 耀
implementation 'cn.jiguang.sdk.plugin:honor:5.2.3'
//耀 aar SDK jpush-android-xxx-release/third-push/honor/libs 下的 aar 文件单独拷贝一份到应用 module/libs
// implementation(name: 'HiPushSDK-7.0.61.303', ext: 'aar')
// VIVO
implementation 'cn.jiguang.sdk.plugin:vivo:5.2.3'
// Umeng统计
//<cn>
implementation 'com.umeng.umsdk:common:9.7.9'
implementation 'com.umeng.umsdk:asms:1.8.5'
//</cn>
//<com>
// implementation 'cn.jiguang.sdk.plugin:fcm:5.2.3'
// implementation 'com.google.firebase:firebase-messaging:23.0.5'
//</com>
//FCM云消息与极光FCM插件
implementation 'com.google.firebase:firebase-messaging:23.2.1'
implementation 'cn.jiguang.sdk.plugin:fcm:5.2.2'
}

View File

@ -2,14 +2,14 @@
"project_info": {
"project_number": "281500445726",
"project_id": "skychip2023-ecdff",
"storage_bucket": "skychip2023-ecdff.appspot.com"
"storage_bucket": "skychip2023-ecdff.firebasestorage.app"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:281500445726:android:ddf52ac7b7f83cf5c4d20f",
"mobilesdk_app_id": "1:281500445726:android:468195b9cc68dd6cc4d20f",
"android_client_info": {
"package_name": "com.skychip.lock"
"package_name": "com.starlock.lock.local"
}
},
"oauth_client": [],

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,650 @@
ʻ
ʼ
ʽ
ʾ
ʿ
ˆ
ˈ
ˉ
ˊ
ˋ
ˎ
ˏ
ˑ
י
ـ
ٴ
゙゙
ᐧᐧ
ᴵᴵ
ʻʻ
ʽʽ
ʼʼ
ʿʿ
ʾʾ
ــ
ˆˆ
ˉˉ
ˈˈ
ˋˋ
ˊˊ
ˏˏ
ˎˎ
ˑˑ
ᵔᵔ
יי
ᵎᵎ
ᵢᵢ
ⁱⁱ
ﹳﹳ
ٴٴ
ﹶﹶ
ʻʼ
ʻʽ
ʻʾ
ʻʿ
ʻˆ
ʻˈ
ʻˉ
ʻˊ
ʻˋ
ʻˎ
ʻˏ
ʻˑ
ʻי
ʻـ
ʻٴ
ʻᐧ
ʻᴵ
ʻᵎ
ʻᵔ
ʻᵢ
ʻⁱ
ʻﹳ
ʻﹶ
ʻ゙
ʼʻ
ʼʽ
ʼʾ
ʼʿ
ʼˆ
ʼˈ
ʼˉ
ʼˊ
ʼˋ
ʼˎ
ʼˏ
ʼˑ
ʼי
ʼـ
ʼٴ
ʼᐧ
ʼᴵ
ʼᵎ
ʼᵔ
ʼᵢ
ʼⁱ
ʼﹳ
ʼﹶ
ʼ゙
ʽʻ
ʽʼ
ʽʾ
ʽʿ
ʽˆ
ʽˈ
ʽˉ
ʽˊ
ʽˋ
ʽˎ
ʽˏ
ʽˑ
ʽי
ʽـ
ʽٴ
ʽᐧ
ʽᴵ
ʽᵎ
ʽᵔ
ʽᵢ
ʽⁱ
ʽﹳ
ʽﹶ
ʽ゙
ʾʻ
ʾʼ
ʾʽ
ʾʿ
ʾˆ
ʾˈ
ʾˉ
ʾˊ
ʾˋ
ʾˎ
ʾˏ
ʾˑ
ʾי
ʾـ
ʾٴ
ʾᐧ
ʾᴵ
ʾᵎ
ʾᵔ
ʾᵢ
ʾⁱ
ʾﹳ
ʾﹶ
ʾ゙
ʿʻ
ʿʼ
ʿʽ
ʿʾ
ʿˆ
ʿˈ
ʿˉ
ʿˊ
ʿˋ
ʿˎ
ʿˏ
ʿˑ
ʿי
ʿـ
ʿٴ
ʿᐧ
ʿᴵ
ʿᵎ
ʿᵔ
ʿᵢ
ʿⁱ
ʿﹳ
ʿﹶ
ʿ゙
ˆʻ
ˆʼ
ˆʽ
ˆʾ
ˆʿ
ˆˈ
ˆˉ
ˆˊ
ˆˋ
ˆˎ
ˆˏ
ˆˑ
ˆי
ˆـ
ˆٴ
ˆᐧ
ˆᴵ
ˆᵎ
ˆᵔ
ˆᵢ
ˆⁱ
ˆﹳ
ˆﹶ
ˆ゙
ˈʻ
ˈʼ
ˈʽ
ˈʾ
ˈʿ
ˈˆ
ˈˉ
ˈˊ
ˈˋ
ˈˎ
ˈˏ
ˈˑ
ˈי
ˈـ
ˈٴ
ˈᐧ
ˈᴵ
ˈᵎ
ˈᵔ
ˈᵢ
ˈⁱ
ˈﹳ
ˈﹶ
ˈ゙
ˉʻ
ˉʼ
ˉʽ
ˉʾ
ˉʿ
ˉˆ
ˉˈ
ˉˊ
ˉˋ
ˉˎ
ˉˏ
ˉˑ
ˉי
ˉـ
ˉٴ
ˉᐧ
ˉᴵ
ˉᵎ
ˉᵔ
ˉᵢ
ˉⁱ
ˉﹳ
ˉﹶ
ˉ゙
ˊʻ
ˊʼ
ˊʽ
ˊʾ
ˊʿ
ˊˆ
ˊˈ
ˊˉ
ˊˋ
ˊˎ
ˊˏ
ˊˑ
ˊי
ˊـ
ˊٴ
ˊᐧ
ˊᴵ
ˊᵎ
ˊᵔ
ˊᵢ
ˊⁱ
ˊﹳ
ˊﹶ
ˊ゙
ˋʻ
ˋʼ
ˋʽ
ˋʾ
ˋʿ
ˋˆ
ˋˈ
ˋˉ
ˋˊ
ˋˎ
ˋˏ
ˋˑ
ˋי
ˋـ
ˋٴ
ˋᐧ
ˋᴵ
ˋᵎ
ˋᵔ
ˋᵢ
ˋⁱ
ˋﹳ
ˋﹶ
ˋ゙
ˎʻ
ˎʼ
ˎʽ
ˎʾ
ˎʿ
ˎˆ
ˎˈ
ˎˉ
ˎˊ
ˎˋ
ˎˏ
ˎˑ
ˎי
ˎـ
ˎٴ
ˎᐧ
ˎᴵ
ˎᵎ
ˎᵔ
ˎᵢ
ˎⁱ
ˎﹳ
ˎﹶ
ˎ゙
ˏʻ
ˏʼ
ˏʽ
ˏʾ
ˏʿ
ˏˆ
ˏˈ
ˏˉ
ˏˊ
ˏˋ
ˏˎ
ˏˑ
ˏי
ˏـ
ˏٴ
ˏᐧ
ˏᴵ
ˏᵎ
ˏᵔ
ˏᵢ
ˏⁱ
ˏﹳ
ˏﹶ
ˏ゙
ˑʻ
ˑʼ
ˑʽ
ˑʾ
ˑʿ
ˑˆ
ˑˈ
ˑˉ
ˑˊ
ˑˋ
ˑˎ
ˑˏ
ˑי
ˑـ
ˑٴ
ˑᐧ
ˑᴵ
ˑᵎ
ˑᵔ
ˑᵢ
ˑⁱ
ˑﹳ
ˑﹶ
ˑ゙
יʻ
יʼ
יʽ
יʾ
יʿ
יˆ
יˈ
יˉ
יˊ
יˋ
יˎ
יˏ
יˑ
יـ
יٴ
יᐧ
יᴵ
יᵎ
יᵔ
יᵢ
יⁱ
יﹳ
יﹶ
י゙
ـʻ
ـʼ
ـʽ
ـʾ
ـʿ
ـˆ
ـˈ
ـˉ
ـˊ
ـˋ
ـˎ
ـˏ
ـˑ
ـי
ـٴ
ـᐧ
ـᴵ
ـᵎ
ـᵔ
ـᵢ
ـⁱ
ـﹳ
ـﹶ
ـ゙
ٴʻ
ٴʼ
ٴʽ
ٴʾ
ٴʿ
ٴˆ
ٴˈ
ٴˉ
ٴˊ
ٴˋ
ٴˎ
ٴˏ
ٴˑ
ٴי
ٴـ
ٴᐧ
ٴᴵ
ٴᵎ
ٴᵔ
ٴᵢ
ٴⁱ
ٴﹳ
ٴﹶ
ٴ゙
ᐧʻ
ᐧʼ
ᐧʽ
ᐧʾ
ᐧʿ
ᐧˆ
ᐧˈ
ᐧˉ
ᐧˊ
ᐧˋ
ᐧˎ
ᐧˏ
ᐧˑ
ᐧי
ᐧـ
ᐧٴ
ᐧᴵ
ᐧᵎ
ᐧᵔ
ᐧᵢ
ᐧⁱ
ᐧﹳ
ᐧﹶ
ᐧ゙
ᴵʻ
ᴵʼ
ᴵʽ
ᴵʾ
ᴵʿ
ᴵˆ
ᴵˈ
ᴵˉ
ᴵˊ
ᴵˋ
ᴵˎ
ᴵˏ
ᴵˑ
ᴵי
ᴵـ
ᴵٴ
ᴵᐧ
ᴵᵎ
ᴵᵔ
ᴵᵢ
ᴵⁱ
ᴵﹳ
ᴵﹶ
ᴵ゙
ᵎʻ
ᵎʼ
ᵎʽ
ᵎʾ
ᵎʿ
ᵎˆ
ᵎˈ
ᵎˉ
ᵎˊ
ᵎˋ
ᵎˎ
ᵎˏ
ᵎˑ
ᵎי
ᵎـ
ᵎٴ
ᵎᐧ
ᵎᴵ
ᵎᵔ
ᵎᵢ
ᵎⁱ
ᵎﹳ
ᵎﹶ
ᵎ゙
ᵔʻ
ᵔʼ
ᵔʽ
ᵔʾ
ᵔʿ
ᵔˆ
ᵔˈ
ᵔˉ
ᵔˊ
ᵔˋ
ᵔˎ
ᵔˏ
ᵔˑ
ᵔי
ᵔـ
ᵔٴ
ᵔᐧ
ᵔᴵ
ᵔᵎ
ᵔᵢ
ᵔⁱ
ᵔﹳ
ᵔﹶ
ᵔ゙
ᵢʻ
ᵢʼ
ᵢʽ
ᵢʾ
ᵢʿ
ᵢˆ
ᵢˈ
ᵢˉ
ᵢˊ
ᵢˋ
ᵢˎ
ᵢˏ
ᵢˑ
ᵢי
ᵢـ
ᵢٴ
ᵢᐧ
ᵢᴵ
ᵢᵎ
ᵢᵔ
ᵢⁱ
ᵢﹳ
ᵢﹶ
ᵢ゙
ⁱʻ
ⁱʼ
ⁱʽ
ⁱʾ
ⁱʿ
ⁱˆ
ⁱˈ
ⁱˉ
ⁱˊ
ⁱˋ
ⁱˎ
ⁱˏ
ⁱˑ
ⁱי
ⁱـ
ⁱٴ
ⁱᐧ
ⁱᴵ
ⁱᵎ
ⁱᵔ
ⁱᵢ
ⁱﹳ
ⁱﹶ
ⁱ゙
ﹳʻ
ﹳʼ
ﹳʽ
ﹳʾ
ﹳʿ
ﹳˆ
ﹳˈ
ﹳˉ
ﹳˊ
ﹳˋ
ﹳˎ
ﹳˏ
ﹳˑ
ﹳי
ﹳـ
ﹳٴ
ﹳᐧ
ﹳᴵ
ﹳᵎ
ﹳᵔ
ﹳᵢ
ﹳⁱ
ﹳﹶ
ﹳ゙
ﹶʻ
ﹶʼ
ﹶʽ
ﹶʾ
ﹶʿ
ﹶˆ
ﹶˈ
ﹶˉ
ﹶˊ
ﹶˋ
ﹶˎ
ﹶˏ
ﹶˑ
ﹶי
ﹶـ
ﹶٴ
ﹶᐧ
ﹶᴵ
ﹶᵎ
ﹶᵔ
ﹶᵢ
ﹶⁱ
ﹶﹳ
ﹶ゙
゙ʻ
゙ʼ
゙ʽ
゙ʾ
゙ʿ
゙ˆ
゙ˈ
゙ˉ
゙ˊ
゙ˋ
゙ˎ
゙ˏ
゙ˑ
゙י
゙ـ
゙ٴ
゙ᐧ
゙ᴵ
゙ᵎ
゙ᵔ
゙ᵢ
゙ⁱ
゙ﹳ
゙ﹶ

View File

@ -0,0 +1,155 @@
-obfuscationdictionary ./proguard-dictionary-1il
-classobfuscationdictionary ./proguard-dictionary-1il
-packageobfuscationdictionary ./proguard-dictionary-1il
#Flutter Wrapper
-keep class io.flutter.app.** { *; }
-keep class io.flutter.plugin.** { *; }
-keep class io.flutter.util.** { *; }
-keep class io.flutter.view.** { *; }
-keep class io.flutter.** { *; }
-keep class io.flutter.plugins.** { *; }
-keepattributes Signature
-keepattributes InnerClasses,EnclosingMethod
-keepattributes *Annotation*
-keepattributes SourceFile,LineNumberTable
-dontwarn com.hwangjr.rxbus.**
-keep class com.hwangjr.rxbus.** { *; }
-keepattributes *Annotation*
# Retain generic type information for use by reflection by converters and adapters.
-keepattributes Signature
# Retain declared checked exceptions for use by a Proxy instance.
-keepattributes Exceptions
-dontwarn com.jcraft.jzlib.**
-keep class com.jcraft.jzlib.** { *;}
-dontwarn sun.misc.**
-keep class sun.misc.** { *;}
-dontwarn retrofit2.**
-keep class retrofit2.** { *;}
-dontwarn io.reactivex.**
-keep class io.reactivex.** { *;}
-dontwarn sun.security.**
-keep class sun.security.** { *; }
-dontwarn com.google.**
-keep class com.google.** { *;}
-keep public class android.net.http.SslError
-keep public class android.webkit.WebViewClient
-dontwarn android.webkit.WebView
-dontwarn android.net.http.SslError
-dontwarn android.webkit.WebViewClient
-dontwarn android.support.**
-dontwarn org.apache.**
-keep class org.apache.** { *;}
-dontwarn okhttp3.**
-keep class okhttp3.** { *;}
-keep interface okhttp3.** { *; }
-dontwarn okio.**
-keep class okio.** { *;}
-keep class **JNI* {*;}
-keep class com.lib.flutter_blue_plus.* { *; }
-ignorewarnings
-keepattributes *Annotation*
-keepattributes Exceptions
-keepattributes InnerClasses
-keepattributes Signature
-keepattributes SourceFile,LineNumberTable
-keep class com.huawei.hianalytics.**{*;}
-keep class com.huawei.updatesdk.**{*;}
-keep class com.huawei.hms.**{*;}
-keep public class * extends android.app.Service
-keep class com.heytap.msp.** { *;}
-dontwarn com.vivo.push.**
-keep class com.vivo.push.**{*; }
-keep class com.vivo.vms.**{*; }
-dontoptimize
-dontpreverify
-dontwarn cn.jpush.**
-keep class cn.jpush.** { *; }
-keep class * extends cn.jpush.android.service.JPushMessageService { *; }
-dontwarn cn.jiguang.**
-keep class cn.jiguang.** { *; }
-dontwarn cn.com.chinatelecom.**
-keep class cn.com.chinatelecom.** {*;}
-dontwarn com.ct.**
-keep class com.ct.** {*;}
-dontwarn a.a.**
-keep class a.a.** {*;}
-dontwarn com.cmic.**
-keep class com.cmic.** {*;}
-dontwarn com.unicom.**
-keep class com.unicom.** {*;}
-dontwarn com.sdk.**
-keep class com.sdk.** {*;}
-dontwarn com.sdk.**
-keep class com.sdk.** {*;}
-dontwarn com.google.**
-keep class com.google.gson.** {*;}
-keep class com.google.protobuf.** {*;}
-keep class com.amap.api.maps.** { *; }
-keep class com.autonavi.** { *; }
-keep class com.amap.api.trace.** {*; }
-keep class com.amap.api.location.** {*; }
-keep class com.amap.api.fence.** { *; }
-keep class com.loc.** { *; }
-keep class com.amap.flutter.location.** { *; }
-keep class com.autonavi.aps.amapapi.model.** { *; }
-keep class com.amap.api.services.** { *; }
-keep class com.amap.api.maps2d.** { *; }
-keep class com.amap.api.mapcore2d.** { *; }
-keep class com.amap.api.navi.** { *; }
-keep class com.alipay.deviceid.** { *; }
-keep class net.security.device.api.** {*;}
-keep class org.json.** { *;}
-keep class com.alibaba.fastjson.** {*;}
-keep class com.alibaba.sdk.android.oss.** { *; }
-dontwarn okio.**
-dontwarn org.apache.commons.codec.binary.**
-keepclassmembers,allowobfuscation class * {
@com.alibaba.fastjson.annotation.JSONField <fields>;
}
-keep class com.tencent.mm.sdk.** { *; }
-keep class com.tencent.mm.opensdk.** { *; }
-dontwarn com.tencent.bugly.**
-keep public class com.tencent.bugly.**{*;}
-keep class com.umeng.** { *; }
-keep class com.umeng.**$* { *; }
-keep class com.umeng.message.** { *; }
-keep class com.umeng.message.**$* { *; }

View File

@ -0,0 +1,155 @@
-obfuscationdictionary ./proguard-dictionary-symbol
-classobfuscationdictionary ./proguard-dictionary-symbol
-packageobfuscationdictionary ./proguard-dictionary-symbol
#Flutter Wrapper
-keep class io.flutter.app.** { *; }
-keep class io.flutter.plugin.** { *; }
-keep class io.flutter.util.** { *; }
-keep class io.flutter.view.** { *; }
-keep class io.flutter.** { *; }
-keep class io.flutter.plugins.** { *; }
-keepattributes Signature
-keepattributes InnerClasses,EnclosingMethod
-keepattributes *Annotation*
-keepattributes SourceFile,LineNumberTable
-dontwarn com.hwangjr.rxbus.**
-keep class com.hwangjr.rxbus.** { *; }
-keepattributes *Annotation*
# Retain generic type information for use by reflection by converters and adapters.
-keepattributes Signature
# Retain declared checked exceptions for use by a Proxy instance.
-keepattributes Exceptions
-dontwarn com.jcraft.jzlib.**
-keep class com.jcraft.jzlib.** { *;}
-dontwarn sun.misc.**
-keep class sun.misc.** { *;}
-dontwarn retrofit2.**
-keep class retrofit2.** { *;}
-dontwarn io.reactivex.**
-keep class io.reactivex.** { *;}
-dontwarn sun.security.**
-keep class sun.security.** { *; }
-dontwarn com.google.**
-keep class com.google.** { *;}
-keep public class android.net.http.SslError
-keep public class android.webkit.WebViewClient
-dontwarn android.webkit.WebView
-dontwarn android.net.http.SslError
-dontwarn android.webkit.WebViewClient
-dontwarn android.support.**
-dontwarn org.apache.**
-keep class org.apache.** { *;}
-dontwarn okhttp3.**
-keep class okhttp3.** { *;}
-keep interface okhttp3.** { *; }
-dontwarn okio.**
-keep class okio.** { *;}
-keep class **JNI* {*;}
-keep class com.lib.flutter_blue_plus.* { *; }
-ignorewarnings
-keepattributes *Annotation*
-keepattributes Exceptions
-keepattributes InnerClasses
-keepattributes Signature
-keepattributes SourceFile,LineNumberTable
-keep class com.huawei.hianalytics.**{*;}
-keep class com.huawei.updatesdk.**{*;}
-keep class com.huawei.hms.**{*;}
-keep public class * extends android.app.Service
-keep class com.heytap.msp.** { *;}
-dontwarn com.vivo.push.**
-keep class com.vivo.push.**{*; }
-keep class com.vivo.vms.**{*; }
-dontoptimize
-dontpreverify
-dontwarn cn.jpush.**
-keep class cn.jpush.** { *; }
-keep class * extends cn.jpush.android.service.JPushMessageService { *; }
-dontwarn cn.jiguang.**
-keep class cn.jiguang.** { *; }
-dontwarn cn.com.chinatelecom.**
-keep class cn.com.chinatelecom.** {*;}
-dontwarn com.ct.**
-keep class com.ct.** {*;}
-dontwarn a.a.**
-keep class a.a.** {*;}
-dontwarn com.cmic.**
-keep class com.cmic.** {*;}
-dontwarn com.unicom.**
-keep class com.unicom.** {*;}
-dontwarn com.sdk.**
-keep class com.sdk.** {*;}
-dontwarn com.sdk.**
-keep class com.sdk.** {*;}
-dontwarn com.google.**
-keep class com.google.gson.** {*;}
-keep class com.google.protobuf.** {*;}
-keep class com.amap.api.maps.** { *; }
-keep class com.autonavi.** { *; }
-keep class com.amap.api.trace.** {*; }
-keep class com.amap.api.location.** {*; }
-keep class com.amap.api.fence.** { *; }
-keep class com.loc.** { *; }
-keep class com.amap.flutter.location.** { *; }
-keep class com.autonavi.aps.amapapi.model.** { *; }
-keep class com.amap.api.services.** { *; }
-keep class com.amap.api.maps2d.** { *; }
-keep class com.amap.api.mapcore2d.** { *; }
-keep class com.amap.api.navi.** { *; }
-keep class com.alipay.deviceid.** { *; }
-keep class net.security.device.api.** {*;}
-keep class org.json.** { *;}
-keep class com.alibaba.fastjson.** {*;}
-keep class com.alibaba.sdk.android.oss.** { *; }
-dontwarn okio.**
-dontwarn org.apache.commons.codec.binary.**
-keepclassmembers,allowobfuscation class * {
@com.alibaba.fastjson.annotation.JSONField <fields>;
}
-keep class com.tencent.mm.sdk.** { *; }
-keep class com.tencent.mm.opensdk.** { *; }
-dontwarn com.tencent.bugly.**
-keep public class com.tencent.bugly.**{*;}
-keep class com.umeng.** { *; }
-keep class com.umeng.**$* { *; }
-keep class com.umeng.message.** { *; }
-keep class com.umeng.message.**$* { *; }

157
android/app/proguard-rules.pro vendored Normal file
View File

@ -0,0 +1,157 @@
-obfuscationdictionary ./proguard-dictionary-chinese
-classobfuscationdictionary ./proguard-dictionary-chinese
-packageobfuscationdictionary ./proguard-dictionary-chinese
#Flutter Wrapper
-keep class io.flutter.app.** { *; }
-keep class io.flutter.plugin.** { *; }
-keep class io.flutter.util.** { *; }
-keep class io.flutter.view.** { *; }
-keep class io.flutter.** { *; }
-keep class io.flutter.plugins.** { *; }
-keepattributes Signature
-keepattributes InnerClasses,EnclosingMethod
-keepattributes *Annotation*
-keepattributes SourceFile,LineNumberTable
-dontwarn com.hwangjr.rxbus.**
-keep class com.hwangjr.rxbus.** { *; }
-keepattributes *Annotation*
# Retain generic type information for use by reflection by converters and adapters.
-keepattributes Signature
# Retain declared checked exceptions for use by a Proxy instance.
-keepattributes Exceptions
-dontwarn com.jcraft.jzlib.**
-keep class com.jcraft.jzlib.** { *;}
-dontwarn sun.misc.**
-keep class sun.misc.** { *;}
-dontwarn retrofit2.**
-keep class retrofit2.** { *;}
-dontwarn io.reactivex.**
-keep class io.reactivex.** { *;}
-dontwarn sun.security.**
-keep class sun.security.** { *; }
-dontwarn com.google.**
-keep class com.google.** { *;}
-keep public class android.net.http.SslError
-keep public class android.webkit.WebViewClient
-dontwarn android.webkit.WebView
-dontwarn android.net.http.SslError
-dontwarn android.webkit.WebViewClient
-dontwarn android.support.**
-dontwarn org.apache.**
-keep class org.apache.** { *;}
-dontwarn okhttp3.**
-keep class okhttp3.** { *;}
-keep interface okhttp3.** { *; }
-dontwarn okio.**
-keep class okio.** { *;}
-keep class **JNI* {*;}
-keep class com.lib.flutter_blue_plus.* { *; }
-ignorewarnings
-keepattributes *Annotation*
-keepattributes Exceptions
-keepattributes InnerClasses
-keepattributes Signature
-keepattributes SourceFile,LineNumberTable
-keep class com.huawei.hianalytics.**{*;}
-keep class com.huawei.updatesdk.**{*;}
-keep class com.huawei.hms.**{*;}
-keep public class * extends android.app.Service
-keep class com.heytap.msp.** { *;}
-dontwarn com.vivo.push.**
-keep class com.vivo.push.**{*; }
-keep class com.vivo.vms.**{*; }
-dontoptimize
-dontpreverify
-dontwarn cn.jpush.**
-keep class cn.jpush.** { *; }
-keep class * extends cn.jpush.android.service.JPushMessageService { *; }
-dontwarn cn.jiguang.**
-keep class cn.jiguang.** { *; }
-dontwarn cn.jpush.**
-keep class cn.jpush.** {*;}
-dontwarn cn.jiguang.**
-keep class cn.jiguang.** {*;}
-dontwarn cn.com.chinatelecom.**
-keep class cn.com.chinatelecom.** {*;}
-dontwarn com.ct.**
-keep class com.ct.** {*;}
-dontwarn a.a.**
-keep class a.a.** {*;}
-dontwarn com.cmic.**
-keep class com.cmic.** {*;}
-dontwarn com.unicom.**
-keep class com.unicom.** {*;}
-dontwarn com.sdk.**
-keep class com.sdk.** {*;}
-dontwarn com.sdk.**
-keep class com.sdk.** {*;}
-dontwarn com.google.**
-keep class com.google.gson.** {*;}
-keep class com.google.protobuf.** {*;}
-keep class com.amap.api.maps.** { *; }
-keep class com.autonavi.** { *; }
-keep class com.amap.api.trace.** {*; }
-keep class com.amap.api.location.** {*; }
-keep class com.amap.api.fence.** { *; }
-keep class com.loc.** { *; }
-keep class com.amap.flutter.location.** { *; }
-keep class com.autonavi.aps.amapapi.model.** { *; }
-keep class com.amap.api.services.** { *; }
-keep class com.amap.api.maps2d.** { *; }
-keep class com.amap.api.mapcore2d.** { *; }
-keep class com.amap.api.navi.** { *; }
-keep class com.alipay.deviceid.** { *; }
-keep class net.security.device.api.** {*;}
-keep class org.json.** { *;}
-keep class com.alibaba.fastjson.** {*;}
-keep class com.alibaba.sdk.android.oss.** { *; }
-dontwarn okio.**
-dontwarn org.apache.commons.codec.binary.**
-keepclassmembers,allowobfuscation class * {
@com.alibaba.fastjson.annotation.JSONField <fields>;
}
-keep class com.tencent.mm.sdk.** { *; }
-keep class com.tencent.mm.opensdk.** { *; }
-keep class com.umeng.** { *; }
-keep class com.umeng.**$* { *; }
-keep class com.umeng.message.** { *; }
-keep class com.umeng.message.**$* { *; }

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Star Lock</string>
</resources>

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">星锁-dev</string>
</resources>

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Star Lock</string>
</resources>

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">星锁</string>
</resources>

View File

@ -1,80 +1,195 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" package="com.example.star_lock">
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" android:usesPermissionFlags="neverForLocation"/>
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT"/>
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<!-- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" android:maxSdkVersion="30" />-->
<!-- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" android:maxSdkVersion="30" />-->
<!--允许访问网络,必选权限-->
<uses-permission android:name="android.permission.INTERNET"/>
<!--允许获取精确位置,精准定位必选-->
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<!--允许获取粗略位置,粗略定位必选-->
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
<!--允许获取设备和运营商信息用于问题排查和网络定位无gps情况下的定位若需网络定位功能则必选-->
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<uses-permission android:name="android.permission.READ_PHONE_NUMBERS"/>
<!--允许获取网络状态用于网络定位无gps情况下的定位若需网络定位功能则必选-->
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<!--允许获取wifi网络信息用于网络定位无gps情况下的定位若需网络定位功能则必选-->
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<!--允许获取wifi状态改变用于网络定位无gps情况下的定位若需网络定位功能则必选-->
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
<!--允许写设备缓存,用于问题排查-->
<uses-permission android:name="android.permission.WRITE_SETTINGS"/>
<!--允许读设备日志,用于问题排查-->
<uses-permission android:name="android.permission.READ_LOGS" />
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.skychip.lock">
<!--相机-->
<uses-permission android:name="android.permission.CAMERA"/>
<uses-permission
android:name="android.permission.BLUETOOTH_SCAN"
android:usesPermissionFlags="neverForLocation" />
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<!--允许访问网络,必选权限-->
<uses-permission android:name="android.permission.INTERNET" />
<!--申请调用A-GPS模块-->
<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
<!--允许获取精确位置,精准定位必选-->
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<!--允许获取粗略位置,粗略定位必选-->
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<!--允许获取设备和运营商信息用于问题排查和网络定位无gps情况下的定位若需网络定位功能则必选-->
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.READ_PHONE_NUMBERS" />
<!--允许获取网络状态用于网络定位无gps情况下的定位若需网络定位功能则必选-->
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<!--允许获取wifi网络信息用于网络定位无gps情况下的定位若需网络定位功能则必选-->
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<!--允许获取wifi状态改变用于网络定位无gps情况下的定位若需网络定位功能则必选-->
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
<!--允许写设备缓存,用于问题排查-->
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
<!--允许读设备日志,用于问题排查-->
<uses-permission android:name="android.permission.READ_LOGS" />
<!--联系人-->
<uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
<!--相机-->
<uses-permission android:name="android.permission.CAMERA" />
<!--允许麦克风权限,用于录音发送-->
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
<uses-permission android:name="android.permission.GET_ACCOUNTS"/>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.REORDER_TASKS"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
<!-- 相册权限 34适配 -->
<uses-permission android:name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED" />
<!--允许麦克风权限,用于录音发送-->
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.REORDER_TASKS" />
<!-- 相册权限 34适配 -->
<uses-permission android:name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED" />
<!-- 移除 QUERY_ALL_PACKAGES 权限 -->
<uses-permission
android:name="android.permission.QUERY_ALL_PACKAGES"
tools:node="remove" />
<uses-permission android:name="com.hihonor.permission.sec.SDK_LAUNCHER" />
<application
android:name=".App"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:requestLegacyExternalStorage="true"
android:usesCleartextTraffic="true">
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.provider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_paths" />
</provider>
<meta-data
android:name="flutterEmbedding"
android:value="2" />
<meta-data android:name="com.google.firebase.messaging.default_notification_icon"
android:resource="@mipmap/ic_launcher" />
<meta-data
android:name="com.google.firebase.messaging.default_notification_channel_id"
android:value="1" /> <!-- 将您的通知渠道ID替换为您的实际ID -->
<!-- <meta-data-->
<!-- android:name="com.huawei.hms.client.appid"-->
<!-- android:value="110798531" />-->
<!-- <meta-data-->
<!-- android:name="com.huawei.hms.client.cpid"-->
<!-- android:value="1406555529261648640" />-->
<!-- <meta-data-->
<!-- android:name="OPPO_APPKEY"-->
<!-- android:value="OP-47f668c9943248118502aa58d066393b" />-->
<!-- <meta-data-->
<!-- android:name="OPPO_APPID"-->
<!-- android:value="OP-31726001" />-->
<!-- <meta-data-->
<!-- android:name="OPPO_APPSECRET"-->
<!-- android:value="OP-05723986bba64183a71530b496922450" />-->
<service
android:name="com.huawei.hms.push.HmsMessageService"
android:exported="true">
<intent-filter>
<action android:name="com.huawei.push.action.MESSAGING_EVENT" />
</intent-filter>
</service>
<application android:usesCleartextTraffic="true" android:label="@string/app_name" android:name="android.app.Application" android:icon="@mipmap/ic_launcher">
<meta-data
android:name="flutterEmbedding"
android:value="2" />
<meta-data
android:name="com.google.firebase.messaging.default_notification_channel_id"
android:value="1"/> <!-- 将您的通知渠道ID替换为您的实际ID -->
<!-- 配置定位Service -->
<service android:name="com.amap.api.location.APSService"/>
<activity android:name="com.skychip.lock.MainActivity" android:exported="true" android:screenOrientation="portrait" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
<!-- Specifies an Android theme to apply to this Activity as soon as
the Android process has started. This theme is visible to the user
while the Flutter UI initializes. After that, this theme continues
to determine the Window background behind the Flutter UI. -->
<meta-data android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme"/>
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="skysmartlock" />
</intent-filter>
<receiver
android:name="com.huawei.hms.support.api.push.PushReceiver"
android:exported="true">
<intent-filter>
<action android:name="com.huawei.android.push.intent.REGISTRATION" />
<action android:name="com.huawei.android.push.intent.RECEIVE" />
<category android:name="${applicationId}" />
</intent-filter>
</receiver>
</activity>
</application>
<!-- 配置定位Service -->
<service android:name="com.amap.api.location.APSService" />
<!-- since JPushv3.6.8 oppov2.1.0 oppo 核心功能-->
<service
android:name="cn.jpush.android.service.PluginOppoPushService"
android:exported="true"
android:permission="com.coloros.mcs.permission.SEND_MCS_MESSAGE">
<intent-filter>
<action android:name="com.coloros.mcs.action.RECEIVE_MCS_MESSAGE" />
</intent-filter>
</service>
<!-- since JPushv3.6.8 oppov2.1.0 oppo 核心功能-->
<service
android:name="com.heytap.msp.push.service.DataMessageCallbackService"
android:exported="true"
android:permission="com.heytap.mcs.permission.SEND_PUSH_MESSAGE">
<intent-filter>
<action android:name="com.heytap.mcs.action.RECEIVE_MCS_MESSAGE" />
<action android:name="com.heytap.msp.push.RECEIVE_MCS_MESSAGE" />
</intent-filter>
</service> <!--兼容Q版本-->
<activity
android:name=".MainActivity"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:exported="true"
android:hardwareAccelerated="true"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/LaunchTheme"
android:windowSoftInputMode="adjustResize">
<!-- Specifies an Android theme to apply to this Activity as soon as
the Android process has started. This theme is visible to the user
while the Flutter UI initializes. After that, this theme continues
to determine the Window background behind the Flutter UI. -->
<meta-data
android:name="io.flutter.embedding.android.NormalTheme"
android:resource="@style/NormalTheme" />
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="skysmartlock" />
</intent-filter>
</activity>
<meta-data
android:name="BUGLY_ENABLE_DEBUG"
android:value="true" />
<!-- 添加 Umeng SDK 的服务 -->
<service android:name="com.umeng.message.UmengIntentService" android:exported="false"/>
<receiver android:name="com.umeng.message.NotificationProxyBroadcastReceiver" android:exported="true" android:permission="android.permission.BROADCAST_PACKAGE_REMOVED">
<intent-filter>
<action android:name="android.intent.action.PACKAGE_REMOVED"/>
<data android:scheme="package"/>
</intent-filter>
</receiver>
</application>
</manifest>

View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<umeng_config>
<appkey>671244cf80464b33f6df9648</appkey>
<channel>Product</channel>
</umeng_config>

View File

@ -0,0 +1,14 @@
package com.skychip.lock
import io.flutter.app.FlutterApplication
import android.util.Log
import cn.jiguang.api.utils.JCollectionAuth;
class App : FlutterApplication() {
override fun onCreate() {
super.onCreate()
Log.d("MyApplication", "Application has started")
JCollectionAuth.setAuth(getApplicationContext(), false);
}
}

View File

@ -9,15 +9,26 @@ import io.flutter.plugin.common.MethodChannel
import io.flutter.embedding.engine.FlutterEngine;
import io.flutter.plugins.GeneratedPluginRegistrant
import android.bluetooth.BluetoothAdapter;
import androidx.core.content.FileProvider
import java.io.File
class MainActivity: FlutterActivity() {
class MainActivity : FlutterActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
GeneratedPluginRegistrant.registerWith(flutterEngine!!)
MethodChannel(flutterEngine?.dartExecutor!!.binaryMessenger, "starLockFlutterSend").setMethodCallHandler { call, result ->
MethodChannel(
flutterEngine?.dartExecutor!!.binaryMessenger,
"starLockFlutterSend"
).setMethodCallHandler { call, result ->
if (call.method == "loadNativeShare") {
var map = call.arguments as Map<String, String>
shareText(map["shareText"], "分享")
val map = call.arguments as Map<String, String>
val shareText = map["shareText"]
val urlToShare = map["urlToShare"]
if (urlToShare == "fileShare") {
shareFile(shareText)
} else {
shareText(shareText, "分享")
}
} else if (call.method == "sendGetBlueStatus") {
// 蓝牙是否开启
// println("收到原生的信息了 methodmethodmethod: ${call.method}")
@ -36,7 +47,10 @@ class MainActivity: FlutterActivity() {
status = "-1"
}
val flutterEngine: FlutterEngine? = this.flutterEngine // 获取你的 FlutterEngine 实例
MethodChannel(flutterEngine?.dartExecutor!!.binaryMessenger, "starLockFlutterReceive").invokeMethod("getBlueStatus", status)
MethodChannel(
flutterEngine?.dartExecutor!!.binaryMessenger,
"starLockFlutterReceive"
).invokeMethod("getBlueStatus", status)
} else {
result.notImplemented() // 没有实现的方法
}
@ -56,14 +70,45 @@ class MainActivity: FlutterActivity() {
startActivity(Intent.createChooser(shareIntent, null))
}
fun shareFile(filePath: String?) {
if (filePath == null) {
return
}
val file = File(filePath)
if (!file.exists()) {
Log.e("File Share", "文件不存在: $filePath")
return
}
val uri: Uri = FileProvider.getUriForFile(
this,
"${packageName}.provider",
file
)
val shareIntent = Intent().apply {
action = Intent.ACTION_SEND
putExtra(Intent.EXTRA_STREAM, uri)
type = "application/octet-stream"
addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
}
startActivity(Intent.createChooser(shareIntent, null))
}
override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
GeneratedPluginRegistrant.registerWith(flutterEngine);
MethodChannel(flutterEngine.dartExecutor.binaryMessenger, "starLockFlutterSend").setMethodCallHandler {
call, result ->
println("methodmethodmethod: ${call.method}")
// 在这里处理从 Flutter 发送过来的方法调用
GeneratedPluginRegistrant.registerWith(flutterEngine)
MethodChannel(
flutterEngine.dartExecutor.binaryMessenger,
"starLockFlutterSend"
).setMethodCallHandler { call, result ->
if (call.method == "loadNativeShare") {
println("methodmethodmethod: ${call.method}")
val map = call.arguments as Map<String, String>
val shareText = map["shareText"]
val urlToShare = map["urlToShare"]
if (urlToShare == "fileShare") {
shareFile(shareText)
} else {
shareText(shareText, "分享")
}
} else {
result.notImplemented()
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 214 B

View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 设置背景颜色为透明 -->
<solid android:color="@android:color/transparent"/>
</shape>

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources xmlns:tools="http://schemas.android.com/tools"
tools:keep="@drawable/sky_login_btn_normal,@drawable/xhj_login_btn_normal,@drawable/icon_left_grey,@drawable/check,@drawable/uncheck"/>

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Star Lock</string>
</resources>

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">星锁</string>
</resources>

View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<paths>
<root-path name="root-path" path="."/>
<files-path name="files" path="."/>
<cache-path name="cache" path="."/>
<external-files-path name="external_files" path="."/>
</paths>

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Star Lock</string>
</resources>

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">星锁</string>
</resources>

View File

@ -0,0 +1,96 @@
{
"agcgw":{
"backurl":"connect-drcn.hispace.hicloud.com",
"url":"connect-drcn.dbankcloud.cn",
"websocketbackurl":"connect-ws-drcn.hispace.dbankcloud.com",
"websocketurl":"connect-ws-drcn.hispace.dbankcloud.cn"
},
"agcgw_all":{
"CN":"connect-drcn.dbankcloud.cn",
"CN_back":"connect-drcn.hispace.hicloud.com",
"DE":"connect-dre.dbankcloud.cn",
"DE_back":"connect-dre.hispace.hicloud.com",
"RU":"connect-drru.hispace.dbankcloud.ru",
"RU_back":"connect-drru.hispace.dbankcloud.cn",
"SG":"connect-dra.dbankcloud.cn",
"SG_back":"connect-dra.hispace.hicloud.com"
},
"websocketgw_all":{
"CN":"connect-ws-drcn.hispace.dbankcloud.cn",
"CN_back":"connect-ws-drcn.hispace.dbankcloud.com",
"DE":"connect-ws-dre.hispace.dbankcloud.cn",
"DE_back":"connect-ws-dre.hispace.dbankcloud.com",
"RU":"connect-ws-drru.hispace.dbankcloud.ru",
"RU_back":"connect-ws-drru.hispace.dbankcloud.cn",
"SG":"connect-ws-dra.hispace.dbankcloud.cn",
"SG_back":"connect-ws-dra.hispace.dbankcloud.com"
},
"client":{
"cp_id":"30086000764882919",
"product_id":"388421841222019909",
"client_id":"1376040077926370048",
"client_secret":"FE068E768F2B897A291DFFD186E0C0E495BE4BE6CCD7C5973B6C02ADF9178916",
"project_id":"388421841222019909",
"app_id":"110413691",
"api_key":"DAEDAG1Mu4qubka2IheS5XVoQQIyqAr2tU+VyLcUukdN4iHjP9FZRI16fUIhWz+lsz8si57hQ/gjoNNvQBmgglsT5jnXFcnY4nF1wQ==",
"package_name":"com.skychip.lock"
},
"oauth_client":{
"client_id":"110413691",
"client_type":1
},
"app_info":{
"app_id":"110413691",
"package_name":"com.skychip.lock"
},
"service":{
"analytics":{
"collector_url":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
"collector_url_ru":"datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com",
"collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
"collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
"collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
"resource_id":"p1",
"channel_id":""
},
"edukit":{
"edu_url":"edukit.cloud.huawei.com.cn",
"dh_url":"edukit.cloud.huawei.com.cn"
},
"search":{
"url":"https://search-drcn.cloud.huawei.com"
},
"cloudstorage":{
"storage_url_sg_back":"https://agc-storage-dra.cloud.huawei.asia",
"storage_url_ru_back":"https://agc-storage-drru.cloud.huawei.ru",
"storage_url_ru":"https://agc-storage-drru.cloud.huawei.ru",
"storage_url_de_back":"https://agc-storage-dre.cloud.huawei.eu",
"storage_url_de":"https://ops-dre.agcstorage.link",
"storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn",
"storage_url_sg":"https://ops-dra.agcstorage.link",
"storage_url_cn_back":"https://agc-storage-drcn.cloud.huawei.com.cn",
"storage_url_cn":"https://agc-storage-drcn.platform.dbankcloud.cn"
},
"ml":{
"mlservice_url":"ml-api-drcn.ai.dbankcloud.com,ml-api-drcn.ai.dbankcloud.cn"
}
},
"region":"CN",
"configuration_version":"3.0",
"appInfos":[
{
"package_name":"com.skychip.lock",
"client":{
"app_id":"110413691"
},
"app_info":{
"package_name":"com.skychip.lock",
"app_id":"110413691"
},
"oauth_client":{
"client_type":1,
"client_id":"110413691"
}
}
]
}

View File

@ -0,0 +1,48 @@
{
"project_info": {
"project_number": "281500445726",
"project_id": "skychip2023-ecdff",
"storage_bucket": "skychip2023-ecdff.firebasestorage.app"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:281500445726:android:ddf52ac7b7f83cf5c4d20f",
"android_client_info": {
"package_name": "com.skychip.lock"
}
},
"oauth_client": [],
"api_key": [
{
"current_key": "AIzaSyC-3-ABWuy9LrYyAw_KxDRto4DanQ0sq9g"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": []
}
}
},
{
"client_info": {
"mobilesdk_app_id": "1:281500445726:android:468195b9cc68dd6cc4d20f",
"android_client_info": {
"package_name": "com.starlock.lock.local"
}
},
"oauth_client": [],
"api_key": [
{
"current_key": "AIzaSyC-3-ABWuy9LrYyAw_KxDRto4DanQ0sq9g"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": []
}
}
}
],
"configuration_version": "1"
}

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">TTLock Pro</string>
</resources>

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">锁通通</string>
</resources>

View File

@ -0,0 +1,96 @@
{
"agcgw":{
"backurl":"connect-drcn.hispace.hicloud.com",
"url":"connect-drcn.dbankcloud.cn",
"websocketbackurl":"connect-ws-drcn.hispace.dbankcloud.com",
"websocketurl":"connect-ws-drcn.hispace.dbankcloud.cn"
},
"agcgw_all":{
"CN":"connect-drcn.dbankcloud.cn",
"CN_back":"connect-drcn.hispace.hicloud.com",
"DE":"connect-dre.dbankcloud.cn",
"DE_back":"connect-dre.hispace.hicloud.com",
"RU":"connect-drru.hispace.dbankcloud.ru",
"RU_back":"connect-drru.hispace.dbankcloud.cn",
"SG":"connect-dra.dbankcloud.cn",
"SG_back":"connect-dra.hispace.hicloud.com"
},
"websocketgw_all":{
"CN":"connect-ws-drcn.hispace.dbankcloud.cn",
"CN_back":"connect-ws-drcn.hispace.dbankcloud.com",
"DE":"connect-ws-dre.hispace.dbankcloud.cn",
"DE_back":"connect-ws-dre.hispace.dbankcloud.com",
"RU":"connect-ws-drru.hispace.dbankcloud.ru",
"RU_back":"connect-ws-drru.hispace.dbankcloud.cn",
"SG":"connect-ws-dra.hispace.dbankcloud.cn",
"SG_back":"connect-ws-dra.hispace.dbankcloud.com"
},
"client":{
"cp_id":"30086000752967166",
"product_id":"388421841222116270",
"client_id":"1406555529261648640",
"client_secret":"843E8191B02B692239726CF0ED990E1EC2B31928F825AA012B932A128FD2C516",
"project_id":"388421841222116270",
"app_id":"110798531",
"api_key":"DQEDAALnPCtuCgoYOyZfsIDa9/YZZhQ+buDGpypeurXhQUGMajWcVyYLQgXXqV3x2HbI6oyG+Wm2Gf+1hPs6j+wA3B6ylYAXG4aAQA==",
"package_name":"com.skychip.lock.dev"
},
"oauth_client":{
"client_id":"110798531",
"client_type":1
},
"app_info":{
"app_id":"110798531",
"package_name":"com.skychip.lock.dev"
},
"service":{
"analytics":{
"collector_url":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
"collector_url_ru":"datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com",
"collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
"collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
"collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
"resource_id":"p1",
"channel_id":""
},
"edukit":{
"edu_url":"edukit.cloud.huawei.com.cn",
"dh_url":"edukit.cloud.huawei.com.cn"
},
"search":{
"url":"https://search-drcn.cloud.huawei.com"
},
"cloudstorage":{
"storage_url_sg_back":"https://agc-storage-dra.cloud.huawei.asia",
"storage_url_ru_back":"https://agc-storage-drru.cloud.huawei.ru",
"storage_url_ru":"https://agc-storage-drru.cloud.huawei.ru",
"storage_url_de_back":"https://agc-storage-dre.cloud.huawei.eu",
"storage_url_de":"https://ops-dre.agcstorage.link",
"storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn",
"storage_url_sg":"https://ops-dra.agcstorage.link",
"storage_url_cn_back":"https://agc-storage-drcn.cloud.huawei.com.cn",
"storage_url_cn":"https://agc-storage-drcn.platform.dbankcloud.cn"
},
"ml":{
"mlservice_url":"ml-api-drcn.ai.dbankcloud.com,ml-api-drcn.ai.dbankcloud.cn"
}
},
"region":"CN",
"configuration_version":"3.0",
"appInfos":[
{
"package_name":"com.skychip.lock.dev",
"client":{
"app_id":"110798531"
},
"app_info":{
"package_name":"com.skychip.lock.dev",
"app_id":"110798531"
},
"oauth_client":{
"client_type":1,
"client_id":"110798531"
}
}
]
}

View File

@ -0,0 +1,48 @@
{
"project_info": {
"project_number": "281500445726",
"project_id": "skychip2023-ecdff",
"storage_bucket": "skychip2023-ecdff.firebasestorage.app"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:281500445726:android:ddf52ac7b7f83cf5c4d20f",
"android_client_info": {
"package_name": "com.skychip.lock.dev"
}
},
"oauth_client": [],
"api_key": [
{
"current_key": "AIzaSyC-3-ABWuy9LrYyAw_KxDRto4DanQ0sq9g"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": []
}
}
},
{
"client_info": {
"mobilesdk_app_id": "1:281500445726:android:468195b9cc68dd6cc4d20f",
"android_client_info": {
"package_name": "com.starlock.lock.local"
}
},
"oauth_client": [],
"api_key": [
{
"current_key": "AIzaSyC-3-ABWuy9LrYyAw_KxDRto4DanQ0sq9g"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": []
}
}
}
],
"configuration_version": "1"
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

View File

@ -0,0 +1,96 @@
{
"agcgw":{
"backurl":"connect-drcn.hispace.hicloud.com",
"url":"connect-drcn.dbankcloud.cn",
"websocketbackurl":"connect-ws-drcn.hispace.dbankcloud.com",
"websocketurl":"connect-ws-drcn.hispace.dbankcloud.cn"
},
"agcgw_all":{
"CN":"connect-drcn.dbankcloud.cn",
"CN_back":"connect-drcn.hispace.hicloud.com",
"DE":"connect-dre.dbankcloud.cn",
"DE_back":"connect-dre.hispace.hicloud.com",
"RU":"connect-drru.hispace.dbankcloud.ru",
"RU_back":"connect-drru.hispace.dbankcloud.cn",
"SG":"connect-dra.dbankcloud.cn",
"SG_back":"connect-dra.hispace.hicloud.com"
},
"websocketgw_all":{
"CN":"connect-ws-drcn.hispace.dbankcloud.cn",
"CN_back":"connect-ws-drcn.hispace.dbankcloud.com",
"DE":"connect-ws-dre.hispace.dbankcloud.cn",
"DE_back":"connect-ws-dre.hispace.dbankcloud.com",
"RU":"connect-ws-drru.hispace.dbankcloud.ru",
"RU_back":"connect-ws-drru.hispace.dbankcloud.cn",
"SG":"connect-ws-dra.hispace.dbankcloud.cn",
"SG_back":"connect-ws-dra.hispace.dbankcloud.com"
},
"client":{
"cp_id":"30086000752967166",
"product_id":"388421841222116270",
"client_id":"1406555529261648640",
"client_secret":"843E8191B02B692239726CF0ED990E1EC2B31928F825AA012B932A128FD2C516",
"project_id":"388421841222116270",
"app_id":"110798531",
"api_key":"DQEDAALnPCtuCgoYOyZfsIDa9/YZZhQ+buDGpypeurXhQUGMajWcVyYLQgXXqV3x2HbI6oyG+Wm2Gf+1hPs6j+wA3B6ylYAXG4aAQA==",
"package_name":"com.skychip.lock.pre"
},
"oauth_client":{
"client_id":"110798531",
"client_type":1
},
"app_info":{
"app_id":"110798531",
"package_name":"com.skychip.lock.pre"
},
"service":{
"analytics":{
"collector_url":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
"collector_url_ru":"datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com",
"collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
"collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
"collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
"resource_id":"p1",
"channel_id":""
},
"edukit":{
"edu_url":"edukit.cloud.huawei.com.cn",
"dh_url":"edukit.cloud.huawei.com.cn"
},
"search":{
"url":"https://search-drcn.cloud.huawei.com"
},
"cloudstorage":{
"storage_url_sg_back":"https://agc-storage-dra.cloud.huawei.asia",
"storage_url_ru_back":"https://agc-storage-drru.cloud.huawei.ru",
"storage_url_ru":"https://agc-storage-drru.cloud.huawei.ru",
"storage_url_de_back":"https://agc-storage-dre.cloud.huawei.eu",
"storage_url_de":"https://ops-dre.agcstorage.link",
"storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn",
"storage_url_sg":"https://ops-dra.agcstorage.link",
"storage_url_cn_back":"https://agc-storage-drcn.cloud.huawei.com.cn",
"storage_url_cn":"https://agc-storage-drcn.platform.dbankcloud.cn"
},
"ml":{
"mlservice_url":"ml-api-drcn.ai.dbankcloud.com,ml-api-drcn.ai.dbankcloud.cn"
}
},
"region":"CN",
"configuration_version":"3.0",
"appInfos":[
{
"package_name":"com.skychip.lock.pre",
"client":{
"app_id":"110798531"
},
"app_info":{
"package_name":"com.skychip.lock.pre",
"app_id":"110798531"
},
"oauth_client":{
"client_type":1,
"client_id":"110798531"
}
}
]
}

View File

@ -0,0 +1,48 @@
{
"project_info": {
"project_number": "281500445726",
"project_id": "skychip2023-ecdff",
"storage_bucket": "skychip2023-ecdff.firebasestorage.app"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:281500445726:android:ddf52ac7b7f83cf5c4d",
"android_client_info": {
"package_name": "com.skychip.lock.pre"
}
},
"oauth_client": [],
"api_key": [
{
"current_key": "AIzaSyC-3-ABWuy9LrYyAw_KxDRto4DanQ"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": []
}
}
},
{
"client_info": {
"mobilesdk_app_id": "1:281500445726:android:468195b9cc68dd6cc",
"android_client_info": {
"package_name": "com.starlock.lock.local"
}
},
"oauth_client": [],
"api_key": [
{
"current_key": "AIzaSyC-3-ABWuy9LrYyAw_KxDRto4DanQ0sq9g"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": []
}
}
}
],
"configuration_version": "1"
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">TTLock Pro-P</string>
</resources>

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">锁通通-P</string>
</resources>

View File

@ -0,0 +1,96 @@
{
"agcgw":{
"backurl":"connect-drcn.hispace.hicloud.com",
"url":"connect-drcn.dbankcloud.cn",
"websocketbackurl":"connect-ws-drcn.hispace.dbankcloud.com",
"websocketurl":"connect-ws-drcn.hispace.dbankcloud.cn"
},
"agcgw_all":{
"CN":"connect-drcn.dbankcloud.cn",
"CN_back":"connect-drcn.hispace.hicloud.com",
"DE":"connect-dre.dbankcloud.cn",
"DE_back":"connect-dre.hispace.hicloud.com",
"RU":"connect-drru.hispace.dbankcloud.ru",
"RU_back":"connect-drru.hispace.dbankcloud.cn",
"SG":"connect-dra.dbankcloud.cn",
"SG_back":"connect-dra.hispace.hicloud.com"
},
"websocketgw_all":{
"CN":"connect-ws-drcn.hispace.dbankcloud.cn",
"CN_back":"connect-ws-drcn.hispace.dbankcloud.com",
"DE":"connect-ws-dre.hispace.dbankcloud.cn",
"DE_back":"connect-ws-dre.hispace.dbankcloud.com",
"RU":"connect-ws-drru.hispace.dbankcloud.ru",
"RU_back":"connect-ws-drru.hispace.dbankcloud.cn",
"SG":"connect-ws-dra.hispace.dbankcloud.cn",
"SG_back":"connect-ws-dra.hispace.dbankcloud.com"
},
"client":{
"cp_id":"30086000752967166",
"product_id":"388421841222116270",
"client_id":"1406555529261648640",
"client_secret":"843E8191B02B692239726CF0ED990E1EC2B31928F825AA012B932A128FD2C516",
"project_id":"388421841222116270",
"app_id":"110798531",
"api_key":"DQEDAALnPCtuCgoYOyZfsIDa9/YZZhQ+buDGpypeurXhQUGMajWcVyYLQgXXqV3x2HbI6oyG+Wm2Gf+1hPs6j+wA3B6ylYAXG4aAQA==",
"package_name":"com.xhjcn.lock"
},
"oauth_client":{
"client_id":"110798531",
"client_type":1
},
"app_info":{
"app_id":"110798531",
"package_name":"com.xhjcn.lock"
},
"service":{
"analytics":{
"collector_url":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
"collector_url_ru":"datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com",
"collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
"collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
"collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
"resource_id":"p1",
"channel_id":""
},
"edukit":{
"edu_url":"edukit.cloud.huawei.com.cn",
"dh_url":"edukit.cloud.huawei.com.cn"
},
"search":{
"url":"https://search-drcn.cloud.huawei.com"
},
"cloudstorage":{
"storage_url_sg_back":"https://agc-storage-dra.cloud.huawei.asia",
"storage_url_ru_back":"https://agc-storage-drru.cloud.huawei.ru",
"storage_url_ru":"https://agc-storage-drru.cloud.huawei.ru",
"storage_url_de_back":"https://agc-storage-dre.cloud.huawei.eu",
"storage_url_de":"https://ops-dre.agcstorage.link",
"storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn",
"storage_url_sg":"https://ops-dra.agcstorage.link",
"storage_url_cn_back":"https://agc-storage-drcn.cloud.huawei.com.cn",
"storage_url_cn":"https://agc-storage-drcn.platform.dbankcloud.cn"
},
"ml":{
"mlservice_url":"ml-api-drcn.ai.dbankcloud.com,ml-api-drcn.ai.dbankcloud.cn"
}
},
"region":"CN",
"configuration_version":"3.0",
"appInfos":[
{
"package_name":"com.xhjcn.lock",
"client":{
"app_id":"110798531"
},
"app_info":{
"package_name":"com.xhjcn.lock",
"app_id":"110798531"
},
"oauth_client":{
"client_type":1,
"client_id":"110798531"
}
}
]
}

View File

@ -0,0 +1,48 @@
{
"project_info": {
"project_number": "28150044todo",
"project_id": "skychip2023-etodo",
"storage_bucket": "skychip2023-etodo.firebasestorage.app"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:281500445726:android:ddf52ac7b7f83cf5c4todo",
"android_client_info": {
"package_name": "com.xhjcn.lock"
}
},
"oauth_client": [],
"api_key": [
{
"current_key": "AIzaSyC-3-ABWuy9LrYyAw_KxDRto4DanQ0todo"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": []
}
}
},
{
"client_info": {
"mobilesdk_app_id": "1:281500445726:android:468195b9cc68dd6cc4todo",
"android_client_info": {
"package_name": "com.xhjcn.lock.local"
}
},
"oauth_client": [],
"api_key": [
{
"current_key": "AIzaSyC-3-ABWuy9LrYyAw_KxDRto4Dank9todo"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": []
}
}
}
],
"configuration_version": "1"
}

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Star Lock</string>
</resources>

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">星星锁</string>
</resources>

View File

@ -0,0 +1,96 @@
{
"agcgw":{
"backurl":"connect-drcn.hispace.hicloud.com",
"url":"connect-drcn.dbankcloud.cn",
"websocketbackurl":"connect-ws-drcn.hispace.dbankcloud.com",
"websocketurl":"connect-ws-drcn.hispace.dbankcloud.cn"
},
"agcgw_all":{
"CN":"connect-drcn.dbankcloud.cn",
"CN_back":"connect-drcn.hispace.hicloud.com",
"DE":"connect-dre.dbankcloud.cn",
"DE_back":"connect-dre.hispace.hicloud.com",
"RU":"connect-drru.hispace.dbankcloud.ru",
"RU_back":"connect-drru.hispace.dbankcloud.cn",
"SG":"connect-dra.dbankcloud.cn",
"SG_back":"connect-dra.hispace.hicloud.com"
},
"websocketgw_all":{
"CN":"connect-ws-drcn.hispace.dbankcloud.cn",
"CN_back":"connect-ws-drcn.hispace.dbankcloud.com",
"DE":"connect-ws-dre.hispace.dbankcloud.cn",
"DE_back":"connect-ws-dre.hispace.dbankcloud.com",
"RU":"connect-ws-drru.hispace.dbankcloud.ru",
"RU_back":"connect-ws-drru.hispace.dbankcloud.cn",
"SG":"connect-ws-dra.hispace.dbankcloud.cn",
"SG_back":"connect-ws-dra.hispace.dbankcloud.com"
},
"client":{
"cp_id":"30086000752967166",
"product_id":"388421841222116270",
"client_id":"1406555529261648640",
"client_secret":"843E8191B02B692239726CF0ED990E1EC2B31928F825AA012B932A128FD2C516",
"project_id":"388421841222116270",
"app_id":"110798531",
"api_key":"DQEDAALnPCtuCgoYOyZfsIDa9/YZZhQ+buDGpypeurXhQUGMajWcVyYLQgXXqV3x2HbI6oyG+Wm2Gf+1hPs6j+wA3B6ylYAXG4aAQA==",
"package_name":"ltd.xhjcn.lock"
},
"oauth_client":{
"client_id":"110798531",
"client_type":1
},
"app_info":{
"app_id":"110798531",
"package_name":"ltd.xhjcn.lock"
},
"service":{
"analytics":{
"collector_url":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
"collector_url_ru":"datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com",
"collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
"collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
"collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
"resource_id":"p1",
"channel_id":""
},
"edukit":{
"edu_url":"edukit.cloud.huawei.com.cn",
"dh_url":"edukit.cloud.huawei.com.cn"
},
"search":{
"url":"https://search-drcn.cloud.huawei.com"
},
"cloudstorage":{
"storage_url_sg_back":"https://agc-storage-dra.cloud.huawei.asia",
"storage_url_ru_back":"https://agc-storage-drru.cloud.huawei.ru",
"storage_url_ru":"https://agc-storage-drru.cloud.huawei.ru",
"storage_url_de_back":"https://agc-storage-dre.cloud.huawei.eu",
"storage_url_de":"https://ops-dre.agcstorage.link",
"storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn",
"storage_url_sg":"https://ops-dra.agcstorage.link",
"storage_url_cn_back":"https://agc-storage-drcn.cloud.huawei.com.cn",
"storage_url_cn":"https://agc-storage-drcn.platform.dbankcloud.cn"
},
"ml":{
"mlservice_url":"ml-api-drcn.ai.dbankcloud.com,ml-api-drcn.ai.dbankcloud.cn"
}
},
"region":"CN",
"configuration_version":"3.0",
"appInfos":[
{
"package_name":"ltd.xhjcn.lock",
"client":{
"app_id":"110798531"
},
"app_info":{
"package_name":"ltd.xhjcn.lock",
"app_id":"110798531"
},
"oauth_client":{
"client_type":1,
"client_id":"110798531"
}
}
]
}

View File

@ -0,0 +1,29 @@
{
"project_info": {
"project_number": "448746601330",
"project_id": "smart-lock-12b8c",
"storage_bucket": "smart-lock-12b8c.firebasestorage.app"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:448746601330:android:1a8056175e1dad5e317beb",
"android_client_info": {
"package_name": "ltd.xhjcn.lock"
}
},
"oauth_client": [],
"api_key": [
{
"current_key": "AIzaSyAm8dJlBY5hjslJDVDBNd2bkWrJlGjAMqw"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": []
}
}
}
],
"configuration_version": "1"
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 KiB

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Star Lock</string>
</resources>

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">星星锁</string>
</resources>

View File

@ -0,0 +1,96 @@
{
"agcgw":{
"backurl":"connect-drcn.hispace.hicloud.com",
"url":"connect-drcn.dbankcloud.cn",
"websocketbackurl":"connect-ws-drcn.hispace.dbankcloud.com",
"websocketurl":"connect-ws-drcn.hispace.dbankcloud.cn"
},
"agcgw_all":{
"CN":"connect-drcn.dbankcloud.cn",
"CN_back":"connect-drcn.hispace.hicloud.com",
"DE":"connect-dre.dbankcloud.cn",
"DE_back":"connect-dre.hispace.hicloud.com",
"RU":"connect-drru.hispace.dbankcloud.ru",
"RU_back":"connect-drru.hispace.dbankcloud.cn",
"SG":"connect-dra.dbankcloud.cn",
"SG_back":"connect-dra.hispace.hicloud.com"
},
"websocketgw_all":{
"CN":"connect-ws-drcn.hispace.dbankcloud.cn",
"CN_back":"connect-ws-drcn.hispace.dbankcloud.com",
"DE":"connect-ws-dre.hispace.dbankcloud.cn",
"DE_back":"connect-ws-dre.hispace.dbankcloud.com",
"RU":"connect-ws-drru.hispace.dbankcloud.ru",
"RU_back":"connect-ws-drru.hispace.dbankcloud.cn",
"SG":"connect-ws-dra.hispace.dbankcloud.cn",
"SG_back":"connect-ws-dra.hispace.dbankcloud.com"
},
"client":{
"cp_id":"30086000752967166",
"product_id":"388421841222116270",
"client_id":"1406555529261648640",
"client_secret":"843E8191B02B692239726CF0ED990E1EC2B31928F825AA012B932A128FD2C516",
"project_id":"388421841222116270",
"app_id":"110798531",
"api_key":"DQEDAALnPCtuCgoYOyZfsIDa9/YZZhQ+buDGpypeurXhQUGMajWcVyYLQgXXqV3x2HbI6oyG+Wm2Gf+1hPs6j+wA3B6ylYAXG4aAQA==",
"package_name":"com.xhjcn.lock.dev"
},
"oauth_client":{
"client_id":"110798531",
"client_type":1
},
"app_info":{
"app_id":"110798531",
"package_name":"com.xhjcn.lock.dev"
},
"service":{
"analytics":{
"collector_url":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
"collector_url_ru":"datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com",
"collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
"collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
"collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
"resource_id":"p1",
"channel_id":""
},
"edukit":{
"edu_url":"edukit.cloud.huawei.com.cn",
"dh_url":"edukit.cloud.huawei.com.cn"
},
"search":{
"url":"https://search-drcn.cloud.huawei.com"
},
"cloudstorage":{
"storage_url_sg_back":"https://agc-storage-dra.cloud.huawei.asia",
"storage_url_ru_back":"https://agc-storage-drru.cloud.huawei.ru",
"storage_url_ru":"https://agc-storage-drru.cloud.huawei.ru",
"storage_url_de_back":"https://agc-storage-dre.cloud.huawei.eu",
"storage_url_de":"https://ops-dre.agcstorage.link",
"storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn",
"storage_url_sg":"https://ops-dra.agcstorage.link",
"storage_url_cn_back":"https://agc-storage-drcn.cloud.huawei.com.cn",
"storage_url_cn":"https://agc-storage-drcn.platform.dbankcloud.cn"
},
"ml":{
"mlservice_url":"ml-api-drcn.ai.dbankcloud.com,ml-api-drcn.ai.dbankcloud.cn"
}
},
"region":"CN",
"configuration_version":"3.0",
"appInfos":[
{
"package_name":"com.xhjcn.lock.dev",
"client":{
"app_id":"110798531"
},
"app_info":{
"package_name":"com.xhjcn.lock.dev",
"app_id":"110798531"
},
"oauth_client":{
"client_type":1,
"client_id":"110798531"
}
}
]
}

View File

@ -0,0 +1,48 @@
{
"project_info": {
"project_number": "28150044todo",
"project_id": "skychip2023-etodo",
"storage_bucket": "skychip2023-etodo.firebasestorage.app"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:281500445726:android:ddf52ac7b7f83cf5c4todo",
"android_client_info": {
"package_name": "com.xhjcn.lock"
}
},
"oauth_client": [],
"api_key": [
{
"current_key": "AIzaSyC-3-ABWuy9LrYyAw_KxDRto4DanQ0todo"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": []
}
}
},
{
"client_info": {
"mobilesdk_app_id": "1:281500445726:android:468195b9cc68dd6cc4todo",
"android_client_info": {
"package_name": "com.xhjcn.lock.local"
}
},
"oauth_client": [],
"api_key": [
{
"current_key": "AIzaSyC-3-ABWuy9LrYyAw_KxDRto4Dank9todo"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": []
}
}
}
],
"configuration_version": "1"
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 KiB

View File

@ -0,0 +1,96 @@
{
"agcgw":{
"backurl":"connect-drcn.hispace.hicloud.com",
"url":"connect-drcn.dbankcloud.cn",
"websocketbackurl":"connect-ws-drcn.hispace.dbankcloud.com",
"websocketurl":"connect-ws-drcn.hispace.dbankcloud.cn"
},
"agcgw_all":{
"CN":"connect-drcn.dbankcloud.cn",
"CN_back":"connect-drcn.hispace.hicloud.com",
"DE":"connect-dre.dbankcloud.cn",
"DE_back":"connect-dre.hispace.hicloud.com",
"RU":"connect-drru.hispace.dbankcloud.ru",
"RU_back":"connect-drru.hispace.dbankcloud.cn",
"SG":"connect-dra.dbankcloud.cn",
"SG_back":"connect-dra.hispace.hicloud.com"
},
"websocketgw_all":{
"CN":"connect-ws-drcn.hispace.dbankcloud.cn",
"CN_back":"connect-ws-drcn.hispace.dbankcloud.com",
"DE":"connect-ws-dre.hispace.dbankcloud.cn",
"DE_back":"connect-ws-dre.hispace.dbankcloud.com",
"RU":"connect-ws-drru.hispace.dbankcloud.ru",
"RU_back":"connect-ws-drru.hispace.dbankcloud.cn",
"SG":"connect-ws-dra.hispace.dbankcloud.cn",
"SG_back":"connect-ws-dra.hispace.dbankcloud.com"
},
"client":{
"cp_id":"30086000752967166",
"product_id":"388421841222116270",
"client_id":"1406555529261648640",
"client_secret":"843E8191B02B692239726CF0ED990E1EC2B31928F825AA012B932A128FD2C516",
"project_id":"388421841222116270",
"app_id":"110798531",
"api_key":"DQEDAALnPCtuCgoYOyZfsIDa9/YZZhQ+buDGpypeurXhQUGMajWcVyYLQgXXqV3x2HbI6oyG+Wm2Gf+1hPs6j+wA3B6ylYAXG4aAQA==",
"package_name":"com.xhjcn.lock.pre"
},
"oauth_client":{
"client_id":"110798531",
"client_type":1
},
"app_info":{
"app_id":"110798531",
"package_name":"com.xhjcn.lock.pre"
},
"service":{
"analytics":{
"collector_url":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
"collector_url_ru":"datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com",
"collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
"collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
"collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
"resource_id":"p1",
"channel_id":""
},
"edukit":{
"edu_url":"edukit.cloud.huawei.com.cn",
"dh_url":"edukit.cloud.huawei.com.cn"
},
"search":{
"url":"https://search-drcn.cloud.huawei.com"
},
"cloudstorage":{
"storage_url_sg_back":"https://agc-storage-dra.cloud.huawei.asia",
"storage_url_ru_back":"https://agc-storage-drru.cloud.huawei.ru",
"storage_url_ru":"https://agc-storage-drru.cloud.huawei.ru",
"storage_url_de_back":"https://agc-storage-dre.cloud.huawei.eu",
"storage_url_de":"https://ops-dre.agcstorage.link",
"storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn",
"storage_url_sg":"https://ops-dra.agcstorage.link",
"storage_url_cn_back":"https://agc-storage-drcn.cloud.huawei.com.cn",
"storage_url_cn":"https://agc-storage-drcn.platform.dbankcloud.cn"
},
"ml":{
"mlservice_url":"ml-api-drcn.ai.dbankcloud.com,ml-api-drcn.ai.dbankcloud.cn"
}
},
"region":"CN",
"configuration_version":"3.0",
"appInfos":[
{
"package_name":"com.xhjcn.lock.pre",
"client":{
"app_id":"110798531"
},
"app_info":{
"package_name":"com.xhjcn.lock.pre",
"app_id":"110798531"
},
"oauth_client":{
"client_type":1,
"client_id":"110798531"
}
}
]
}

View File

@ -0,0 +1,48 @@
{
"project_info": {
"project_number": "28150044todo",
"project_id": "skychip2023-etodo",
"storage_bucket": "skychip2023-etodo.firebasestorage.app"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:281500445726:android:ddf52ac7b7f83cf5c4todo",
"android_client_info": {
"package_name": "com.xhjcn.lock.pre"
}
},
"oauth_client": [],
"api_key": [
{
"current_key": "AIzaSyC-3-ABWuy9LrYyAw_KxDRto4DanQ0todo"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": []
}
}
},
{
"client_info": {
"mobilesdk_app_id": "1:281500445726:android:468195b9cc68dd6cc4todo",
"android_client_info": {
"package_name": "com.xhjcn.lock.pre"
}
},
"oauth_client": [],
"api_key": [
{
"current_key": "AIzaSyC-3-ABWuy9LrYyAw_KxDRto4Dank9todo"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": []
}
}
}
],
"configuration_version": "1"
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 KiB

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Star Lock-P</string>
</resources>

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">星星锁-P</string>
</resources>

BIN
android/app/xhj_bundle.jks Normal file

Binary file not shown.

View File

@ -1,10 +1,13 @@
buildscript {
ext.kotlin_version = '1.8.20'
repositories {
maven { url 'https://maven.aliyun.com/repository/public'}
maven { url 'https://maven.aliyun.com/repository/gradle-plugin'}
google()
mavenCentral()
mavenLocal()
// hms
// maven { url 'https://maven.aliyun.com/repository/central'}
maven { url 'https://developer.huawei.com/repo/'}
// fcm FCM
maven { url "https://maven.google.com" }
@ -18,13 +21,16 @@ buildscript {
// hms
classpath 'com.huawei.agconnect:agcp:1.6.0.300'
//
classpath "com.github.qq549631030:android-junk-code:1.3.3"
// classpath "com.github.qq549631030:android-junk-code:1.3.3"
classpath'com.tencent.mm:AndResGuard-gradle-plugin:1.2.21'
}
}
allprojects {
repositories {
maven { url 'https://maven.aliyun.com/repository/public'}
maven { url 'https://maven.aliyun.com/repository/gradle-plugin'}
google()
mavenCentral()
jcenter()

28
android/build.sh Executable file
View File

@ -0,0 +1,28 @@
#!/bin/bash
set -e
echo "Build Params Info:Build Dir:$CI_PROJECT_DIR,Build Tag:$CI_COMMIT_TAG,Build Branch:$CI_COMMIT_BRANCH,Build BUILD_REVISION:$CI_RUNNER_REVISION"
export ENV_BUILD_TAG=${CI_COMMIT_TAG}
export ENV_BUILD_BRANCH=${CI_COMMIT_BRANCH}
export ENV_BUILD_WORKSPACE=${CI_PROJECT_DIR}
echo "GITLAB_WORKSPACE: ${CI_PROJECT_DIR}"
cd ${CI_PROJECT_DIR}/android
echo "ENV_BUILD_TAG:${ENV_BUILD_TAG},ENV_BUILD_BRANCH:${ENV_BUILD_BRANCH}"
# 只支持 v1.2.3_sky 这种tag格式
regex='^v[0-9]+\.[0-9]+\.[0-9]+_sky$'
if [[ "${ENV_BUILD_BRANCH}" == "canary_release_sky" ]]; then
echo "===build canary_release: ${NEXT_VERSION}"
export ENV_BUILD_TAG=${NEXT_VERSION}
bundle exec fastlane release_apk flavor:sky --verbose
elif [[ $ENV_BUILD_TAG =~ $regex ]]; then
echo "===build release===$ENV_BUILD_TAG"
bundle exec fastlane release_apk flavor:sky --verbose
bundle exec fastlane release_bundle flavor:sky --verbose
elif [[ "${ENV_BUILD_BRANCH}" == "develop_sky" ]]; then
echo "===build dev===${NEXT_VERSION}"
bundle exec fastlane beta flavor:sky env:dev --verbose
elif [[ "${ENV_BUILD_BRANCH}" == "release_sky" || "${ENV_BUILD_BRANCH}" == "feat_devops_sky" ]] ; then
echo "===build pre===${NEXT_VERSION}"
bundle exec fastlane beta flavor:sky env:pre --verbose
fi
exit 0

2
android/fastlane/Appfile Normal file
View File

@ -0,0 +1,2 @@
json_key_file("") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one
package_name("") # e.g. com.krausefx.app

177
android/fastlane/Fastfile Normal file
View File

@ -0,0 +1,177 @@
# This file contains the fastlane.tools configuration
# You can find the documentation at https://docs.fastlane.tools
#
# For a list of all available actions, check out
#
# https://docs.fastlane.tools/actions
#
# For a list of all available plugins, check out
#
# https://docs.fastlane.tools/plugins/available-plugins
#
# Uncomment the line if you want fastlane to automatically update itself
# update_fastlane
default_platform(:android)
$env_key_project_root = 'ENV_BUILD_WORKSPACE'
$env_current_branch = 'ENV_BUILD_BRANCH'
$env_current_tag = 'ENV_BUILD_TAG'
$env_next_version = 'NEXT_VERSION'
$path_dir_build = File.join(ENV[$env_key_project_root],'')
$current_branch = ENV[$env_current_branch]
$current_tag = ENV[$env_current_tag]
$next_version = ENV[$env_next_version]
$path_apk_output_dir = File.join($path_dir_build, 'build/app/outputs/flutter-apk')
$path_bundle_output_dir = File.join($path_dir_build, 'build/app/outputs/bundle')
def print_header header
UI.message "~~~~~~~~~~~~~~~~~~~~~~"
UI.message '📍 ' + header.to_s
UI.message "~~~~~~~~~~~~~~~~~~~~~~"
end
def print_log(content)
UI.message '📠 ' + content.to_s
end
platform :android do
before_all do
print_header '🏁 Before All'
print_log $current_branch
print_log $current_tag
Dir.chdir "../.." do
sh('pwd')
end
end
desc "Submit a new Beta Build to Pgy Beta"
lane :beta do |options|
env = options[:env]
UI.user_error!("env is required") unless env
print_log "build sky on #{env}"
build_number = Time.now.strftime("%Y%m%d%H")
print_log "BuildNo #{build_number}"
build_version = $next_version
print_log "build_version #{build_version}"
commit_hash = last_git_commit
short_hash = commit_hash[:abbreviated_commit_hash]
print_log "last_git_commit_short_hash #{short_hash}"
remove_zone_pre_build(zone:"com")
Dir.chdir "../.." do
sh("flutter","clean")
sh("flutter","pub","get")
sh("flutter", "build", "apk", "--no-tree-shake-icons", "--release", "--flavor", "sky_#{env}", "-t", "lib/main_sky_#{env}.dart", "--build-number=#{build_number}", "--build-name=#{build_version}")
end
old_file_path = File.join($path_apk_output_dir, "app-sky_#{env}-release.apk")
new_file_path = File.join($path_apk_output_dir, "starlock-sky-preview-#{build_version}.apk")
File.rename(old_file_path, new_file_path)
logs = changelog_from_git_commits(
pretty: '- %s (%cn)',
commits_count: 5,
merge_commit_filtering: 'exclude_merges'
)
upload_file_to_pgy(directory:$path_apk_output_dir,file_extension:".apk",logs:logs)
end
desc "Build & upload a new version to Gitlab Release"
lane :release_apk do |options|
print_log "build sky"
build_number = Time.now.strftime("%Y%m%d%H")
print_log "BuildNo #{build_number}"
build_version = $current_tag.match(/^v(\d+\.\d+\.\d+)/).captures[0]
print_log "buildVersion #{build_version}"
commit_hash = last_git_commit
short_hash = commit_hash[:abbreviated_commit_hash]
print_log "last_git_commit_short_hash #{short_hash}"
remove_zone_pre_build(zone:"com")
Dir.chdir "../.." do
sh("flutter","pub","get")
sh("flutter", "build", "apk", "--no-tree-shake-icons", "--release", "--flavor", "sky", "-t", "lib/main_sky_lite.dart", "--build-number=#{build_number}", "--build-name=#{build_version}")
end
old_apk_file_path = File.join($path_apk_output_dir, "app-sky-release.apk")
new_apk_file_path = File.join($path_apk_output_dir, "starlock-sky-release-"+$current_tag+".apk")
File.rename(old_apk_file_path, new_apk_file_path)
end
desc "Build & upload a new version to Gitlab Release"
lane :release_bundle do |options|
print_log "build sky"
build_number = Time.now.strftime("%Y%m%d%H")
print_log "BuildNo #{build_number}"
build_version = $current_tag.match(/^v(\d+\.\d+\.\d+)/).captures[0]
print_log "buildVersion #{build_version}"
commit_hash = last_git_commit
short_hash = commit_hash[:abbreviated_commit_hash]
print_log "last_git_commit_short_hash #{short_hash}"
remove_zone_pre_build(zone:"cn")
Dir.chdir "../.." do
sh("flutter","pub","get")
sh("flutter", "build", "appbundle", "--no-tree-shake-icons", "--release", "--flavor", "sky", "-t", "lib/main_sky_lite.dart", "--build-number=#{build_number}", "--build-name=#{build_version}")
end
old_bundle_file_path = File.join($path_bundle_output_dir , "/skyRelease/app-sky-release.aab")
new_bundle_file_path = File.join($path_bundle_output_dir , "/skyRelease/starlock-sky-release-"+$current_tag+".aab")
File.rename(old_bundle_file_path, new_bundle_file_path)
sh('cp',new_bundle_file_path,$path_apk_output_dir)
end
lane :upload_file_to_pgy do |options|
directory = options[:directory]
file_extension = options[:file_extension]
logs = options[:logs]
UI.user_error!("Directory path is required") unless directory
UI.user_error!("File extension is required") unless file_extension
# 使用Dir.glob来查找目录下的所有.apk和.ipa文件
Dir.glob("#{directory}/*#{file_extension}").each do |file|
# 打印文件名称
puts "start upload file: #{file}"
pgyer(api_key: ENV['PGY_API_KEY'],apk:file,update_description: logs)
File.delete(file)
end
end
lane :remove_zone_pre_build do |options|
sh("git", "reset", "--hard")
zone = options[:zone]
UI.user_error!("Please provide valid 'zone'") unless zone
pathList=["pubspec.yaml","/android/app/build.gradle","/lib/apm"]
extensions = [".dart",".gradle"] #options[:extensions]
if pathList.empty? || extensions.empty?
UI.user_error!("Please provide valid 'paths' and 'extensions' arrays.")
end
puts "start prepare zone: #{zone},pathList:#{pathList},extensions:#{extensions}"
regexp_List = [/#<#{zone}>.*?#<\/#{zone}>/m,/\/\/\<#{zone}\>.*?\/\/\<\/#{zone}\>/m]
UI.message("Processed RegExpList: #{regexp_List}")
def process_file(file_path, regexpList)
content = File.read(file_path)
regexpList.each do |tag|
content = content.gsub(tag,'')
end
File.write(file_path, content)
UI.message("Processed file: #{file_path},content :\n #{content}")
end
pathList.each do |path|
realPath = File.join($path_dir_build, path)
if File.directory?(realPath)
Dir.glob("#{realPath}/**/*").each do |file|
if File.directory?(file)
UI.message("Find child dir path: #{file}")
elsif extensions.include?(File.extname(file))
process_file(file,regexp_List)
end
end
elsif File.file?(realPath)
process_file(realPath,regexp_List)
else
UI.message("Invalid path: #{realPath}")
end
end
UI.success("All matching content removed from specified files.")
end
end

View File

@ -0,0 +1,5 @@
# Autogenerated by fastlane
#
# Ensure this file is checked in to source control!
gem 'fastlane-plugin-pgyer'

View File

@ -1,3 +1,4 @@
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
android.enableJetifier=false
android.enableR8 = true

View File

@ -2,4 +2,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
#distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
distributionUrl=https://mirrors.cloud.tencent.com/gradle/gradle-7.4-all.zip

BIN
assets/.DS_Store vendored

Binary file not shown.

119
assets/html/h264.html Normal file
View File

@ -0,0 +1,119 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<title>play</title>
</head>
<style>
html {
margin: 0;
padding: 0;
overflow: hidden;
/* 防止滚动条出现 */
}
body {
width: 100vw;
height: 100vh;
margin: 0;
padding: 0;
background-color: white;
overflow: hidden;
/* 防止滚动条出现 */
display: flex;
align-items: center;
justify-content: center;
}
#player {
object-fit: cover;
width: 100vw;
height: 100vh;
}
</style>
<body>
<video autoplay muted poster="images/loader-thumb.jpg" id="player">
</video>
<script src="jmuxer.min.js"></script>
<script>
if (typeof JMuxer === 'undefined') {
console.error("JMuxer is not defined. Check if jmuxer.min.js is loaded correctly.");
} else {
console.log("JMuxer loaded successfully.");
}
let jmuxer;
window.onload = function () {
try {
jmuxer = new JMuxer({
node: 'player',
mode: 'video',
debug: false,
readfpsfromtrack: true,
flushingTime: 0, // 立即刷新
clearBuffer: true, // 丢弃延迟帧
fps: 25, // 强制指定帧率
onReady: () => {
console.log('播放器初始化完成');
// 通知Flutter端准备就绪
window.Flutter.postMessage('ready');
},
onMissingVideoFrames: (missingFrames) => {
// console.log('Missing video frames:', missingFrames);
},
});
} catch (e) {
console.error("Error initializing JMuxer:", e);
}
};
// Feed data from Flutter
function feedDataFromFlutter(data) {
const buffer = new Uint8Array(data);
jmuxer.feed({
video: buffer,
duration: 40 // 每帧持续时间40ms25fps
});
}
// Optional: notify Flutter
function notifyFlutter(message) {
if (window.Flutter) {
window.Flutter.postMessage(message);
} else {
console.log("Flutter interface not found. Message: " + message);
}
}
// Function to return to Flutter page
function returnToFlutter() {
notifyFlutter("Returning to Flutter page");
}
// 添加清理方法
function cleanupJMuxer() {
if (jmuxer) {
try {
jmuxer.destroy();
jmuxer = null;
console.log('JMuxer cleaned up successfully');
window.Flutter.postMessage('cleanup_complete');
} catch (e) {
console.error('Error cleaning up JMuxer:', e);
window.Flutter.postMessage('cleanup_error');
}
}
}
</script>
</body>
</html>

Some files were not shown because too many files have changed in this diff Show More