package net.osdn.gokigen.joggingtimer.stopwatch;
+import static net.osdn.gokigen.joggingtimer.utilities.SelectReferenceViewModeDialog.PREF_KEY_DISPLAY_LAPGRAPHIC;
+import static net.osdn.gokigen.joggingtimer.utilities.SelectReferenceViewModeDialog.PREF_KEY_REFERENCE_TIME_SELECTION;
+
import android.content.Intent;
+import android.content.SharedPreferences;
import android.graphics.Color;
import android.os.Bundle;
-import android.support.wear.widget.BoxInsetLayout;
-import android.support.wearable.activity.WearableActivity;
+import android.preference.PreferenceManager;
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.TextView;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.constraintlayout.widget.ConstraintSet;
+import androidx.core.widget.NestedScrollView;
+import androidx.fragment.app.FragmentManager;
+import androidx.wear.ambient.AmbientModeSupport;
+import androidx.wear.widget.BoxInsetLayout;
+
import net.osdn.gokigen.joggingtimer.R;
import net.osdn.gokigen.joggingtimer.recordlist.ListActivity;
+import net.osdn.gokigen.joggingtimer.stopwatch.graphview.LapTimeGraphView;
+import net.osdn.gokigen.joggingtimer.utilities.SelectReferenceViewModeDialog;
+import net.osdn.gokigen.joggingtimer.utilities.SetReferenceDialog;
import net.osdn.gokigen.joggingtimer.utilities.TimeStringConvert;
-
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
*
*
*/
-public class MainActivity extends WearableActivity implements IClickCallback, MyTimerTrigger.ITimeoutReceiver
+public class MainActivity extends AppCompatActivity implements IClickCallback, MyTimerTrigger.ITimeoutReceiver, MyTimerCounter.ICounterStatusNotify, AmbientModeSupport.AmbientCallbackProvider, SelectReferenceViewModeDialog.SelectReferenceCallback
{
private final String TAG = toString();
private final IWearableActivityControl controller = new WearableActivityController();
- private MyTimerCounter counter = new MyTimerCounter();
- private boolean isCounterLapTime = false;
+ private final MyTimerCounter counter = new MyTimerCounter();
+ private boolean isCounterLapTime = true;
+ private boolean isLaptimeView = true;
+ private boolean pendingStart = false;
+ private int currentLapCount = 0;
+ private int currentReferenceId = 0;
+ private ITimerStopTrigger stopTrigger = null;
/**
*
setContentView(R.layout.activity_main);
- controller.setup(this, this);
+ controller.setup(this, this, counter);
// Enables Always-on
- setAmbientEnabled();
- }
-
- /**
- *
- */
- @Override
- protected void onSaveInstanceState(Bundle outState)
- {
- super.onSaveInstanceState(outState);
-
- /* ここで状態を保存 */
- outState.putParcelable("timerCounter", counter);
- }
-
- /**
- *
- */
- @Override
- protected void onRestoreInstanceState(Bundle savedInstanceState)
- {
- super.onRestoreInstanceState(savedInstanceState);
-
- /* ここで保存した状態を読み出して設定 */
- counter = savedInstanceState.getParcelable("timerCounter");
+ //getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+ //setAmbientEnabled();
+ try
+ {
+ AmbientModeSupport.AmbientController ambientController = AmbientModeSupport.attach(this);
+ ambientController.setAutoResumeEnabled(true);
+ //boolean isAmbient = ambientController.isAmbient();
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
}
/**
}
}
}
+ isLaptimeView = controller.getDisplayMode();
+ currentReferenceId = controller.getReferenceTimerSelection();
+ //Log.v(TAG, "isLaptimeView " + isLaptimeView);
+
+ controller.setupReferenceData();
+
if (isStartTimer)
{
// start a timer!
- startTimer();
+ //startTimer();
+ pendingStart = true;
}
}
{
super.onStart();
Log.v(TAG, "onStart()");
+
+ // データベースのセットアップ
+ counter.setCallback(this);
+ controller.setupDatabase(this, false);
}
/**
{
super.onStop();
Log.v(TAG, "onStop()");
+ if (stopTrigger != null)
+ {
+ stopTrigger.forceStop();
+ }
controller.exitApplication(this);
}
- /**
- *
- *
- */
+/*
@Override
public void onEnterAmbient(Bundle ambientDetails)
{
Log.v(TAG, "onEnterAmbient()");
}
- /**
- *
- *
- */
@Override
public void onExitAmbient()
{
super.onExitAmbient();
Log.v(TAG, "onExitAmbient()");
- updateTimerLabel();
+ //updateTimerLabel();
}
- /**
- *
- *
- */
@Override
public void onUpdateAmbient()
{
super.onUpdateAmbient();
Log.v(TAG, "onUpdateAmbient()");
}
+*/
/**
*
*/
- public void updateTimerLabel()
+ private void updateTimerLabel()
{
ITimerCounter timerCounter = counter;
- if (timerCounter != null)
- {
- int bgColor;
- BoxInsetLayout insetLayout = findViewById(R.id.box_inset_layout);
- RelativeLayout layout = findViewById(R.id.relative_main_layout);
-
- ImageButton btn1 = findViewById(R.id.btn1);
- ImageButton btn2 = findViewById(R.id.btn2);
- ImageButton btn3 = findViewById(R.id.btn3);
+ int bgColor;
+ NestedScrollView insetLayout = findViewById(R.id.top_layout);
+ ConstraintLayout layout = findViewById(R.id.main_layout);
- updateMainSubCounter();
-
- if (timerCounter.isStarted())
- {
- bgColor = Color.CYAN;
- insetLayout.setBackgroundColor(bgColor);
- insetLayout.invalidate();
-
- layout.setBackgroundColor(bgColor);
- layout.invalidate();
-
- btn1.setImageResource(R.drawable.ic_flag_black_24dp);
- btn1.setBackgroundColor(bgColor);
- btn1.setVisibility(View.VISIBLE);
- btn1.invalidate();
-
- btn2.setImageResource(R.drawable.ic_stop_black_24dp);
- btn2.setBackgroundColor(bgColor);
- btn2.setVisibility(View.VISIBLE);
- btn2.invalidate();
-
- btn3.setImageResource(R.drawable.ic_block_black_24dp);
- btn3.setBackgroundColor(bgColor);
- btn3.setVisibility(View.INVISIBLE);
- btn3.invalidate();
-
- updateElapsedTimes();
- }
- else if (timerCounter.isReset())
- {
- bgColor = Color.WHITE;
- insetLayout.setBackgroundColor(bgColor);
- insetLayout.invalidate();
-
- layout.setBackgroundColor(bgColor);
- layout.invalidate();
-
- btn1.setImageResource(R.drawable.ic_play_arrow_black_24dp);
- btn1.setBackgroundColor(bgColor);
- btn1.setVisibility(View.VISIBLE);
- btn1.invalidate();
-
- btn2.setImageResource(R.drawable.ic_format_list_bulleted_black_24dp);
- btn2.setBackgroundColor(bgColor);
- btn2.setVisibility(View.VISIBLE);
- btn2.invalidate();
-
- btn3.setImageResource(R.drawable.ic_refresh_black_24dp);
- btn3.setBackgroundColor(bgColor);
- btn3.setVisibility(View.INVISIBLE);
- btn3.invalidate();
-
- updateElapsedTimes();
- }
- else
- {
- bgColor = Color.rgb(250, 80, 80);
- insetLayout.setBackgroundColor(bgColor);
- insetLayout.invalidate();
+ ImageButton btn1 = findViewById(R.id.btn1);
+ ImageButton btn2 = findViewById(R.id.btn2);
+ ImageButton btn3 = findViewById(R.id.btn3);
- layout.setBackgroundColor(bgColor);
- layout.invalidate();
+ updateMainSubCounter();
- btn1.setImageResource(R.drawable.ic_play_arrow_black_24dp);
- btn1.setVisibility(View.VISIBLE);
- btn1.setBackgroundColor(bgColor);
- btn1.invalidate();
-
- btn2.setImageResource(R.drawable.ic_format_list_bulleted_black_24dp);
- btn2.setVisibility(View.VISIBLE);
- btn2.setBackgroundColor(bgColor);
- btn2.invalidate();
-
- btn3.setImageResource(R.drawable.ic_refresh_black_24dp);
- btn3.setVisibility(View.VISIBLE);
- btn3.setBackgroundColor(bgColor);
- btn3.invalidate();
-
- updateElapsedTimes();
- }
+ if (timerCounter.isStarted())
+ {
+ bgColor = Color.BLACK;
+ insetLayout.setBackgroundColor(bgColor);
+ insetLayout.invalidate();
+
+ layout.setBackgroundColor(bgColor);
+ layout.invalidate();
+
+ btn1.setImageResource(R.drawable.ic_flag_black_24dp);
+ btn1.setBackgroundColor(bgColor);
+
+ // チャタリング防止（ラップタイムとして、３秒以内は記録しないようボタンを消しておく）
+ long currentElapsedTime = timerCounter.getCurrentElapsedTime();
+ btn1.setVisibility((currentElapsedTime > 3000) ? View.VISIBLE : View.INVISIBLE);
+ btn1.invalidate();
+
+ btn2.setImageResource(R.drawable.ic_stop_black_24dp);
+ btn2.setBackgroundColor(bgColor);
+ btn2.setVisibility(View.VISIBLE);
+ btn2.invalidate();
+
+ btn3.setImageResource(R.drawable.ic_block_black_24dp);
+ btn3.setBackgroundColor(bgColor);
+ btn3.setVisibility(View.INVISIBLE);
+ btn3.invalidate();
+ }
+ else if (timerCounter.isReset())
+ {
+ bgColor = Color.BLACK;
+ insetLayout.setBackgroundColor(bgColor);
+ insetLayout.invalidate();
+
+ layout.setBackgroundColor(bgColor);
+ layout.invalidate();
+
+ btn1.setImageResource(R.drawable.ic_play_arrow_black_24dp);
+ btn1.setBackgroundColor(bgColor);
+ btn1.setVisibility(View.VISIBLE);
+ btn1.invalidate();
+
+ btn2.setImageResource(R.drawable.ic_format_list_bulleted_black_24dp);
+ btn2.setBackgroundColor(bgColor);
+ btn2.setVisibility(View.VISIBLE);
+ btn2.invalidate();
+
+ btn3.setImageResource(R.drawable.ic_refresh_black_24dp);
+ btn3.setBackgroundColor(bgColor);
+ btn3.setVisibility(View.INVISIBLE);
+ btn3.invalidate();
+ }
+ else
+ {
+ bgColor = Color.BLACK;
+ insetLayout.setBackgroundColor(bgColor);
+ insetLayout.invalidate();
+
+ layout.setBackgroundColor(bgColor);
+ layout.invalidate();
+
+ btn1.setImageResource(R.drawable.ic_play_arrow_black_24dp);
+ btn1.setVisibility(View.VISIBLE);
+ btn1.setBackgroundColor(bgColor);
+ btn1.invalidate();
+
+ btn2.setImageResource(R.drawable.ic_format_list_bulleted_black_24dp);
+ btn2.setVisibility(View.VISIBLE);
+ btn2.setBackgroundColor(bgColor);
+ btn2.invalidate();
+
+ btn3.setImageResource(R.drawable.ic_refresh_black_24dp);
+ btn3.setVisibility(View.VISIBLE);
+ btn3.setBackgroundColor(bgColor);
+ btn3.invalidate();
}
+ updateElapsedTimes();
}
@Override
try
{
ITimerCounter timerCounter = counter;
- if (timerCounter != null)
+ LapTimeGraphView graphView = findViewById(R.id.graph_area);
+ if (timerCounter.isStarted())
{
- if (timerCounter.isStarted())
+ Log.v(TAG, "startTimer() LAP TIME");
+ long currentElapsedTime = timerCounter.getCurrentElapsedTime();
+ if (currentElapsedTime > 3000) // チャタリング防止（ラップタイムとして、３秒以内は記録しないようにする）
{
- Log.v(TAG, "startTimer() LAP TIME");
- // チャタリング防止（ラップタイムとして、３秒以内は記録しないようにする）
- if (timerCounter.getCurrentElapsedTime() > 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 + ") ]]]");
+
+ if (graphView != null)
{
- long lapTime = timerCounter.timeStamp();
- controller.vibrate(50);
- controller.getDataEntry().appendTimeData(lapTime);
+ graphView.notifyLapTime();
}
}
- else
+ }
+ else
+ {
+ Log.v(TAG, "startTimer() START");
+ controller.clearTimeStamp();
+ timerCounter.start();
+ MyTimerTrigger trigger = new MyTimerTrigger(this, 100, timerCounter);
+ trigger.startTimer();
+ currentLapCount = 0;
+ stopTrigger = trigger;
+ controller.timerStarted(true);
+ controller.vibrate(120);
+
+ Date date = new Date();
+ SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US);
+ String title = sdf1.format(date);
+ long startTime = timerCounter.getStartTime();
+ controller.getDataEntry().createIndex(title, startTime);
+
+ if (graphView != null)
{
- Log.v(TAG, "startTimer() START");
- timerCounter.start();
- MyTimerTrigger trigger = new MyTimerTrigger(this, 100, timerCounter);
- trigger.startTimer();
- controller.vibrate(120);
-
- Date date = new Date();
- SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US);
- String title = sdf1.format(date);
- controller.getDataEntry().createIndex(title, "", 0, timerCounter.getStartTime());
+ graphView.notifyStarted(startTime);
}
- updateTimerLabel();
}
+ updateTimerLabel();
}
catch (Exception e)
{
try
{
ITimerCounter timerCounter = counter;
- if (timerCounter != null)
+ if (timerCounter.isStarted())
{
- if (timerCounter.isStarted())
+ timerCounter.stop();
+ controller.timerStarted(false);
+ controller.vibrate(120);
+ controller.getDataEntry().finishTimeData(timerCounter.getStartTime(), timerCounter.getStopTime());
+
+ int lapCount = currentLapCount + 1;
+ long currentElapsedTime = timerCounter.getLastElapsedTime() - timerCounter.getElapsedTime(currentLapCount);
+ long refLapTime = timerCounter.getReferenceLapTime(lapCount);
+ long diffTime = (refLapTime == 0) ? 0 : (currentElapsedTime - refLapTime);
+ controller.addTimeStamp(lapCount, currentElapsedTime, diffTime);
+ ret = true;
+
+ LapTimeGraphView graphView = findViewById(R.id.graph_area);
+ if (graphView != null)
{
- timerCounter.stop();
- controller.vibrate(120);
- controller.getDataEntry().finishTimeData(timerCounter.getStartTime(), timerCounter.getStopTime());
- ret = true;
+ graphView.notifyStopped();
}
- updateTimerLabel();
}
+ updateTimerLabel();
}
catch (Exception e)
{
@Override
public void clickedBtn2()
{
- ITimerCounter timerCounter = counter;
- if (timerCounter != null)
+ if (!((ITimerCounter) counter).isStarted())
{
- if (!timerCounter.isStarted())
- {
- // 停止中は、記録一覧を呼び出す
- launchListActivity();
- }
+ // 停止中は、記録一覧を呼び出す
+ launchListActivity();
+
+ // ぶるぶる
+ controller.vibrate(35);
}
updateTimerLabel();
}
public void clickedBtn3()
{
ITimerCounter timerCounter = counter;
- if (timerCounter != null)
+ if (!timerCounter.isStarted())
{
- if (!timerCounter.isStarted())
+ timerCounter.reset();
+ controller.vibrate(50);
+ controller.clearTimeStamp();
+ currentLapCount = 0;
+ LapTimeGraphView graphView = findViewById(R.id.graph_area);
+ if (graphView != null)
{
- timerCounter.reset();
- controller.vibrate(50);
+ graphView.notifyReset();
}
- updateTimerLabel();
}
+ updateTimerLabel();
+ }
+
+ @Override
+ public void clickedArea()
+ {
+ Log.v(TAG, "clickedArea()");
+
}
@Override
return (false);
}
+ @Override
+ public boolean pushedArea()
+ {
+ try
+ {
+ // 基準値の設定ダイアログを表示する
+ SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+ final boolean viewMode = preferences.getBoolean(PREF_KEY_DISPLAY_LAPGRAPHIC, false);
+ final int selectionId = preferences.getInt(PREF_KEY_REFERENCE_TIME_SELECTION, 0);
+ final SelectReferenceViewModeDialog.SelectReferenceCallback callback = this;
+
+ this.runOnUiThread(() -> {
+ try
+ {
+ // 基準値＆表示モード設定ダイアログを表示する
+ SelectReferenceViewModeDialog dialog = SelectReferenceViewModeDialog.newInstance(viewMode, selectionId, callback);
+ FragmentManager manager = getSupportFragmentManager();
+ dialog.show(manager, "dialog");
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ });
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ return (true);
+ }
+
/**
*
*
{
try
{
- runOnUiThread(new Runnable() {
- @Override
- public void run() {
- updateTimerLabel();
- }
- });
+ runOnUiThread(this::updateTimerLabel);
}
catch (Exception e)
{
}
}
+ /**
+ *
+ *
+ */
private void updateMainSubCounter()
{
TextView main = findViewById(R.id.main_counter);
TextView sub = findViewById(R.id.sub_counter1);
ITimerCounter timerCounter = counter;
- if (timerCounter != null)
+ long time1 = timerCounter.getPastTime();
+ CharSequence str1 = TimeStringConvert.getTimeString(time1);
+ CharSequence str2 = "";
+ if (timerCounter.isStarted())
{
- long time1 = timerCounter.getPastTime();
- CharSequence str1 = TimeStringConvert.getTimeString(time1);
-
- CharSequence str2 = "";
- if (timerCounter.isStarted())
+ long time2 = timerCounter.getCurrentElapsedTime();
+ int lapCount = timerCounter.getElapsedCount();
+ if ((time2 >= 100) && (lapCount > 1))
{
- long time2 = timerCounter.getCurrentElapsedTime();
- int lapCount = timerCounter.getElapsedCount();
- if ((time2 >= 100) && (lapCount > 1))
- {
- str2 = "[" + lapCount + "] " + TimeStringConvert.getTimeString(time2);
- }
+ str2 = "[" + lapCount + "] " + TimeStringConvert.getTimeString(time2);
}
+ }
+
+ if ((str2.length() > 0)&&(isCounterLapTime))
+ {
+ // ラップタイムの方を大きく表示する
+ main.setText(str2);
+ sub.setText(str1);
+ }
+ else
+ {
+ main.setText(str1);
+ sub.setText(str2);
+ }
+ main.invalidate();
+ sub.invalidate();
+ }
+
+ /**
+ *
+ *
+ */
+ private void updateElapsedTimes()
+ {
+ if (isLaptimeView)
+ {
+ updateElapsedTimesGraph();
+ }
+ else
+ {
+ updateElapsedTimesText();
+ }
+ }
+
+ /**
+ *
+ *
+ */
+ private void updateElapsedTimesGraph()
+ {
+ //Log.v(TAG, "updateElapsedTimesGraph()");
+ LapTimeGraphView view = findViewById(R.id.graph_area);
+ view.invalidate();
+ }
+
+ /**
+ *
+ *
+ */
+ private void updateElapsedTimesText()
+ {
+ // Log.v(TAG, "updateElapsedTimesText()");
+ }
+
+ /**
+ * Launch ListActivity
+ *
+ */
+ private void launchListActivity()
+ {
+ Log.v(TAG, "launchListActivity()");
+ try
+ {
+ Intent intent = new Intent(this, ListActivity.class);
+ startActivity(intent);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
- if ((str2.length() > 0)&&(isCounterLapTime))
+ /**
+ *
+ *
+ */
+ @Override
+ protected void onUserLeaveHint()
+ {
+ Log.v(TAG, "onUserLeaveHint() " );
+ // ハードキー（ホームボタン）が押されたとき、これがひろえるが...
+ }
+
+ /**
+ *
+ *
+ */
+ @Override
+ public boolean dispatchKeyEvent(KeyEvent event)
+ {
+ Log.v(TAG, "dispatchKeyEvent() : " + event.getAction() + " (" + event.getKeyCode() + ")");
+
+ return (super.dispatchKeyEvent(event));
+ }
+
+ @Override
+ public void onPointerCaptureChanged(boolean hasCapture) {
+ super.onPointerCaptureChanged(hasCapture);
+ }
+
+ /**
+ *
+ *
+ */
+ @Override
+ public boolean onKeyDown(int keyCode, KeyEvent event)
+ {
+ Log.v(TAG, "onKeyDown() : " + event.getAction() + " (" + event.getKeyCode() + ")" + keyCode);
+ if (event.getRepeatCount() == 0)
+ {
+ if (keyCode == KeyEvent.KEYCODE_STEM_1)
{
- // ラップタイムの方を大きく表示する
- main.setText(str2);
- sub.setText(str1);
+ startTimer();
+ return (true);
}
- else
+ else if (keyCode == KeyEvent.KEYCODE_STEM_2)
+ {
+ startTimer();
+ return (true);
+ }
+ else if (keyCode == KeyEvent.KEYCODE_STEM_3)
{
- main.setText(str1);
- sub.setText(str2);
+ startTimer();
+ return (true);
}
- main.invalidate();
- sub.invalidate();
}
+ return (super.onKeyDown(keyCode, event));
}
-
- private void updateElapsedTimes()
+ /**
+ *
+ *
+ */
+ @Override
+ public void counterStatusChanged(final boolean forceStartTimer)
{
- String dummy = "";
- TextView area1 = findViewById(R.id.sub_counter2);
- TextView area2 = findViewById(R.id.sub_counter3);
- TextView area3 = findViewById(R.id.sub_counter4);
-
- ITimerCounter timerCounter = counter;
- if (timerCounter != null)
+ if (forceStartTimer)
{
- List<Long> elapsedTimes = timerCounter.getTimerList();
- int indexSize = elapsedTimes.size();
- if (indexSize <= 1)
+ try
{
- // ラップの記録がないので表示しません
- area1.setText(dummy);
- area1.invalidate();
- area2.setText(dummy);
- area2.invalidate();
- area3.setText(dummy);
- area3.invalidate();
- return;
+ LapTimeGraphView graphView = findViewById(R.id.graph_area);
+ MyTimerTrigger trigger = new MyTimerTrigger(this, 100, counter);
+ trigger.startTimer();
+ stopTrigger = trigger;
+ if (graphView != null)
+ {
+ graphView.notifyLapTime();
+ }
}
- if (indexSize <= 2)
+ catch (Exception e)
{
- // ラップが１つとれた場合
- long time = (elapsedTimes.get(indexSize - 1) - elapsedTimes.get(indexSize - 2));
- String elapsedTime = "[" + (timerCounter.getElapsedCount() - 1) + "] " + TimeStringConvert.getTimeString(time);
- area1.setText(elapsedTime);
- area1.invalidate();
- area2.setText(dummy);
- area2.invalidate();
- area3.setText(dummy);
- area3.invalidate();
- return;
+ e.printStackTrace();
}
- if (indexSize <= 3)
+ }
+
+ runOnUiThread(() -> {
+ // 自動スタート時の処理。。
+ if (pendingStart)
{
- // ラップが３つとれた場合
- long time1 = (elapsedTimes.get(indexSize - 2) - elapsedTimes.get(indexSize - 3));
- long time2 = (elapsedTimes.get(indexSize - 1) - elapsedTimes.get(indexSize - 2));
- String elapsedTime1 = "[" + (timerCounter.getElapsedCount() - 2) + "] " + TimeStringConvert.getTimeString(time1);
- String elapsedTime2 = "[" + (timerCounter.getElapsedCount() - 1) + "] " + TimeStringConvert.getTimeString(time2);
- area1.setText(elapsedTime1);
- area1.invalidate();
- area2.setText(elapsedTime2);
- area2.invalidate();
- area3.setText(dummy);
- area3.invalidate();
- return;
+ startTimer();
+ pendingStart = false;
}
- // ラップが４つ以上ある場合
- long time1 = (elapsedTimes.get(indexSize - 3) - elapsedTimes.get(indexSize - 4));
- long time2 = (elapsedTimes.get(indexSize - 2) - elapsedTimes.get(indexSize - 3));
- long time3 = (elapsedTimes.get(indexSize - 1) - elapsedTimes.get(indexSize - 2));
- String elapsedTime1 = "[" + (timerCounter.getElapsedCount() - 3) + "] " + TimeStringConvert.getTimeString(time1);
- String elapsedTime2 = "[" + (timerCounter.getElapsedCount() - 2) + "] " + TimeStringConvert.getTimeString(time2);
- String elapsedTime3 = "[" + (timerCounter.getElapsedCount() - 1) + "] " + TimeStringConvert.getTimeString(time3);
- area1.setText(elapsedTime1);
- area1.invalidate();
- area2.setText(elapsedTime2);
- area2.invalidate();
- area3.setText(elapsedTime3);
- area3.invalidate();
- }
+ // ラップタイム表示状態の更新
+ reloadLapTimeList(forceStartTimer);
+
+ // 表示ビューの切り替え
+ changeGraphicView(isLaptimeView);
+
+ // 表示のボタン状態を変更
+ updateTimerLabel();
+ });
}
/**
- * Launch ListActivity
+ *
*
*/
- private void launchListActivity()
+ private void reloadLapTimeList(final boolean forceStartTimer)
{
- Log.v(TAG, "launchListActivity()");
+ if (!forceStartTimer)
+ {
+ return;
+ }
+
+ // Adapter と TimerCounterの整合性を確認
try
{
- Intent intent = new Intent(this, ListActivity.class);
- startActivity(intent);
+ List<Long> lapTimeList;
+ lapTimeList = ((ITimerCounter) counter).getLapTimeList();
+ int lapCount = lapTimeList.size();
+ int listCount = controller.getLapTimeCount();
+ if (lapCount != listCount)
+ {
+ Log.v(TAG, "LAP COUNT IS MISMATCH!!! lap:" + lapCount + " vs list:" + listCount);
+ int index = 0;
+ controller.clearTimeStamp();
+ long prevTime = lapTimeList.get(0);
+ for (long lapTime : lapTimeList)
+ {
+ index++;
+ if (prevTime != lapTime)
+ {
+ long refLapTime = counter.getReferenceLapTime(index - 1);
+ long curLapTime = lapTime - prevTime;
+ long calcRefLapTime = (refLapTime == 0) ? 0 : (curLapTime - refLapTime);
+ controller.addTimeStamp((index - 1), curLapTime, calcRefLapTime);
+ }
+ prevTime = lapTime;
+ }
+ currentLapCount = lapCount - 1;
+ }
}
catch (Exception e)
{
}
}
- /*
+ /**
*
*
*/
-/*
- private String getElapsedTime()
+ private void changeGraphicView(boolean isGraphics)
{
- String elapsedTime = "";
- ITimerCounter timerCounter = counter;
- if (timerCounter != null)
+ try
{
- int count = timerCounter.getElapsedCount();
- if (count > 0)
+ LapTimeGraphView graphView = findViewById(R.id.graph_area);
+ ListView listView = findViewById(R.id.laptime_list_area);
+ if (isGraphics)
+ {
+ graphView.setITimerCounter(counter);
+ graphView.setVisibility(View.VISIBLE);
+ listView.setVisibility(View.INVISIBLE);
+ }
+ else
{
- elapsedTime = "[" + timerCounter.getElapsedCount() + "] " + MyTimerCounter.getTimeString(timerCounter.getCurrentElapsedTime());
+ graphView.setVisibility(View.INVISIBLE);
+ listView.setVisibility(View.VISIBLE);
}
+ //controller.vibrate(30);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
}
- return (elapsedTime);
}
-*/
+
+ @Override
+ public AmbientModeSupport.AmbientCallback getAmbientCallback()
+ {
+ return (new AmbientModeSupport.AmbientCallback() {
+ public void onEnterAmbient(Bundle ambientDetails)
+ {
+ Log.v(TAG, "onEnterAmbient()");
+ }
+ public void onExitAmbient(Bundle ambientDetails)
+ {
+ Log.v(TAG, "onExitAmbient()");
+ //updateTimerLabel();
+ }
+ });
+ }
+
+ @Override
+ public void selectedReferenceViewMode(int referenceId, int viewMode)
+ {
+ isLaptimeView = (viewMode != 0);
+ currentReferenceId = referenceId;
+
+ controller.setDisplayMode(isLaptimeView);
+ controller.setReferenceTimerSelection(currentReferenceId);
+ controller.setupReferenceData();
+
+ Log.v(TAG, "pushedArea() : " + isLaptimeView + " REF: " + currentReferenceId);
+
+ runOnUiThread(() -> {
+ // ラップタイム表示状態の更新
+ reloadLapTimeList(true);
+
+ // 表示ビューの切り替え
+ changeGraphicView(isLaptimeView);
+
+ // 表示のボタン状態を変更
+ updateTimerLabel();
+ });
+ }
}
OSDN Git Service
