ラップタイム表示をリストビューに変更した。

diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/ITimerCounter.java b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/ITimerCounter.java
index 8030990..eb4c646 100644 (file)
--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/ITimerCounter.java
+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/ITimerCounter.java
@@ -11,8 +11,6 @@ public interface ITimerCounter
     long timeStamp();
     void reset();
 
-    List<Long> getTimerList();
-    List<Long> getReferenceTimeList();
     int getElapsedCount();
     long getPastTime();
     long getLastElapsedTime();
@@ -21,5 +19,7 @@ public interface ITimerCounter
     long getStartTime();
     long getStopTime();
 
+    long getReferenceLapTime(int position);
+
     void setCallback(MyTimerCounter.ICounterStatusNotify callback);
 }

diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/ITimerStopTrigger.java b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/ITimerStopTrigger.java
index 655e4fb..4289dea 100644 (file)
--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/ITimerStopTrigger.java
+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/ITimerStopTrigger.java
@@ -1,6 +1,5 @@
 package net.osdn.gokigen.joggingtimer.stopwatch;
 
-
 /**
  *
  *

diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/IWearableActivityControl.java b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/IWearableActivityControl.java
index 31107f6..af2bf7c 100644 (file)
--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/IWearableActivityControl.java
+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/IWearableActivityControl.java
@@ -1,6 +1,6 @@
 package net.osdn.gokigen.joggingtimer.stopwatch;
 
-import android.support.wearable.activity.WearableActivity;
+        import android.support.wearable.activity.WearableActivity;
 
 /**
  *
@@ -18,5 +18,7 @@ public interface IWearableActivityControl
     IDataEntry getDataEntry();
 
     void timerStarted(boolean isStarted);
+    void addTimeStamp(long count, long lapTime, long diffTime);
+    void clearTimeStamp();
     void setupReferenceData();
 }

diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/LapTimeArrayAdapter.java b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/LapTimeArrayAdapter.java
index 946628f..ae91d86 100644 (file)
--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/LapTimeArrayAdapter.java
+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/LapTimeArrayAdapter.java
@@ -8,15 +8,17 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
 
-import java.util.ArrayList;
-import java.util.List;
-
+/**
+ *
+ */
 public class LapTimeArrayAdapter  extends ArrayAdapter<LapTimeItems> implements ILapTimeHolder
 {
     private LayoutInflater inflater = null;
     private final int resourceId;
-    private List<LapTimeItems> listItems = new ArrayList<>();
 
+    /**
+     *
+     */
     LapTimeArrayAdapter(@NonNull Context context, int resource)
     {
         super(context, resource);
@@ -41,17 +43,18 @@ public class LapTimeArrayAdapter  extends ArrayAdapter<LapTimeItems> implements
         }
         try
         {
-            LapTimeItems item = listItems.get(position);
-
-            TextView lap1View = view.findViewWithTag("lap1");
-            lap1View.setText(item.getLapCount());
-
-            TextView lap2View = view.findViewWithTag("lap2");
-            lap2View.setText(item.getMainText());
+            LapTimeItems item = getItem(position);
+            if (item != null)
+            {
+                TextView lap1View = view.findViewWithTag("lap1");
+                lap1View.setText(item.getLapCount());
 
-            TextView lap3View = view.findViewWithTag("lap3");
-            lap3View.setText(item.getSubText());
+                TextView lap2View = view.findViewWithTag("lap2");
+                lap2View.setText(item.getMainText());
 
+                TextView lap3View = view.findViewWithTag("lap3");
+                lap3View.setText(item.getSubText());
+            }
         }
         catch (Exception e)
         {
@@ -63,12 +66,12 @@ public class LapTimeArrayAdapter  extends ArrayAdapter<LapTimeItems> implements
     @Override
     public void clearLapTime()
     {
-        listItems.clear();
+        clear();
     }
 
     @Override
     public void addLapTime(LapTimeItems item)
     {
-        listItems.add(item);
+        add(item);
     }
 }

diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/LapTimeItems.java b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/LapTimeItems.java
index c50b356..a13256a 100644 (file)
--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/LapTimeItems.java
+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/LapTimeItems.java
@@ -1,20 +1,28 @@
 package net.osdn.gokigen.joggingtimer.stopwatch;
 
+import net.osdn.gokigen.joggingtimer.utilities.TimeStringConvert;
+
+import java.util.Locale;
+
 /**
  *
  *
  */
-public class LapTimeItems
+class LapTimeItems
 {
     private String lapCount = "";
     private String mainText = "";
     private String subText = "";
 
-    public LapTimeItems(String lapCount, String mainText, String subText)
+    LapTimeItems(long lapCount, long mainText, long subText)
     {
-        this.lapCount = lapCount;
-        this.mainText = mainText;
-        this.subText = subText;
+        this.lapCount = String.format(Locale.US,"%02d", lapCount);
+        this.mainText = TimeStringConvert.getTimeString(mainText).toString();
+
+        if (subText != 0)
+        {
+            this.subText = TimeStringConvert.getDiffTimeString(subText).toString();
+        }
     }
 
     String getLapCount()

diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MainActivity.java b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MainActivity.java
index ad55c44..8b48af1 100644 (file)
--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MainActivity.java
+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MainActivity.java
@@ -9,10 +9,8 @@ import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.ImageButton;
-import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.RelativeLayout;
-import android.widget.ScrollView;
 import android.widget.TextView;
 
 import net.osdn.gokigen.joggingtimer.R;
@@ -21,7 +19,6 @@ import net.osdn.gokigen.joggingtimer.utilities.TimeStringConvert;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.List;
 import java.util.Locale;
 
 /**
@@ -34,7 +31,8 @@ public class MainActivity extends WearableActivity implements IClickCallback, My
     private final IWearableActivityControl controller = new WearableActivityController();
     private MyTimerCounter counter = new MyTimerCounter();
     private boolean isCounterLapTime = false;
-    private boolean isLaptimeView = true;
+    private boolean isLaptimeView = false;
+    private int currentLapCount = 0;
     private ITimerStopTrigger stopTrigger = null;
 
     /**
@@ -297,11 +295,17 @@ public class MainActivity extends WearableActivity implements IClickCallback, My
                 {
                     Log.v(TAG, "startTimer() LAP TIME");
                     // チャタリング防止（ラップタイムとして、３秒以内は記録しないようにする）
-                    if (timerCounter.getCurrentElapsedTime() > 3000)
+                    long currentElapsedTime = timerCounter.getCurrentElapsedTime();
+                    if (currentElapsedTime > 3000)
                     {
+                        currentLapCount++;
                         long lapTime = timerCounter.timeStamp();
+                        long refLapTime = timerCounter.getReferenceLapTime(currentLapCount);
+                        long diffTime = (refLapTime == 0) ? 0 :  (currentElapsedTime - refLapTime);
                         controller.vibrate(50);
                         controller.getDataEntry().appendTimeData(lapTime);
+                        controller.addTimeStamp(currentLapCount, currentElapsedTime, diffTime);
+                        //Log.v(TAG, " [[[ " + currentLapCount + " lap: " + currentElapsedTime + " diff:" + diffTime + " (" + refLapTime + ") ]]]");
                     }
                 }
                 else
@@ -310,6 +314,7 @@ public class MainActivity extends WearableActivity implements IClickCallback, My
                     timerCounter.start();
                     MyTimerTrigger trigger = new MyTimerTrigger(this, 100, timerCounter);
                     trigger.startTimer();
+                    currentLapCount = 0;
                     stopTrigger = trigger;
                     controller.timerStarted(true);
                     controller.vibrate(120);
@@ -392,6 +397,8 @@ public class MainActivity extends WearableActivity implements IClickCallback, My
             {
                 timerCounter.reset();
                 controller.vibrate(50);
+                controller.clearTimeStamp();
+                currentLapCount = 0;
             }
             updateTimerLabel();
         }
@@ -529,241 +536,7 @@ public class MainActivity extends WearableActivity implements IClickCallback, My
      */
     private void updateElapsedTimesText()
     {
-/*
-        String dummy = "";
-        TextView area1 = findViewById(R.id.sub_counter2);
-        TextView area2 = findViewById(R.id.sub_counter3);
-        TextView area3 = findViewById(R.id.sub_counter4);
-        TextView area4 = findViewById(R.id.sub_counter5);
-        TextView area5 = findViewById(R.id.sub_counter6);
-
-        ITimerCounter timerCounter = counter;
-        if (timerCounter != null)
-        {
-            List<Long> elapsedTimes = timerCounter.getTimerList();
-            List<Long> referenceTimes = timerCounter.getReferenceTimeList();
-            int indexSize = elapsedTimes.size();
-            int referenceSize = referenceTimes.size();
-            if (indexSize <= 1)
-            {
-                // ラップの記録がないので表示しません
-                area1.setText(dummy);
-                area1.invalidate();
-                area2.setText(dummy);
-                area2.invalidate();
-                area3.setText(dummy);
-                area3.invalidate();
-                area4.setText(dummy);
-                area4.invalidate();
-                area5.setText(dummy);
-                area5.invalidate();
-                return;
-            }
-            if (indexSize <= 2)
-            {
-                // ラップが１つとれた場合
-                long time = (elapsedTimes.get(indexSize - 1) - elapsedTimes.get(indexSize - 2));
-                long refTime = (referenceSize >= indexSize) ? (referenceTimes.get(indexSize - 1) - referenceTimes.get(indexSize - 2)) : 0;
-                String elapsedTime = "[" + (timerCounter.getElapsedCount() - 1) + "] " + TimeStringConvert.getTimeString(time);
-                if (refTime > 0)
-                {
-                    elapsedTime = elapsedTime + " ( " + TimeStringConvert.getDiffTimeString( time - refTime) + " )";
-                }
-                area1.setText(elapsedTime);
-                area1.invalidate();
-                area2.setText(dummy);
-                area2.invalidate();
-                area3.setText(dummy);
-                area3.invalidate();
-                area4.setText(dummy);
-                area4.invalidate();
-                area5.setText(dummy);
-                area5.invalidate();
-                return;
-            }
-
-            if (indexSize <= 3)
-            {
-                // ラップが３つとれた場合
-                long time1 = (elapsedTimes.get(indexSize - 2) - elapsedTimes.get(indexSize - 3));
-                long refTime1 = (referenceSize >= (indexSize - 1)) ? (referenceTimes.get(indexSize - 2) - referenceTimes.get(indexSize - 3)) : 0;
-                long time2 = (elapsedTimes.get(indexSize - 1) - elapsedTimes.get(indexSize - 2));
-                long refTime2 = (referenceSize >= indexSize) ? (referenceTimes.get(indexSize - 1) - referenceTimes.get(indexSize - 2)) : 0;
-                String elapsedTime1 = "[" +  (timerCounter.getElapsedCount() - 2) + "] " + TimeStringConvert.getTimeString(time1);
-                if (refTime1 > 0)
-                {
-                    elapsedTime1 = elapsedTime1 + " ( " + TimeStringConvert.getDiffTimeString( time1 - refTime1) + " )";
-                }
-                String elapsedTime2 = "[" +  (timerCounter.getElapsedCount() - 1) + "] " + TimeStringConvert.getTimeString(time2);
-                if (refTime2 > 0)
-                {
-                    elapsedTime2 = elapsedTime2 + " ( " + TimeStringConvert.getDiffTimeString( time2 - refTime2) + " )";
-                }
-                area1.setText(elapsedTime1);
-                area1.invalidate();
-                area2.setText(elapsedTime2);
-                area2.invalidate();
-                area3.setText(dummy);
-                area3.invalidate();
-                area4.setText(dummy);
-                area4.invalidate();
-                area5.setText(dummy);
-                area5.invalidate();
-                return;
-            }
-
-            if (indexSize <= 4)
-            {
-                // ラップが４つとれた場合
-                long time1 = (elapsedTimes.get(indexSize - 3) - elapsedTimes.get(indexSize - 4));
-                long refTime1 = (referenceSize >= (indexSize - 2)) ? (referenceTimes.get(indexSize - 3) - referenceTimes.get(indexSize - 4)) : 0;
-
-                long time2 = (elapsedTimes.get(indexSize - 2) - elapsedTimes.get(indexSize - 3));
-                long refTime2 = (referenceSize >= (indexSize - 1)) ? (referenceTimes.get(indexSize - 2) - referenceTimes.get(indexSize - 3)) : 0;
-
-                long time3 = (elapsedTimes.get(indexSize - 1) - elapsedTimes.get(indexSize - 2));
-                long refTime3 = (referenceSize >= indexSize) ? (referenceTimes.get(indexSize - 1) - referenceTimes.get(indexSize - 2)) : 0;
-
-                String elapsedTime1 = "[" +  (timerCounter.getElapsedCount() - 3) + "] " + TimeStringConvert.getTimeString(time1);
-                if (refTime1 > 0)
-                {
-                    elapsedTime1 = elapsedTime1 + " ( " + TimeStringConvert.getDiffTimeString( time1 - refTime1) + " )";
-                }
-
-                String elapsedTime2 = "[" +  (timerCounter.getElapsedCount() - 2) + "] " + TimeStringConvert.getTimeString(time2);
-                if (refTime2 > 0)
-                {
-                    elapsedTime2 = elapsedTime2 + " ( " + TimeStringConvert.getDiffTimeString( time2 - refTime2) + " )";
-                }
-
-                String elapsedTime3 = "[" +  (timerCounter.getElapsedCount() - 1) + "] " + TimeStringConvert.getTimeString(time3);
-                if (refTime3 > 0)
-                {
-                    elapsedTime3 = elapsedTime3 + " ( " + TimeStringConvert.getDiffTimeString( time3 - refTime3) + " )";
-                }
-                area1.setText(elapsedTime1);
-                area1.invalidate();
-                area2.setText(elapsedTime2);
-                area2.invalidate();
-                area3.setText(elapsedTime3);
-                area3.invalidate();
-                area4.setText(dummy);
-                area4.invalidate();
-                area5.setText(dummy);
-                area5.invalidate();
-                return;
-            }
-
-            if (indexSize <= 5)
-            {
-                // ラップが５つとれた場合
-                long time1 = (elapsedTimes.get(indexSize - 4) - elapsedTimes.get(indexSize - 5));
-                long refTime1 = (referenceSize >= (indexSize - 3)) ? (referenceTimes.get(indexSize - 4) - referenceTimes.get(indexSize - 5)) : 0;
-
-                long time2 = (elapsedTimes.get(indexSize - 3) - elapsedTimes.get(indexSize - 4));
-                long refTime2 = (referenceSize >= (indexSize - 2)) ? (referenceTimes.get(indexSize - 3) - referenceTimes.get(indexSize - 4)) : 0;
-
-                long time3 = (elapsedTimes.get(indexSize - 2) - elapsedTimes.get(indexSize - 3));
-                long refTime3 = (referenceSize >= indexSize) ? (referenceTimes.get(indexSize - 2) - referenceTimes.get(indexSize - 3)) : 0;
-
-                long time4 = (elapsedTimes.get(indexSize - 1) - elapsedTimes.get(indexSize - 2));
-                long refTime4 = (referenceSize >= indexSize) ? (referenceTimes.get(indexSize - 1) - referenceTimes.get(indexSize - 2)) : 0;
-
-                String elapsedTime1 = "[" +  (timerCounter.getElapsedCount() - 4) + "] " + TimeStringConvert.getTimeString(time1);
-                if (refTime1 > 0)
-                {
-                    elapsedTime1 = elapsedTime1 + " ( " + TimeStringConvert.getDiffTimeString( time1 - refTime1) + " )";
-                }
-
-                String elapsedTime2 = "[" +  (timerCounter.getElapsedCount() - 3) + "] " + TimeStringConvert.getTimeString(time2);
-                if (refTime2 > 0)
-                {
-                    elapsedTime2 = elapsedTime2 + " ( " + TimeStringConvert.getDiffTimeString( time2 - refTime2) + " )";
-                }
-
-                String elapsedTime3 = "[" +  (timerCounter.getElapsedCount() - 2) + "] " + TimeStringConvert.getTimeString(time3);
-                if (refTime3 > 0)
-                {
-                    elapsedTime3 = elapsedTime3 + " ( " + TimeStringConvert.getDiffTimeString( time3 - refTime3) + " )";
-                }
-
-                String elapsedTime4 = "[" +  (timerCounter.getElapsedCount() - 1) + "] " + TimeStringConvert.getTimeString(time3);
-                if (refTime4 > 0)
-                {
-                    elapsedTime4 = elapsedTime4 + " ( " + TimeStringConvert.getDiffTimeString( time4 - refTime4) + " )";
-                }
-
-                area1.setText(elapsedTime1);
-                area1.invalidate();
-                area2.setText(elapsedTime2);
-                area2.invalidate();
-                area3.setText(elapsedTime3);
-                area3.invalidate();
-                area4.setText(elapsedTime4);
-                area4.invalidate();
-                area5.setText(dummy);
-                area5.invalidate();
-                return;
-            }
-
-            // ラップが６つ以上ある場合
-            long time1 = (elapsedTimes.get(indexSize - 5) - elapsedTimes.get(indexSize - 6));
-            long refTime1 = (referenceSize >= (indexSize - 4)) ? (referenceTimes.get(indexSize - 5) - referenceTimes.get(indexSize - 6)) : 0;
-
-            long time2 = (elapsedTimes.get(indexSize - 4) - elapsedTimes.get(indexSize - 5));
-            long refTime2 = (referenceSize >= (indexSize - 3)) ? (referenceTimes.get(indexSize - 4) - referenceTimes.get(indexSize - 5)) : 0;
-
-            long time3 = (elapsedTimes.get(indexSize - 3) - elapsedTimes.get(indexSize - 4));
-            long refTime3 = (referenceSize >= indexSize - 2) ? (referenceTimes.get(indexSize - 3) - referenceTimes.get(indexSize - 4)) : 0;
-
-            long time4 = (elapsedTimes.get(indexSize - 2) - elapsedTimes.get(indexSize - 3));
-            long refTime4 = (referenceSize >= indexSize - 1) ? (referenceTimes.get(indexSize - 2) - referenceTimes.get(indexSize - 3)) : 0;
-
-            long time5 = (elapsedTimes.get(indexSize - 1) - elapsedTimes.get(indexSize - 2));
-            long refTime5 = (referenceSize >= indexSize) ? (referenceTimes.get(indexSize - 1) - referenceTimes.get(indexSize - 2)) : 0;
-
-            String elapsedTime1 = "[" +  (timerCounter.getElapsedCount() - 5) + "] " + TimeStringConvert.getTimeString(time1);
-            if (refTime1 > 0)
-            {
-                elapsedTime1 = elapsedTime1 + " ( " + TimeStringConvert.getDiffTimeString( time1 - refTime1) + " )";
-            }
-
-            String elapsedTime2 = "[" +  (timerCounter.getElapsedCount() - 4) + "] " + TimeStringConvert.getTimeString(time2);
-            if (refTime2 > 0)
-            {
-                elapsedTime2 = elapsedTime2 + " ( " + TimeStringConvert.getDiffTimeString( time2 - refTime2) + " )";
-            }
-
-            String elapsedTime3 = "[" +  (timerCounter.getElapsedCount() - 3) + "] " + TimeStringConvert.getTimeString(time3);
-            if (refTime3 > 0)
-            {
-                elapsedTime3 = elapsedTime3 + " ( " + TimeStringConvert.getDiffTimeString( time3 - refTime3) + " )";
-            }
-
-            String elapsedTime4 = "[" +  (timerCounter.getElapsedCount() - 2) + "] " + TimeStringConvert.getTimeString(time4);
-            if (refTime4 > 0)
-            {
-                elapsedTime4 = elapsedTime4 + " ( " + TimeStringConvert.getDiffTimeString( time4 - refTime4) + " )";
-            }
-
-            String elapsedTime5 = "[" +  (timerCounter.getElapsedCount() - 1) + "] " + TimeStringConvert.getTimeString(time5);
-            if (refTime5 > 0)
-            {
-                elapsedTime5 = elapsedTime5 + " ( " + TimeStringConvert.getDiffTimeString( time5 - refTime5) + " )";
-            }
-
-            area1.setText(elapsedTime1);
-            area1.invalidate();
-            area2.setText(elapsedTime2);
-            area2.invalidate();
-            area3.setText(elapsedTime3);
-            area3.invalidate();
-            area4.setText(elapsedTime4);
-            area4.invalidate();
-            area5.setText(elapsedTime5);
-            area5.invalidate();
-        }
-*/
+        // Log.v(TAG, "updateElapsedTimesText()");
     }
 
     /**
@@ -784,7 +557,7 @@ public class MainActivity extends WearableActivity implements IClickCallback, My
         }
     }
 
-    /*
+    /**
      *
      *
      */
@@ -795,7 +568,7 @@ public class MainActivity extends WearableActivity implements IClickCallback, My
         // ハードキー（ホームボタン）が押されたとき、これがひろえるが...
     }
 
-    /*
+    /**
      *
      *
      */
@@ -860,7 +633,6 @@ public class MainActivity extends WearableActivity implements IClickCallback, My
                 e.printStackTrace();
             }
         }
-
         runOnUiThread(new Runnable()
         {
             @Override
@@ -881,65 +653,22 @@ public class MainActivity extends WearableActivity implements IClickCallback, My
         {
             LapTimeGraphView graphView = findViewById(R.id.graph_area);
             ListView listView = findViewById(R.id.laptime_list_area);
-
-/*
-            TextView area1 = findViewById(R.id.sub_counter2);
-            TextView area2 = findViewById(R.id.sub_counter3);
-            TextView area3 = findViewById(R.id.sub_counter4);
-            ScrollView scr = findViewById(R.id.scroll_area);
-            LinearLayout lap = findViewById(R.id.lap_time_area);
-*/
             if (isGraphics)
             {
                 graphView.setITimerCounter(counter);
                 graphView.setVisibility(View.VISIBLE);
                 listView.setVisibility(View.GONE);
-/*
-                scr.setVisibility(View.GONE);
-                lap.setVisibility(View.GONE);
-                area1.setVisibility(View.GONE);
-                area2.setVisibility(View.GONE);
-                area3.setVisibility(View.GONE);
-*/
             }
             else
             {
                 graphView.setVisibility(View.GONE);
                 listView.setVisibility(View.VISIBLE);
-/*
-                scr.setVisibility(View.VISIBLE);
-                lap.setVisibility(View.VISIBLE);
-                area1.setVisibility(View.VISIBLE);
-                area2.setVisibility(View.VISIBLE);
-                area3.setVisibility(View.VISIBLE);
-*/
             }
-            controller.vibrate(30);
+            //controller.vibrate(30);
         }
         catch (Exception e)
         {
             e.printStackTrace();
         }
     }
-
-    /*
-     *
-     *
-     */
-/*
-    private String getElapsedTime()
-    {
-        String elapsedTime = "";
-        ITimerCounter timerCounter = counter;
-        if (timerCounter != null)
-        {
-            int count = timerCounter.getElapsedCount();
-            if (count > 0)
-            {
-                elapsedTime = "[" + timerCounter.getElapsedCount() + "] " + MyTimerCounter.getTimeString(timerCounter.getCurrentElapsedTime());
-            }
-        }
-        return (elapsedTime);
-    }
-*/
 }

diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MyTimerCounter.java b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MyTimerCounter.java
index b7f8131..2b2c7b1 100644 (file)
--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MyTimerCounter.java
+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MyTimerCounter.java
@@ -97,18 +97,6 @@ public class MyTimerCounter implements ITimerCounter, IDatabaseReloadCallback
     }
 
     @Override
-    public List<Long> getTimerList()
-    {
-        return (elapsedTime);
-    }
-
-    @Override
-    public List<Long> getReferenceTimeList()
-    {
-        return (referenceTime);
-    }
-
-    @Override
     public int getElapsedCount()
     {
         return (elapsedTime.size());
@@ -223,6 +211,29 @@ public class MyTimerCounter implements ITimerCounter, IDatabaseReloadCallback
         }
     }
 
+    @Override
+    public long getReferenceLapTime(int position)
+    {
+        try
+        {
+            int location = position + 1;
+            if ((referenceTime == null)||(location < 1)||(referenceTime.size() < location))
+            {
+                return (0);
+            }
+            if (location == 1)
+            {
+                return (referenceTime.get(0));
+            }
+            return (referenceTime.get(location - 1) - referenceTime.get(location - 2));
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+        return (0);
+    }
+
     public interface ICounterStatusNotify
     {
         void counterStatusChanged(boolean forceStartTimer);

diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/WearableActivityController.java b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/WearableActivityController.java
index d33a472..3202b70 100644 (file)
--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/WearableActivityController.java
+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/WearableActivityController.java
@@ -164,27 +164,6 @@ class WearableActivityController implements IWearableActivityControl, ITimeEntry
             lap.setOnClickListener(clickListener);
             lap.setOnLongClickListener(clickListener);
 
-            /*
-            TextView sub2 = activity.findViewById(R.id.sub_counter2);
-            sub2.setOnClickListener(clickListener);
-            sub2.setOnLongClickListener(clickListener);
-
-            TextView sub3 = activity.findViewById(R.id.sub_counter3);
-            sub3.setOnClickListener(clickListener);
-            sub3.setOnLongClickListener(clickListener);
-
-            TextView sub4 = activity.findViewById(R.id.sub_counter4);
-            sub4.setOnClickListener(clickListener);
-            sub4.setOnLongClickListener(clickListener);
-
-            TextView sub5 = activity.findViewById(R.id.sub_counter5);
-            sub5.setOnClickListener(clickListener);
-            sub5.setOnLongClickListener(clickListener);
-
-            TextView sub6 = activity.findViewById(R.id.sub_counter6);
-            sub6.setOnClickListener(clickListener);
-            sub6.setOnLongClickListener(clickListener);
-*/
             LapTimeGraphView graphView = activity.findViewById(R.id.graph_area);
             graphView.setOnClickListener(clickListener);
             graphView.setOnLongClickListener(clickListener);
@@ -201,7 +180,8 @@ class WearableActivityController implements IWearableActivityControl, ITimeEntry
      *
      *
      */
-    private void closeDatabase() {
+    private void closeDatabase()
+    {
         Log.v(TAG, "closeDatabase()");
         Thread thread = new Thread(new Runnable() {
             @Override
@@ -226,15 +206,19 @@ class WearableActivityController implements IWearableActivityControl, ITimeEntry
      *
      */
     @Override
-    public void exitApplication(WearableActivity activity) {
+    public void exitApplication(WearableActivity activity)
+    {
         Log.v(TAG, "exitApplication()");
         closeDatabase();
     }
 
     @Override
-    public void vibrate(final int duration) {
-        try {
-            if ((vibrator == null) || (!vibrator.hasVibrator())) {
+    public void vibrate(final int duration)
+    {
+        try
+        {
+            if ((vibrator == null) || (!vibrator.hasVibrator()))
+            {
                 return;
             }
 
@@ -245,7 +229,9 @@ class WearableActivityController implements IWearableActivityControl, ITimeEntry
                 }
             });
             thread.start();
-        } catch (Exception e) {
+        }
+        catch (Exception e)
+        {
             e.printStackTrace();
         }
     }
@@ -256,17 +242,39 @@ class WearableActivityController implements IWearableActivityControl, ITimeEntry
     }
 
     @Override
-    public void timerStarted(boolean isStarted) {
-        try {
+    public void timerStarted(boolean isStarted)
+    {
+        try
+        {
             SharedPreferences.Editor editor = preferences.edit();
             editor.putBoolean(PREF_KEY_TIMER_STARTED, isStarted);
             editor.apply();
-        } catch (Exception e) {
+        }
+        catch (Exception e)
+        {
             e.printStackTrace();
         }
     }
 
     @Override
+    public void addTimeStamp(long count, long lapTime, long diffTime)
+    {
+        if (lapTimeHolder != null)
+        {
+            lapTimeHolder.addLapTime(new LapTimeItems(count, lapTime, diffTime));
+        }
+    }
+
+    @Override
+    public void clearTimeStamp()
+    {
+        if (lapTimeHolder != null)
+        {
+            lapTimeHolder.clearLapTime();
+        }
+    }
+
+    @Override
     public void setupReferenceData()
     {
         try

diff --git a/wear/src/main/res/layout-notround/activity_main.xml b/wear/src/main/res/layout-notround/activity_main.xml
index 4113bd6..a5421c9 100644 (file)
--- a/wear/src/main/res/layout-notround/activity_main.xml
+++ b/wear/src/main/res/layout-notround/activity_main.xml
@@ -114,6 +114,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/sub_counter1"
             android:layout_above="@id/btn1"
+            android:transcriptMode="alwaysScroll"
             android:visibility="visible"
             />
 <!--

diff --git a/wear/src/main/res/layout-round/activity_main.xml b/wear/src/main/res/layout-round/activity_main.xml
index 421975a..2fcd38f 100644 (file)
--- a/wear/src/main/res/layout-round/activity_main.xml
+++ b/wear/src/main/res/layout-round/activity_main.xml
@@ -109,6 +109,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/sub_counter1"
             android:layout_above="@id/btn1"
+            android:transcriptMode="alwaysScroll"
             android:visibility="visible"
             />
 <!--