722 Commits

Author SHA1 Message Date
9e2240fd9b 视频编辑工具合并后字体调整 2022-06-27 13:37:13 +08:00
1d015706db Merge branch 'dev_cyp1' into dev_ar_cyp
# Conflicts:
#	Assets/Plugins/Android/unityandroidbluetoothlelib.jar
#	Assets/Resources/UI/language.json
#	Assets/Scenes/MainScene.unity
#	Assets/Scripts/Devices/Ble/mobile/BleMobileInterface.cs
#	Assets/Scripts/Devices/Ble/mobile/BleMobileThread.cs
#	Assets/Scripts/Scenes/MainController.cs
#	Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs
#	Assets/Scripts/UI/Prefab/Rower/RowerDeviceView.cs
#	Assets/Scripts/UI/Prefab/Rower/RowerGraphChartFeed.cs
#	Assets/Scripts/UIManager.cs
2022-06-27 10:36:20 +08:00
06b9051b3c c2同步课程命令 2022-06-24 18:03:36 +08:00
701ec3069b C2课程同步问题 2022-06-23 18:55:08 +08:00
84b3e1e7a4 移除测试代码 2022-06-21 18:55:13 +08:00
573b96d86c 拉力曲线性能优化&解决划船时间误差问题 2022-06-21 17:49:43 +08:00
6c9b3f825a 解决没有设备号的问题 2022-06-15 18:07:06 +08:00
6e091bd99c anroid ble jar包调整 2022-06-15 16:58:22 +08:00
610c98f9b8 解决c2表头设定课程后抖动问题,设备断开失败问题 2022-06-15 16:42:07 +08:00
0202814f67 心率,阻力逻辑调整 2022-06-14 18:37:58 +08:00
f25d0b7b8c 蓝牙断开重连相关逻辑优化 2022-06-13 18:59:02 +08:00
87a0e7fb6d 划船机优化 2022-06-10 19:31:07 +08:00
2f64aa494f 移动端蓝牙优化 2022-06-09 14:52:50 +08:00
72f254af2a 蓝牙重复初始化问题 2022-06-09 14:52:45 +08:00
6542dd9882 移动端蓝牙优化 2022-06-09 14:51:03 +08:00
5b54255777 蓝牙重复初始化问题 2022-06-08 18:27:16 +08:00
6b3dd70c61 设备连接界面断开逻辑调整 2022-06-08 17:25:02 +08:00
1c9102fbdc 设备连接界面断开逻辑调整 2022-06-08 17:24:35 +08:00
46b6c7fa01 设备连接稳定性 2022-06-08 16:22:07 +08:00
c333086e30 重置问题 2022-06-08 13:55:35 +08:00
02d2dcdbf7 设备连接稳定性 2022-06-08 13:05:56 +08:00
c7afcbb01f Merge branch 'dev_cyp' into dev_cyp1
# Conflicts:
#	Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs
2022-06-07 11:32:46 +08:00
ff878d5d50 修改断线重连自动开始问题 2022-06-07 11:32:23 +08:00
b236e939f4 graph优化
# Conflicts:
#	Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs
2022-06-06 19:55:08 +08:00
bfc56dded5 0606修改 2022-06-06 18:54:28 +08:00
383fed4966 graph优化 2022-06-06 18:54:04 +08:00
6effadc1e9 增加长时间保存,解决取影子以后后续请求失效问题(使用unity的请求库) 2022-06-06 09:09:20 +08:00
c6d0f7ac13 合并后错误修改 2022-06-02 18:05:41 +08:00
d498dd9148 日志包 2022-06-02 15:52:10 +08:00
e513eeac5c Merge branch 'dev_cyp' into dev_ar_cyp
# Conflicts:
#	Assets/Resources/UI/Font/HanWangZonYi.ttf.meta
#	Assets/Resources/UI/language.json
#	Assets/Scenes/Login.unity
#	Assets/Scripts/Apis/Models/MapRoute.cs
#	Assets/Scripts/App.cs
#	Assets/Scripts/ConfigHelper.cs
#	Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs
#	Assets/Scripts/UIManager.cs
#	Assets/Scripts/Utils/Utils.cs
2022-06-02 11:30:37 +08:00
71c9907c89 UImanager show方法会产生多余的HomeController 2022-06-01 19:49:15 +08:00
154252e3c3 Merge remote-tracking branch 'origin/dev_ani3' into dev_cyp 2022-06-01 16:24:36 +08:00
cda569afd5 性能优化 2022-06-01 16:10:42 +08:00
475250e795 Merge remote-tracking branch 'origin/dev_ani3' into dev_cyp 2022-06-01 16:10:35 +08:00
c579c1b130 Merge remote-tracking branch 'origin/dev_cyp' into dev_ani3 2022-06-01 10:50:16 +08:00
d9848e4e9d 设备连接界面微调&划船机本地记录过滤 2022-06-01 10:24:23 +08:00
622aaa3b6d 重连后续修改 2022-06-01 09:54:20 +08:00
e7af21b126 pc设备连接界面微调 2022-05-31 19:43:50 +08:00
bfa9f5f998 Merge remote-tracking branch 'origin/dev_ani3' into dev_cyp 2022-05-31 18:42:13 +08:00
3f8c189ad4 断线重连取数据逻辑 2022-05-31 18:40:32 +08:00
a1010091f8 设备连接界面文案与交互调整 2022-05-31 18:25:53 +08:00
167a424505 Merge remote-tracking branch 'origin/dev_ani3' into dev_cyp
# Conflicts:
#	Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs
2022-05-31 16:51:37 +08:00
ff6d61a606 修改其他的 2022-05-31 16:51:07 +08:00
2524e3a004 划船机实时保存 2022-05-31 16:47:21 +08:00
95df03e540 chart内存性能优化 2022-05-31 14:43:05 +08:00
9f0f42981e 视频路书编辑器完善 2022-05-30 15:17:55 +08:00
17c2a44e40 AR视频direction文件相关调整 2022-05-25 18:40:47 +08:00
d876c20def 对战房间下载逻辑完善 2022-05-13 11:10:37 +08:00
11b131b24a 对战AR 2022-05-13 09:28:58 +08:00
be687d6b77 适配v1表头,性能优化一波 2022-05-11 17:11:48 +08:00