Explorar o código

Merge branch 'k-dev-20210122' of http://svn.ouj.com:3000/ouj/flutter-sport into d-dev

Primroses %!s(int64=3) %!d(string=hai) anos
pai
achega
9db71a2c9f
Modificáronse 100 ficheiros con 18 adicións e 8 borrados
  1. 18 8
      ble.txt
  2. BIN=BIN
      lib/assets/img/2.0x/con_icon_difficulty_normal.png
  3. BIN=BIN
      lib/assets/img/2.0x/control_img_selected.png
  4. BIN=BIN
      lib/assets/img/2.0x/data_icon_consume.png
  5. BIN=BIN
      lib/assets/img/2.0x/data_icon_duration.png
  6. BIN=BIN
      lib/assets/img/2.0x/data_icon_frequency.png
  7. BIN=BIN
      lib/assets/img/2.0x/data_icon_jump.png
  8. BIN=BIN
      lib/assets/img/2.0x/data_icon_squat.png
  9. BIN=BIN
      lib/assets/img/2.0x/data_icon_steps.png
  10. BIN=BIN
      lib/assets/img/2.0x/data_icon_strength.png
  11. BIN=BIN
      lib/assets/img/2.0x/datasummary_icon_consume.png
  12. BIN=BIN
      lib/assets/img/2.0x/datasummary_icon_duration.png
  13. BIN=BIN
      lib/assets/img/2.0x/datasummary_icon_frequency.png
  14. BIN=BIN
      lib/assets/img/2.0x/datasummary_icon_greaseefficiency.png
  15. BIN=BIN
      lib/assets/img/2.0x/datasummary_icon_jump.png
  16. BIN=BIN
      lib/assets/img/2.0x/datasummary_icon_score.png
  17. BIN=BIN
      lib/assets/img/2.0x/datasummary_icon_squat.png
  18. BIN=BIN
      lib/assets/img/2.0x/datasummary_icon_steps.png
  19. BIN=BIN
      lib/assets/img/2.0x/day_icon_consume.png
  20. BIN=BIN
      lib/assets/img/2.0x/day_icon_duration.png
  21. BIN=BIN
      lib/assets/img/2.0x/day_icon_frequency.png
  22. BIN=BIN
      lib/assets/img/2.0x/day_icon_steps.png
  23. BIN=BIN
      lib/assets/img/2.0x/home_game_run.png
  24. BIN=BIN
      lib/assets/img/2.0x/home_title_consume.png
  25. BIN=BIN
      lib/assets/img/2.0x/home_title_duration.png
  26. BIN=BIN
      lib/assets/img/2.0x/home_title_steps.png
  27. BIN=BIN
      lib/assets/img/2.0x/home_title_strength.png
  28. BIN=BIN
      lib/assets/img/2.0x/reward_icon_15day.png
  29. BIN=BIN
      lib/assets/img/2.0x/reward_icon_28day.png
  30. BIN=BIN
      lib/assets/img/2.0x/reward_icon_29day.png
  31. BIN=BIN
      lib/assets/img/2.0x/reward_icon_30day.png
  32. BIN=BIN
      lib/assets/img/2.0x/reward_icon_31day.png
  33. BIN=BIN
      lib/assets/img/2.0x/reward_icon_7day.png
  34. BIN=BIN
      lib/assets/img/2.0x/run_btn_over.png
  35. BIN=BIN
      lib/assets/img/2.0x/run_btn_play.png
  36. BIN=BIN
      lib/assets/img/2.0x/run_btn_suspend.png
  37. BIN=BIN
      lib/assets/img/2.0x/runsteps_icon.png
  38. BIN=BIN
      lib/assets/img/2.0x/setgoals_icon_consume_normal.png
  39. BIN=BIN
      lib/assets/img/2.0x/setgoals_icon_consume_press.png
  40. BIN=BIN
      lib/assets/img/2.0x/setgoals_icon_date.png
  41. BIN=BIN
      lib/assets/img/2.0x/setgoals_icon_duration_normal.png
  42. BIN=BIN
      lib/assets/img/2.0x/setgoals_icon_duration_press.png
  43. BIN=BIN
      lib/assets/img/2.0x/setgoals_icon_set.png
  44. BIN=BIN
      lib/assets/img/2.0x/tab_bbs_normal.png
  45. BIN=BIN
      lib/assets/img/2.0x/tab_bbs_press.png
  46. BIN=BIN
      lib/assets/img/2.0x/tab_game_normal.png
  47. BIN=BIN
      lib/assets/img/2.0x/tab_game_press.png
  48. BIN=BIN
      lib/assets/img/2.0x/tab_home_normal.png
  49. BIN=BIN
      lib/assets/img/2.0x/tab_home_press.png
  50. BIN=BIN
      lib/assets/img/2.0x/tab_my_normal.png
  51. BIN=BIN
      lib/assets/img/2.0x/tab_my_press.png
  52. BIN=BIN
      lib/assets/img/Bean-loading.gif
  53. BIN=BIN
      lib/assets/img/con_icon_difficulty_normal.png
  54. BIN=BIN
      lib/assets/img/control_img_selected.png
  55. BIN=BIN
      lib/assets/img/data_icon_consume.png
  56. BIN=BIN
      lib/assets/img/data_icon_duration.png
  57. BIN=BIN
      lib/assets/img/data_icon_frequency.png
  58. BIN=BIN
      lib/assets/img/data_icon_jump.png
  59. BIN=BIN
      lib/assets/img/data_icon_squat.png
  60. BIN=BIN
      lib/assets/img/data_icon_steps.png
  61. BIN=BIN
      lib/assets/img/data_icon_strength.png
  62. BIN=BIN
      lib/assets/img/datasummary_icon_consume.png
  63. BIN=BIN
      lib/assets/img/datasummary_icon_duration.png
  64. BIN=BIN
      lib/assets/img/datasummary_icon_frequency.png
  65. BIN=BIN
      lib/assets/img/datasummary_icon_greaseefficiency.png
  66. BIN=BIN
      lib/assets/img/datasummary_icon_jump.png
  67. BIN=BIN
      lib/assets/img/datasummary_icon_score.png
  68. BIN=BIN
      lib/assets/img/datasummary_icon_squat.png
  69. BIN=BIN
      lib/assets/img/datasummary_icon_steps.png
  70. BIN=BIN
      lib/assets/img/day_icon_consume.png
  71. BIN=BIN
      lib/assets/img/day_icon_duration.png
  72. BIN=BIN
      lib/assets/img/day_icon_frequency.png
  73. BIN=BIN
      lib/assets/img/day_icon_steps.png
  74. BIN=BIN
      lib/assets/img/home_game_run.png
  75. BIN=BIN
      lib/assets/img/home_title_consume.png
  76. BIN=BIN
      lib/assets/img/home_title_duration.png
  77. BIN=BIN
      lib/assets/img/home_title_steps.png
  78. BIN=BIN
      lib/assets/img/home_title_strength.png
  79. BIN=BIN
      lib/assets/img/reward_icon_15day.png
  80. BIN=BIN
      lib/assets/img/reward_icon_28day.png
  81. BIN=BIN
      lib/assets/img/reward_icon_29day.png
  82. BIN=BIN
      lib/assets/img/reward_icon_30day.png
  83. BIN=BIN
      lib/assets/img/reward_icon_31day.png
  84. BIN=BIN
      lib/assets/img/reward_icon_7day.png
  85. BIN=BIN
      lib/assets/img/run_btn_over.png
  86. BIN=BIN
      lib/assets/img/run_btn_play.png
  87. BIN=BIN
      lib/assets/img/run_btn_suspend.png
  88. BIN=BIN
      lib/assets/img/runsteps_icon.png
  89. BIN=BIN
      lib/assets/img/setgoals_icon_consume_normal.png
  90. BIN=BIN
      lib/assets/img/setgoals_icon_consume_press.png
  91. BIN=BIN
      lib/assets/img/setgoals_icon_date.png
  92. BIN=BIN
      lib/assets/img/setgoals_icon_duration_normal.png
  93. BIN=BIN
      lib/assets/img/setgoals_icon_duration_press.png
  94. BIN=BIN
      lib/assets/img/setgoals_icon_set.png
  95. BIN=BIN
      lib/assets/img/tab_bbs_normal.png
  96. BIN=BIN
      lib/assets/img/tab_bbs_press.png
  97. BIN=BIN
      lib/assets/img/tab_game_normal.png
  98. BIN=BIN
      lib/assets/img/tab_game_press.png
  99. BIN=BIN
      lib/assets/img/tab_home_normal.png
  100. BIN=BIN
      lib/assets/img/tab_home_press.png

+ 18 - 8
ble.txt

@@ -1,8 +1,4 @@
-AA BB CC L ~L Index Cmd Data Ver
-
-Index
-    0: 左
-    1: 右
+AA L ~L Cmd Data Ver
 
 Cmd  Data
        :sub_cmd + data
@@ -26,6 +22,8 @@ Cmd  Data
     << 11: 右下
     << 12: 步
 
+0x04: 动作数据
+    << byte[6]:右(x,y,z) + byte[6]:左 + byte[6]:右姿态 + byte[6]:左姿态 + byte[1]:动作信息 + byte[1]:rssi + byte[1]:ts
 
 0xA1: 查询
     >> 0: 设备基本信息
@@ -40,7 +38,19 @@ Cmd  Data
         >> 2 + byte[1]: 包序号(表示收到反馈).. 包的数量 == 序号 结束流程
     << 3: 步数回调 +
 
+0xA2: 设置
+    >> 0: 游戏模式关
+        << 返回相同的命令
+
+    >> 1: 游戏模式开
+        << 返回相同的命令
+
+0xA4: 震动
+    >> byte[2]: 时长(ms)
 
-Q:
-1、鞋码,生产编号 : 版本乱,烧录乱
-2、byte[1]: 低功率 + byte[1]: 高功率 : 无意义,建议改为 待机时长
+0xA5: 实时步数
+    >> byte[1]:0 退出
+         << byte[1]:0
+    >> byte[1]:1 进入模式
+         << byte[1]:1
+    << byte[1]:2 产生步数  +  byte[1]:本次进入模式以来总步数

BIN=BIN
lib/assets/img/2.0x/con_icon_difficulty_normal.png


BIN=BIN
lib/assets/img/2.0x/control_img_selected.png


BIN=BIN
lib/assets/img/2.0x/data_icon_consume.png


BIN=BIN
lib/assets/img/2.0x/data_icon_duration.png


BIN=BIN
lib/assets/img/2.0x/data_icon_frequency.png


BIN=BIN
lib/assets/img/2.0x/data_icon_jump.png


BIN=BIN
lib/assets/img/2.0x/data_icon_squat.png


BIN=BIN
lib/assets/img/2.0x/data_icon_steps.png


BIN=BIN
lib/assets/img/2.0x/data_icon_strength.png


BIN=BIN
lib/assets/img/2.0x/datasummary_icon_consume.png


BIN=BIN
lib/assets/img/2.0x/datasummary_icon_duration.png


BIN=BIN
lib/assets/img/2.0x/datasummary_icon_frequency.png


BIN=BIN
lib/assets/img/2.0x/datasummary_icon_greaseefficiency.png


BIN=BIN
lib/assets/img/2.0x/datasummary_icon_jump.png


BIN=BIN
lib/assets/img/2.0x/datasummary_icon_score.png


BIN=BIN
lib/assets/img/2.0x/datasummary_icon_squat.png


BIN=BIN
lib/assets/img/2.0x/datasummary_icon_steps.png


BIN=BIN
lib/assets/img/2.0x/day_icon_consume.png


BIN=BIN
lib/assets/img/2.0x/day_icon_duration.png


BIN=BIN
lib/assets/img/2.0x/day_icon_frequency.png


BIN=BIN
lib/assets/img/2.0x/day_icon_steps.png


BIN=BIN
lib/assets/img/2.0x/home_game_run.png


BIN=BIN
lib/assets/img/2.0x/home_title_consume.png


BIN=BIN
lib/assets/img/2.0x/home_title_duration.png


BIN=BIN
lib/assets/img/2.0x/home_title_steps.png


BIN=BIN
lib/assets/img/2.0x/home_title_strength.png


BIN=BIN
lib/assets/img/2.0x/reward_icon_15day.png


BIN=BIN
lib/assets/img/2.0x/reward_icon_28day.png


BIN=BIN
lib/assets/img/2.0x/reward_icon_29day.png


BIN=BIN
lib/assets/img/2.0x/reward_icon_30day.png


BIN=BIN
lib/assets/img/2.0x/reward_icon_31day.png


BIN=BIN
lib/assets/img/2.0x/reward_icon_7day.png


BIN=BIN
lib/assets/img/2.0x/run_btn_over.png


BIN=BIN
lib/assets/img/2.0x/run_btn_play.png


BIN=BIN
lib/assets/img/2.0x/run_btn_suspend.png


BIN=BIN
lib/assets/img/2.0x/runsteps_icon.png


BIN=BIN
lib/assets/img/2.0x/setgoals_icon_consume_normal.png


BIN=BIN
lib/assets/img/2.0x/setgoals_icon_consume_press.png


BIN=BIN
lib/assets/img/2.0x/setgoals_icon_date.png


BIN=BIN
lib/assets/img/2.0x/setgoals_icon_duration_normal.png


BIN=BIN
lib/assets/img/2.0x/setgoals_icon_duration_press.png


BIN=BIN
lib/assets/img/2.0x/setgoals_icon_set.png


BIN=BIN
lib/assets/img/2.0x/tab_bbs_normal.png


BIN=BIN
lib/assets/img/2.0x/tab_bbs_press.png


BIN=BIN
lib/assets/img/2.0x/tab_game_normal.png


BIN=BIN
lib/assets/img/2.0x/tab_game_press.png


BIN=BIN
lib/assets/img/2.0x/tab_home_normal.png


BIN=BIN
lib/assets/img/2.0x/tab_home_press.png


BIN=BIN
lib/assets/img/2.0x/tab_my_normal.png


BIN=BIN
lib/assets/img/2.0x/tab_my_press.png


BIN=BIN
lib/assets/img/Bean-loading.gif


BIN=BIN
lib/assets/img/con_icon_difficulty_normal.png


BIN=BIN
lib/assets/img/control_img_selected.png


BIN=BIN
lib/assets/img/data_icon_consume.png


BIN=BIN
lib/assets/img/data_icon_duration.png


BIN=BIN
lib/assets/img/data_icon_frequency.png


BIN=BIN
lib/assets/img/data_icon_jump.png


BIN=BIN
lib/assets/img/data_icon_squat.png


BIN=BIN
lib/assets/img/data_icon_steps.png


BIN=BIN
lib/assets/img/data_icon_strength.png


BIN=BIN
lib/assets/img/datasummary_icon_consume.png


BIN=BIN
lib/assets/img/datasummary_icon_duration.png


BIN=BIN
lib/assets/img/datasummary_icon_frequency.png


BIN=BIN
lib/assets/img/datasummary_icon_greaseefficiency.png


BIN=BIN
lib/assets/img/datasummary_icon_jump.png


BIN=BIN
lib/assets/img/datasummary_icon_score.png


BIN=BIN
lib/assets/img/datasummary_icon_squat.png


BIN=BIN
lib/assets/img/datasummary_icon_steps.png


BIN=BIN
lib/assets/img/day_icon_consume.png


BIN=BIN
lib/assets/img/day_icon_duration.png


BIN=BIN
lib/assets/img/day_icon_frequency.png


BIN=BIN
lib/assets/img/day_icon_steps.png


BIN=BIN
lib/assets/img/home_game_run.png


BIN=BIN
lib/assets/img/home_title_consume.png


BIN=BIN
lib/assets/img/home_title_duration.png


BIN=BIN
lib/assets/img/home_title_steps.png


BIN=BIN
lib/assets/img/home_title_strength.png


BIN=BIN
lib/assets/img/reward_icon_15day.png


BIN=BIN
lib/assets/img/reward_icon_28day.png


BIN=BIN
lib/assets/img/reward_icon_29day.png


BIN=BIN
lib/assets/img/reward_icon_30day.png


BIN=BIN
lib/assets/img/reward_icon_31day.png


BIN=BIN
lib/assets/img/reward_icon_7day.png


BIN=BIN
lib/assets/img/run_btn_over.png


BIN=BIN
lib/assets/img/run_btn_play.png


BIN=BIN
lib/assets/img/run_btn_suspend.png


BIN=BIN
lib/assets/img/runsteps_icon.png


BIN=BIN
lib/assets/img/setgoals_icon_consume_normal.png


BIN=BIN
lib/assets/img/setgoals_icon_consume_press.png


BIN=BIN
lib/assets/img/setgoals_icon_date.png


BIN=BIN
lib/assets/img/setgoals_icon_duration_normal.png


BIN=BIN
lib/assets/img/setgoals_icon_duration_press.png


BIN=BIN
lib/assets/img/setgoals_icon_set.png


BIN=BIN
lib/assets/img/tab_bbs_normal.png


BIN=BIN
lib/assets/img/tab_bbs_press.png


BIN=BIN
lib/assets/img/tab_game_normal.png


BIN=BIN
lib/assets/img/tab_game_press.png


BIN=BIN
lib/assets/img/tab_home_normal.png


BIN=BIN
lib/assets/img/tab_home_press.png


Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio