mirror of
https://codeberg.org/Freeyourgadget/Gadgetbridge
synced 2024-11-09 03:37:03 +01:00
Huawei: Implement new activity types
This commit is contained in:
Martin.JM
parent
f0825d1ab6
commit
10403a375b
@ -280,6 +280,19 @@ public enum ActivityKind {
|
|||||||
WALL_BALL(0x040000e0, R.string.activity_type_wall_ball),
|
WALL_BALL(0x040000e0, R.string.activity_type_wall_ball),
|
||||||
WATER_POLO(0x040000e1, R.string.activity_type_water_polo),
|
WATER_POLO(0x040000e1, R.string.activity_type_water_polo),
|
||||||
WEIQI(0x040000e3, R.string.activity_type_weiqi),
|
WEIQI(0x040000e3, R.string.activity_type_weiqi),
|
||||||
|
FREE_SPARRING(0x040000e4, R.string.activity_type_free_sparring),
|
||||||
|
BODY_COMBAT(0x040000e5, R.string.activity_type_body_combat),
|
||||||
|
PLAZA_DANCING(0x040000e6, R.string.activity_type_plaza_dancing),
|
||||||
|
LASER_TAG(0x040000e7, R.string.activity_type_laser_tag),
|
||||||
|
OBSTACLE_RACE(0x040000e8, R.string.activity_type_obstacle_race),
|
||||||
|
BILLIARD_POOL(0x040000e9, R.string.activity_type_billiard_pool),
|
||||||
|
CANOEING(0x040000ea, R.string.activity_type_canoeing),
|
||||||
|
WATER_SCOOTER(0x040000eb, R.string.activity_type_water_scooter),
|
||||||
|
BOBSLEIGH(0x040000ec, R.string.activity_type_bobsleigh),
|
||||||
|
SLEDDING(0x040000ed, R.string.activity_type_sledding),
|
||||||
|
BIATHLON(0x040000ee, R.string.activity_type_biathlon),
|
||||||
|
BUNGEE_JUMPING(0x040000ef, R.string.activity_type_bungee_jumping),
|
||||||
|
ORIENTEERING(0x040000f0, R.string.activity_type_orienteering),
|
||||||
;
|
;
|
||||||
|
|
||||||
private final int code;
|
private final int code;
|
||||||
|
|||||||
@ -26,6 +26,7 @@ import java.nio.charset.StandardCharsets;
|
|||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
import de.greenrobot.dao.query.CloseableListIterator;
|
import de.greenrobot.dao.query.CloseableListIterator;
|
||||||
import de.greenrobot.dao.query.QueryBuilder;
|
import de.greenrobot.dao.query.QueryBuilder;
|
||||||
@ -56,6 +57,136 @@ public class HuaweiWorkoutGbParser {
|
|||||||
|
|
||||||
// TODO: Might be nicer to propagate the exceptions, so they can be handled upstream
|
// TODO: Might be nicer to propagate the exceptions, so they can be handled upstream
|
||||||
|
|
||||||
|
public enum HuaweiActivityType {
|
||||||
|
// Based on nodomain.freeyourgadget.gadgetbridge.service.devices.garmin.fit.enums.GarminSport
|
||||||
|
|
||||||
|
RUNNING(1, ActivityKind.RUNNING),
|
||||||
|
WALKING(2, ActivityKind.WALKING),
|
||||||
|
CYCLING(3, ActivityKind.CYCLING),
|
||||||
|
INDOOR_RUN(5, ActivityKind.INDOOR_RUNNING),
|
||||||
|
POOL_SWIM(6, ActivityKind.POOL_SWIM),
|
||||||
|
INDOOR_CYCLE(7, ActivityKind.INDOOR_CYCLING),
|
||||||
|
OPEN_WATER_SWIM(8, ActivityKind.SWIMMING_OPENWATER),
|
||||||
|
INDOOR_WALK(13, ActivityKind.INDOOR_WALKING),
|
||||||
|
JUMP_ROPING(21, ActivityKind.JUMP_ROPING),
|
||||||
|
PING_PONG(128, ActivityKind.PINGPONG),
|
||||||
|
BADMINTON(129, ActivityKind.BADMINTON),
|
||||||
|
TENNIS(130, ActivityKind.TENNIS),
|
||||||
|
SOCCER(131, ActivityKind.SOCCER),
|
||||||
|
BASKETBALL(132, ActivityKind.BASKETBALL),
|
||||||
|
VOLLEYBALL(133, ActivityKind.VOLLEYBALL),
|
||||||
|
ELLIPTICAL_TRAINER(134, ActivityKind.ELLIPTICAL_TRAINER),
|
||||||
|
ROWING_MACHINE(135, ActivityKind.ROWING_MACHINE),
|
||||||
|
STEPPER(136, ActivityKind.STEPPER),
|
||||||
|
YOGA(137, ActivityKind.YOGA),
|
||||||
|
PILATES(138, ActivityKind.PILATES),
|
||||||
|
AEROBICS(139, ActivityKind.AEROBICS),
|
||||||
|
STRENGTH_TRAINING(140, ActivityKind.STRENGTH_TRAINING),
|
||||||
|
SPINNING(141, ActivityKind.SPINNING),
|
||||||
|
AIR_WALKER(142, ActivityKind.AIR_WALKER),
|
||||||
|
HIIT(143, ActivityKind.HIIT),
|
||||||
|
CROSSFIT(145, ActivityKind.CROSSFIT),
|
||||||
|
FUNCTIONAL_TRAINING(146, ActivityKind.FUNCTIONAL_TRAINING),
|
||||||
|
PHYSICAL_TRAINING(147, ActivityKind.PHYSICAL_TRAINING),
|
||||||
|
TAEKWONDO(148, ActivityKind.TAEKWONDO),
|
||||||
|
BOXING(149, ActivityKind.BOXING),
|
||||||
|
FREE_SPARRING(150, ActivityKind.FREE_SPARRING),
|
||||||
|
KARATE(151, ActivityKind.KARATE),
|
||||||
|
FENCING(152, ActivityKind.FENCING),
|
||||||
|
BELLY_DANCE(153, ActivityKind.BELLY_DANCE),
|
||||||
|
JAZZ_DANCE(154, ActivityKind.JAZZ_DANCE),
|
||||||
|
LATIN_DANCE(155, ActivityKind.LATIN_DANCE),
|
||||||
|
BALLET(156, ActivityKind.BALLET),
|
||||||
|
CORE_TRAINING(157, ActivityKind.CORE_TRAINING),
|
||||||
|
BODY_COMBAT(158, ActivityKind.BODY_COMBAT),
|
||||||
|
KENDO(159, ActivityKind.KENDO),
|
||||||
|
SINGLE_BAR(160, ActivityKind.HORIZONTAL_BAR),
|
||||||
|
PARALLEL_BARS(161, ActivityKind.PARALLEL_BARS),
|
||||||
|
STREET_DANCE(162, ActivityKind.STREET_DANCE),
|
||||||
|
ROLLER_SKATING(163, ActivityKind.ROLLER_SKATING),
|
||||||
|
MARTIAL_ARTS(164, ActivityKind.MARTIAL_ARTS),
|
||||||
|
PLAZA_DANCING(165, ActivityKind.PLAZA_DANCING),
|
||||||
|
TAI_CHI(166, ActivityKind.TAI_CHI),
|
||||||
|
DANCE(167, ActivityKind.DANCE),
|
||||||
|
HULA_HOOP(168, ActivityKind.HULA_HOOP),
|
||||||
|
FRISBEE(169, ActivityKind.FRISBEE),
|
||||||
|
DARTS(170, ActivityKind.DARTS),
|
||||||
|
ARCHERY(171, ActivityKind.ARCHERY),
|
||||||
|
HORSE_RIDING(172, ActivityKind.HORSE_RIDING),
|
||||||
|
LASER_TAG(173, ActivityKind.LASER_TAG),
|
||||||
|
KITE_FLYING(174, ActivityKind.KITE_FLYING),
|
||||||
|
TUG_OF_WAR(175, ActivityKind.TUG_OF_WAR),
|
||||||
|
SWINGING(176, ActivityKind.SWING),
|
||||||
|
STAIR_CLIMBING(177, ActivityKind.STAIRS),
|
||||||
|
OBSTACLE_RACE(178, ActivityKind.OBSTACLE_RACE),
|
||||||
|
BILLIARD_POOL(179, ActivityKind.BILLIARD_POOL),
|
||||||
|
BOWLING(180, ActivityKind.BOWLING),
|
||||||
|
SHUTTLECOCK(181, ActivityKind.SHUTTLECOCK),
|
||||||
|
HANDBALL(182, ActivityKind.HANDBALL),
|
||||||
|
BASEBALL(183, ActivityKind.BASEBALL),
|
||||||
|
SOFTBALL(184, ActivityKind.SOFTBALL),
|
||||||
|
CRICKET(185, ActivityKind.CRICKET),
|
||||||
|
RUGBY(186, ActivityKind.RUGBY),
|
||||||
|
BEACH_SOCCER(187, ActivityKind.BEACH_SOCCER),
|
||||||
|
BEACH_VOLLEYBALL(188, ActivityKind.BEACH_VOLLEYBALL),
|
||||||
|
GATEBALL(189, ActivityKind.GATEBALL),
|
||||||
|
HOCKEY(190, ActivityKind.HOCKEY),
|
||||||
|
SQUASH(191, ActivityKind.SQUASH),
|
||||||
|
SEPAK_TAKRAW(192, ActivityKind.SEPAK_TAKRAW),
|
||||||
|
DODGEBALL(193, ActivityKind.DODGEBALL),
|
||||||
|
SAILING(194, ActivityKind.SAILING),
|
||||||
|
SURFING(195, ActivityKind.SURFING),
|
||||||
|
FISHING(196, ActivityKind.FISHING),
|
||||||
|
RAFTING(197, ActivityKind.RAFTING),
|
||||||
|
DRAGON_BOATING(198, ActivityKind.DRAGON_BOAT),
|
||||||
|
CANOEING(199, ActivityKind.CANOEING),
|
||||||
|
ROWING(200, ActivityKind.ROWING),
|
||||||
|
WATER_SCOOTER(201, ActivityKind.WATER_SCOOTER),
|
||||||
|
STAND_UP_PADDLEBOARDING(202, ActivityKind.STAND_UP_PADDLEBOARDING),
|
||||||
|
ICE_SKATING(203, ActivityKind.ICE_SKATING),
|
||||||
|
ICE_HOCKEY(204, ActivityKind.ICE_HOCKEY),
|
||||||
|
CURLING(205, ActivityKind.CURLING),
|
||||||
|
BOBSLEIGH(206, ActivityKind.BOBSLEIGH),
|
||||||
|
SLEDDING(207, ActivityKind.SLEDDING),
|
||||||
|
BIATHLON(208, ActivityKind.BIATHLON),
|
||||||
|
SKATEBOARDING(209, ActivityKind.SKATEBOARDING),
|
||||||
|
ROCK_CLIMBING(210, ActivityKind.ROCK_CLIMBING),
|
||||||
|
BUNGEE_JUMPING(211, ActivityKind.BUNGEE_JUMPING),
|
||||||
|
PARKOUR(212, ActivityKind.PARKOUR),
|
||||||
|
BMX(213, ActivityKind.BMX),
|
||||||
|
ORIENTEERING(214, ActivityKind.ORIENTEERING),
|
||||||
|
PARACHUTING(215, ActivityKind.PARACHUTING),
|
||||||
|
MOTOR_AUTO_RACING(216, ActivityKind.AUTO_RACING),
|
||||||
|
ESPORTS(223, ActivityKind.ESPORTS),
|
||||||
|
PADEL(224, ActivityKind.PADEL),
|
||||||
|
OTHER(255, ActivityKind.EXERCISE)
|
||||||
|
;
|
||||||
|
|
||||||
|
private final byte type;
|
||||||
|
private final ActivityKind activityKind;
|
||||||
|
|
||||||
|
HuaweiActivityType(final int type, final ActivityKind activityKind) {
|
||||||
|
this.type = (byte) type;
|
||||||
|
this.activityKind = activityKind;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ActivityKind getActivityKind() {
|
||||||
|
return activityKind;
|
||||||
|
}
|
||||||
|
|
||||||
|
public byte getType() {
|
||||||
|
return type;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Optional<HuaweiActivityType> fromByte(final byte type) {
|
||||||
|
for (final HuaweiActivityType value : HuaweiActivityType.values()) {
|
||||||
|
if (value.getType() == type)
|
||||||
|
return Optional.of(value);
|
||||||
|
}
|
||||||
|
return Optional.empty();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static void parseAllWorkouts() {
|
public static void parseAllWorkouts() {
|
||||||
parseUnknownWorkoutData();
|
parseUnknownWorkoutData();
|
||||||
|
|
||||||
@ -123,46 +254,11 @@ public class HuaweiWorkoutGbParser {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static ActivityKind huaweiTypeToGbType(byte huaweiType) {
|
public static ActivityKind huaweiTypeToGbType(byte huaweiType) {
|
||||||
int type = huaweiType & 0xFF;
|
final Optional<HuaweiActivityType> type = HuaweiActivityType.fromByte(huaweiType);
|
||||||
switch (type) {
|
if (type.isPresent())
|
||||||
case 1:
|
return type.get().getActivityKind();
|
||||||
return ActivityKind.RUNNING;
|
else
|
||||||
case 2:
|
return ActivityKind.UNKNOWN;
|
||||||
case 13:
|
|
||||||
return ActivityKind.WALKING;
|
|
||||||
case 6:
|
|
||||||
return ActivityKind.SWIMMING;
|
|
||||||
case 3:
|
|
||||||
return ActivityKind.CYCLING;
|
|
||||||
case 7:
|
|
||||||
return ActivityKind.INDOOR_CYCLING;
|
|
||||||
case 129:
|
|
||||||
return ActivityKind.BADMINTON;
|
|
||||||
case 130:
|
|
||||||
return ActivityKind.EXERCISE; // TODO: Tennis
|
|
||||||
case 131:
|
|
||||||
return ActivityKind.SOCCER;
|
|
||||||
case 132:
|
|
||||||
return ActivityKind.BASKETBALL;
|
|
||||||
case 133:
|
|
||||||
return ActivityKind.EXERCISE; // TODO: Volleyball
|
|
||||||
case 134:
|
|
||||||
return ActivityKind.ELLIPTICAL_TRAINER;
|
|
||||||
case 135:
|
|
||||||
return ActivityKind.ROWING_MACHINE;
|
|
||||||
case 163:
|
|
||||||
return ActivityKind.EXERCISE; // TODO: Roller skating
|
|
||||||
case 173:
|
|
||||||
return ActivityKind.EXERCISE; // TODO: Laser tag
|
|
||||||
case 177:
|
|
||||||
return ActivityKind.EXERCISE; // TODO: stair climbing
|
|
||||||
case 196:
|
|
||||||
return ActivityKind.EXERCISE; // TODO: fishing
|
|
||||||
case 216:
|
|
||||||
return ActivityKind.EXERCISE; // TODO: motor racing
|
|
||||||
default:
|
|
||||||
return ActivityKind.UNKNOWN;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void parseWorkout(Long workoutId) {
|
public static void parseWorkout(Long workoutId) {
|
||||||
|
|||||||
@ -1539,6 +1539,19 @@
|
|||||||
<string name="activity_type_wall_ball">Wall ball</string>
|
<string name="activity_type_wall_ball">Wall ball</string>
|
||||||
<string name="activity_type_water_polo">Water polo</string>
|
<string name="activity_type_water_polo">Water polo</string>
|
||||||
<string name="activity_type_weiqi">Weiqi</string>
|
<string name="activity_type_weiqi">Weiqi</string>
|
||||||
|
<string name="activity_type_free_sparring">Free sparring</string>
|
||||||
|
<string name="activity_type_body_combat">Body combat</string>
|
||||||
|
<string name="activity_type_plaza_dancing">Plaza dancing</string>
|
||||||
|
<string name="activity_type_laser_tag">Laser tag</string>
|
||||||
|
<string name="activity_type_obstacle_race">Obstacle race</string>
|
||||||
|
<string name="activity_type_billiard_pool">Pool</string>
|
||||||
|
<string name="activity_type_canoeing">Canoeing</string>
|
||||||
|
<string name="activity_type_water_scooter">Water scooter</string>
|
||||||
|
<string name="activity_type_bobsleigh">Bobsleigh</string>
|
||||||
|
<string name="activity_type_sledding">Sledding</string>
|
||||||
|
<string name="activity_type_biathlon">Biathlon</string>
|
||||||
|
<string name="activity_type_bungee_jumping">Bungee jumping</string>
|
||||||
|
<string name="activity_type_orienteering">Orienteering</string>
|
||||||
<string name="activity_summaries">Sport Activities</string>
|
<string name="activity_summaries">Sport Activities</string>
|
||||||
<string name="activity_summary_detail">Sport Activity Detail</string>
|
<string name="activity_summary_detail">Sport Activity Detail</string>
|
||||||
<string name="activity_summary_edit_name_title">Edit label</string>
|
<string name="activity_summary_edit_name_title">Edit label</string>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user