426 Commits

Author SHA1 Message Date
0b1247249d Merge remote-tracking branch 'origin/dev_mobile' into dev_mobile_ble 2021-09-14 11:18:35 +08:00
7bd058004d 骑行和设备连接图标&发送tcp带上客户端版本号 2021-09-14 11:18:04 +08:00
e84f14250b 比赛卡片效果修改;useragent修改;微信错误提示 2021-09-14 11:14:51 +08:00
ae6769e24f 合并微调 2021-09-13 18:30:38 +08:00
939d6f1d0c Merge remote-tracking branch 'origin/dev_mobile' into dev_mobile_ble
# Conflicts:
#	Assets/Scenes/Login-Mobile.unity
2021-09-13 18:28:05 +08:00
dfb80658dd 登录增加loading&赛事提醒修改 2021-09-13 18:21:43 +08:00
969835e4d7 微信登录接入;卡片点击效果 2021-09-13 17:33:58 +08:00
51cea743be 骑行界面图标微调 2021-09-09 16:41:36 +08:00
ca51e06d37 Merge remote-tracking branch 'origin/dev_mobile' into dev_mobile_ble 2021-09-09 16:32:17 +08:00
ee1114e2cf 解决累计爬升不准问题&本地文件记录样式 2021-09-09 16:29:22 +08:00
f1f982b90c iosbug;android不需要导出项目;修改样式;可修改头像 2021-09-09 15:44:28 +08:00
50ad74bb09 赛事角标刷新;处理弹窗层次问题 2021-09-08 17:53:43 +08:00
5a148c28a8 赛事筛选;微信角标切口;选择图片功能权限问题
选择图片功能权限问题,需先导出项目,将res/xml文件夹复制到unitylibrary的res文件夹下
2021-09-08 10:29:20 +08:00
8a4657c11c Merge remote-tracking branch 'origin/dev_mobile' into dev_mobile_ble 2021-09-07 16:13:12 +08:00
b86cb01ea2 修改样式,增加图片 2021-09-07 16:12:16 +08:00
99081519bb 骑行界面&赛事界面调整&设备断开功能 2021-09-07 16:11:15 +08:00
fe65b83c89 ios选择图片功能,结果列表扩大 2021-09-07 15:26:43 +08:00
510cd11049 意见反馈增加图片 2021-09-07 11:14:42 +08:00
b11c5de681 修改样式 2021-09-06 17:50:01 +08:00
467a6f3810 Merge remote-tracking branch 'origin/dev_m1' into dev_mobile_ble
# Conflicts:
#	Assets/Scripts/App.cs
2021-09-03 15:12:01 +08:00
169b9719f6 图片改名 2021-09-03 15:10:18 +08:00
1254414415 修改细节 2021-09-03 15:03:54 +08:00
7af935118e 赛事界面&骑行界面调整 2021-09-03 13:06:26 +08:00
3fb8aee922 骑行界面细节调整 2021-09-02 11:04:50 +08:00
c280408192 Merge remote-tracking branch 'origin/dev_mobile' into dev_mobile_ble
# Conflicts:
#	Assets/Scripts/App.cs
#	Assets/Scripts/Mobile/WeChatController.cs
2021-09-02 10:10:06 +08:00
c5586b3eb1 单人骑行界面 2021-09-02 10:08:46 +08:00
2663068574 地球页面;反馈页面样式修改 2021-09-01 16:14:45 +08:00
3ec6fd0569 比赛;编辑页面 2021-08-31 17:11:43 +08:00
cdccd78602 设备连接界面完善 2021-08-31 16:27:36 +08:00
3a360d3437 附近的人逻辑优化&Android进入骑行提示开启定位服务问题修复 2021-08-31 14:24:08 +08:00
29aef943b9 适配速度计和踏频计 2021-08-31 09:09:49 +08:00
99540eb1fd ios蓝牙适配 2021-08-30 18:28:26 +08:00
85130ce6c3 Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile
# Conflicts:
#	Assets/Scripts/Scenes/MainController.cs
2021-08-27 10:13:17 +08:00
428a7c5507 暫存 2021-08-27 10:12:50 +08:00
d8927ceca5 蓝牙停止扫描和一些bug修复 2021-08-26 19:33:43 +08:00
f21b83697b 暂存 2021-08-26 15:49:06 +08:00
723c881790 Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile 2021-08-26 09:29:42 +08:00
e1a85eeb5e 结果列表页,用户页 2021-08-26 09:29:35 +08:00
0139cbc173 Merge remote-tracking branch 'origin/dev_mobile' into dev_mobile_ble 2021-08-25 16:09:18 +08:00
eb87fe07aa 设备连接页面调整 2021-08-25 16:07:26 +08:00
89e3a04fe9 暂存 2021-08-25 15:35:41 +08:00
92c8f246b8 Merge remote-tracking branch 'origin/dev_mobile' into dev_mobile_ble 2021-08-25 11:22:23 +08:00
bb08b6b762 tcp库更新&附近人下拉调整 2021-08-25 11:20:59 +08:00
88beff5b89 条件编译报错问题 2021-08-25 10:31:20 +08:00
f155b2b627 Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile
# Conflicts:
#	Assets/Plugins/Android/AndroidManifest.xml
#	Assets/Plugins/Android/AndroidManifest.xml.meta
#	Assets/Plugins/iOS.meta
#	Assets/Scripts/App.cs
#	Assets/Scripts/Devices/MainDeviceAdapter.cs
#	Assets/Scripts/Scenes/LoginController.cs
#	Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs
2021-08-25 10:23:51 +08:00
341195d78d 暂存 2021-08-25 10:20:33 +08:00
3de8b1d555 移动端蓝牙设备正常骑行 2021-08-24 18:34:41 +08:00
3c9d489c76 增加移动端界面暂存 2021-08-24 17:50:14 +08:00
31e8e3bebb 移动端微信接入 2021-08-24 09:28:46 +08:00
d6c3ea2007 插件文件上传 2021-08-20 19:01:24 +08:00