fixed back to current pace

snuhcs-course · Nov 8, 2023 · 4914b27 · 4914b27
1 parent a673006
commit 4914b27
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 9 deletions.
diff --git a/...droid/app/src/main/java/com/example/runusandroid/ui/multi_mode/MultiModePlayFragment.java b/...droid/app/src/main/java/com/example/runusandroid/ui/multi_mode/MultiModePlayFragment.java
@@ -231,15 +231,33 @@ public void onLocationResult(LocationResult locationResult) {
                             // unit : meter -> kilometer
                             double last_distance_5s_kilometer = location.distanceTo(lastLocation) / (double) 1000;
                             distance += last_distance_5s_kilometer;
-                            double speed_average = distance / (double) (Duration.between(gameStartTime, LocalDateTime.now()).getSeconds() / 3600.0);
 
-                            if (speed_average > 0.1) {
-                                Log.d("debug:distance", "last 5s distance (km) : " + last_distance_5s_kilometer + "");
-                                Log.d("debug:speed", "average speed since start (km/h) : " + speed_average + "");
-                                String paceString = String.format("%4.2f km/h", speed_average);
-                                pacePresentContentTextView.setText(paceString);
+                            // double speed_average = distance / (double) (Duration.between(gameStartTime, LocalDateTime.now()).getSeconds() / 3600.0);
+
+//                            if (speed_average > 0.1) {
+//                                Log.d("debug:distance", "last 5s distance (km) : " + last_distance_5s_kilometer + "");
+//                                Log.d("debug:speed", "average speed since start (km/h) : " + speed_average + "");
+//                                String paceString = String.format("%4.2f km/h", speed_average);
+//                                pacePresentContentTextView.setText(paceString);
+//                            } else {
+//                                String paceString = "--.-- km/h";
+//                                pacePresentContentTextView.setText(paceString);
+//                            }
+
+                            if (last_distance_5s_kilometer != 0 ) {
+                                int paceMinute = (int) (1 / (last_distance_5s_kilometer / 5)) / 60;
+                                int paceSecond = (int) (1 / (last_distance_5s_kilometer / 5)) % 60;
+
+                                if (paceMinute <= 30) {
+                                    String paceString = String.format("%02d'%02d\"", paceMinute, paceSecond);
+                                    pacePresentContentTextView.setText(paceString);
+                                }
+                                else {
+                                    String paceString = "--'--\"";
+                                    pacePresentContentTextView.setText(paceString);
+                                }
                             } else {
-                                String paceString = "--.-- km/h";
+                                String paceString = "--'--\"";
                                 pacePresentContentTextView.setText(paceString);
                             }
 

diff --git a/android/RunUsAndroid/app/src/main/res/layout/fragment_multi_room_play.xml b/android/RunUsAndroid/app/src/main/res/layout/fragment_multi_room_play.xml
@@ -31,7 +31,7 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/pretendardregular"
                 android:gravity="center_horizontal"
-                android:text="평균 속력"
+                android:text="현재 페이스"
                 android:textAppearance="@style/multi_room_play_goal" />
 
             <TextView
@@ -40,7 +40,7 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/pretendardregular"
                 android:gravity="center_horizontal"
-                android:text="--:-- km/h"
+                android:text="--'--''"
                 android:textAppearance="@style/multi_room_play_goal" />
         </LinearLayout>