diff --git a/mediapipe/examples/android/solutions/posetracking-lindera/src/main/BUILD b/mediapipe/examples/android/solutions/posetracking-lindera/src/main/BUILD index 3bd9f445f..748ab157d 100644 --- a/mediapipe/examples/android/solutions/posetracking-lindera/src/main/BUILD +++ b/mediapipe/examples/android/solutions/posetracking-lindera/src/main/BUILD @@ -20,6 +20,7 @@ android_binary( name = "posetracking-lindera", srcs = glob(["**/*.java"]), custom_package = "com.google.mediapipe.examples.posetracking_lindera", + dex_shards = 10, manifest = "AndroidManifest.xml", manifest_values = { "applicationId": "com.google.mediapipe.examples.posetracking_lindera", diff --git a/mediapipe/examples/android/solutions/posetracking-lindera/src/main/java/com/google/mediapipe/examples/posetracking_lindera/ComputerVisionPluginImpl.java b/mediapipe/examples/android/solutions/posetracking-lindera/src/main/java/com/google/mediapipe/examples/posetracking_lindera/ComputerVisionPluginImpl.java index 88d1e0f45..705a1a699 100644 --- a/mediapipe/examples/android/solutions/posetracking-lindera/src/main/java/com/google/mediapipe/examples/posetracking_lindera/ComputerVisionPluginImpl.java +++ b/mediapipe/examples/android/solutions/posetracking-lindera/src/main/java/com/google/mediapipe/examples/posetracking_lindera/ComputerVisionPluginImpl.java @@ -1,5 +1,7 @@ package com.google.mediapipe.examples.posetracking_lindera; +import static java.lang.Math.min; + import com.google.mediapipe.solutions.lindera.BodyJoints; import com.google.mediapipe.solutions.lindera.ComputerVisionPlugin; import com.google.mediapipe.solutions.lindera.XYZPointWithConfidence; @@ -9,8 +11,10 @@ import org.json.JSONException; import org.json.JSONObject; import java.lang.reflect.Field; +import java.util.HashMap; import java.util.LinkedList; import java.util.Locale; +import java.util.Map; public class ComputerVisionPluginImpl implements ComputerVisionPlugin { @@ -76,6 +80,18 @@ public class ComputerVisionPluginImpl implements ComputerVisionPlugin { } } abbrev = abbrev.toUpperCase(Locale.ROOT); + // correct abbreviations here + switch (abbrev) { + case "P": + abbrev = "PE"; + break; + case "T": + abbrev = "TH"; + break; + case "S": + abbrev = "SP"; + break; + } XYZPointWithConfidence data = (XYZPointWithConfidence) field.get(bodyJoints); assert data != null; bodyJointsString = bodyJointsString.concat(String.format(abbrev+":%f,%f,%f=",data.x,data.y,data.z)); @@ -102,8 +118,14 @@ public class ComputerVisionPluginImpl implements ComputerVisionPlugin { } + + + + + + @Override - public void bodyJoints(int timestamp, BodyJoints bodyJoints) { + public void bodyJoints(long timestamp, BodyJoints bodyJoints) { if (isLogging){ this.bodyJointsEventList.add(new BodyJointsEvent(timestamp,bodyJoints)); diff --git a/mediapipe/examples/android/solutions/posetracking-lindera/src/main/java/com/google/mediapipe/examples/posetracking_lindera/MainActivity.java b/mediapipe/examples/android/solutions/posetracking-lindera/src/main/java/com/google/mediapipe/examples/posetracking_lindera/MainActivity.java index a39a50013..3cd14ab9a 100644 --- a/mediapipe/examples/android/solutions/posetracking-lindera/src/main/java/com/google/mediapipe/examples/posetracking_lindera/MainActivity.java +++ b/mediapipe/examples/android/solutions/posetracking-lindera/src/main/java/com/google/mediapipe/examples/posetracking_lindera/MainActivity.java @@ -83,7 +83,7 @@ public class MainActivity extends AppCompatActivity { findViewById(R.id.button_set_model).setVisibility(View.GONE); findViewById(R.id.button_toggle_landmarks).setVisibility(View.GONE); - findViewById(R.id.button_start_capture).setVisibility(View.GONE); + findViewById(R.id.button_capture_logging).setVisibility(View.GONE); setupLiveDemoUiComponents(); plugin = new ComputerVisionPluginImpl(); @@ -116,7 +116,7 @@ public class MainActivity extends AppCompatActivity { Button startDetectionButton = findViewById(R.id.button_start_detection); Button toggleLandmarks = findViewById(R.id.button_toggle_landmarks); Button modelComplexity = findViewById(R.id.button_set_model); - Button startCapture = findViewById(R.id.button_start_capture); + Button startCapture = findViewById(R.id.button_capture_logging); FrameLayout frameLayout = findViewById(R.id.preview_display_layout); startDetectionButton.setOnClickListener( @@ -129,7 +129,7 @@ public class MainActivity extends AppCompatActivity { startDetectionButton.setVisibility(View.GONE); findViewById(R.id.button_set_model).setVisibility(View.VISIBLE); findViewById(R.id.button_toggle_landmarks).setVisibility(View.VISIBLE); - findViewById(R.id.button_start_capture).setVisibility(View.VISIBLE); + findViewById(R.id.button_capture_logging).setVisibility(View.VISIBLE); updateLandmarkButtonText(); updateModelComplexityButtonText(); diff --git a/mediapipe/examples/android/solutions/posetracking-lindera/src/main/res/layout/activity_main.xml b/mediapipe/examples/android/solutions/posetracking-lindera/src/main/res/layout/activity_main.xml index 84418b5b3..ba95a5142 100644 --- a/mediapipe/examples/android/solutions/posetracking-lindera/src/main/res/layout/activity_main.xml +++ b/mediapipe/examples/android/solutions/posetracking-lindera/src/main/res/layout/activity_main.xml @@ -1,5 +1,6 @@ + android:gravity="center" + android:orientation="horizontal">