490 Commits

Author SHA1 Message Date
魏少阳
f3ffea773a Merge branch 'master' of https://gitee.com/starlock-cn/app-starlock
# Conflicts:
#	star_lock/lib/mine/about/about_page.dart
#	star_lock/pubspec.yaml
2024-03-05 09:30:53 +08:00
魏少阳
91772036be 修复google因为演示模式被拒的问题 2024-03-05 09:28:04 +08:00
a6cabd25c9 口味😋: 从 pubspec.yaml 读取版本号 2024-03-04 10:11:25 +08:00
魏少阳
b8c32103f7 Merge branch 'master' of https://gitee.com/starlock-cn/app-starlock 2024-03-01 14:16:29 +08:00
魏少阳
3fecd06371 修复开锁是否联网bug 2024-03-01 14:16:23 +08:00
Daisy
57736bd860 修复选择时间格式出现的问题 2024-03-01 13:51:30 +08:00
魏少阳
4a377f380e Merge branch 'master' of https://gitee.com/starlock-cn/app-starlock
# Conflicts:
#	star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart
#	star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetailChangeDate/electronicKeyDetailChangeDate_logic.dart
#	star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetailChangeDate/electronicKeyDetailChangeDate_page.dart
#	star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetailChangeDate/electronicKeyDetailChangeDate_state.dart
#	star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_logic.dart
2024-02-29 17:53:48 +08:00
魏少阳
a628860c9c 修复考勤模块、修复授权管理员部分bug 2024-02-29 17:31:30 +08:00
Daisy
9e193f4e4a 1,推送在登录后初始化
2,授权管理员页面更新时间格式
2024-02-29 17:03:53 +08:00
Daisy
b47f8423df 1,电子钥匙循环有效期UI及逻辑修改
2,新增全局公用的时间转化格式的方法
3,修改部分请求字段类型
2024-02-29 16:08:03 +08:00
Daisy
0a855c6af2 修复部分bug 2024-02-28 18:22:55 +08:00
Daisy
872ae68c1c 补充提交 2024-02-28 15:32:31 +08:00
Daisy
db6d3e3d1e Merge branch 'master' of gitee.com:starlock-cn/app-starlock 2024-02-28 15:27:16 +08:00
Daisy
82f4fe293c 1,操作记录页面修改
2,发送电子钥匙页面修改
3,部分bug修改
2024-02-28 15:27:10 +08:00
a961c1d762 Merge remote-tracking branch 'origin/master' 2024-02-28 15:04:16 +08:00
4f8e8a9b77 口味😋: 添加Google Play发布说明 2024-02-28 15:04:08 +08:00
Daisy
027f81fb61 优化完善门锁日志页面 2024-02-27 13:52:49 +08:00
Daisy
c9ca7228f6 配件商城页面新增顶部进度条 2024-02-27 11:50:53 +08:00
Daisy
b68b9dc7da 门锁日志页提交补充 2024-02-27 09:25:33 +08:00
Daisy
cada1ff2b6 Merge branch 'master' of gitee.com:starlock-cn/app-starlock 2024-02-26 17:56:46 +08:00
Daisy
41ee8d062f 新增门锁日志页面接口数据与UI的逻辑处理 2024-02-26 17:56:30 +08:00
魏少阳
0f58f3c757 Merge branch 'master' of https://gitee.com/starlock-cn/app-starlock
# Conflicts:
#	star_lock/ios/Runner.xcodeproj/project.pbxproj
#	star_lock/lib/tools/eventBusEventManage.dart
2024-02-26 11:10:50 +08:00
魏少阳
22423607d1 修复打开APP请求权限问题,修改已知bug 2024-02-26 11:07:09 +08:00
Daisy
3d342be9fe Merge branch 'master' of gitee.com:starlock-cn/app-starlock 2024-02-25 16:13:34 +08:00
Daisy
1e8cbfb578 完善门锁日志相关逻辑 2024-02-25 16:13:11 +08:00
630ca867cd 口味😋: 添加vscode运行配置 2024-02-25 16:11:37 +08:00
魏少阳
bfbe9e0e14 修改高德地图key获取方式 2024-02-01 15:10:24 +08:00
4090e8f575 口味😋: 添加高德地图key 2024-02-01 14:53:55 +08:00
魏少阳
5ba73c2c90 解决冲突 2024-02-01 11:25:57 +08:00
魏少阳
361162414b Merge branch 'master' of https://gitee.com/starlock-cn/app-starlock
# Conflicts:
#	star_lock/lib/common/XSConstantMacro/XSConstantMacro.dart
#	star_lock/lib/network/api.dart
#	star_lock/lib/network/api_repository.dart
2024-02-01 11:24:46 +08:00
魏少阳
3bdd58d620 修复邮箱注册、邮箱登录bug 2024-02-01 11:22:44 +08:00
Daisy
3a8faadfc9 门锁日志部分提交 2024-02-01 10:52:23 +08:00
Daisy
ea530d5b95 Merge branch 'master' of gitee.com:starlock-cn/app-starlock 2024-01-30 15:34:49 +08:00
Daisy
c2aaed5ba0 完善底部添加配件区域 2024-01-30 15:34:11 +08:00
a24b9aaed7 Merge remote-tracking branch 'origin/master' 2024-01-30 12:03:37 +08:00
82eeccd2a4 口味😋: 修复run和build共存不报错(universalApk true) 2024-01-30 12:03:30 +08:00
Daisy
ca20145ca3 锁详情页面新增配件区配置(未完善) 2024-01-30 11:18:27 +08:00
skychip2023
1a5823964e 口味😋: 完成IOS口味编译 2024-01-30 10:44:28 +08:00
Daisy
2ceee5c317 移除iOS原生端旧的对讲 2024-01-30 10:18:39 +08:00
Daisy
82f04ba16d 增加 iOS暂用运行命令注释 2024-01-29 18:26:28 +08:00
Daisy
842fcbf557 Merge branch 'master' of gitee.com:starlock-cn/app-starlock
# Conflicts:
#	star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart
#	star_lock/lib/network/api.dart
2024-01-29 18:01:02 +08:00
Daisy
aab5c82670 1,新增部分人脸实体类
2,新增锁详情部分滑动(未完成)
2024-01-29 17:57:05 +08:00
a6251cbc2d Merge remote-tracking branch 'origin/master' 2024-01-29 17:48:55 +08:00
1b0a2bae34 口味😋: 修复key密码;修复run不能编译的问题 2024-01-29 17:48:49 +08:00
魏少阳
c6b0f04889 Merge branch 'master' of https://gitee.com/starlock-cn/app-starlock 2024-01-29 17:23:52 +08:00
魏少阳
ccbe402c01 修改普通用户、授权管理员开锁逻辑,修改电子钥匙、授权管理员部分bug 2024-01-29 17:23:45 +08:00
c881790eb5 口味😋: 不同口味使用各自的Android密钥库文件进行打包签名 2024-01-29 16:26:02 +08:00
44686a1ba2 口味😋: 添加idea运行配置 2024-01-27 16:27:15 +08:00
0c9e64905d 口味😋: 完成Android的口味构建 2024-01-27 16:05:17 +08:00
5b4f3c3b15 口味😋: 移除windows、macos、linux、web 2024-01-27 13:57:27 +08:00