Changeset de61e47 in orbit for android/src

Timestamp:

12/25/13 16:38:53 (9 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, Servo

Children:

005b954

Parents:

7ec2d63

Message:

• added Scoring and High Score tracking
• updated version number to 1.5.0

Location:

android/src/info/puzzlebox/orbit

Files:

• FragmentTabFlightThinkGear.java (modified) (6 diffs)
• OrbitTabActivity.java (modified) (4 diffs)

android/src/info/puzzlebox/orbit/FragmentTabFlightThinkGear.java

@@ -28 +28 @@
 import android.widget.ProgressBar;
 import android.widget.SeekBar;
+import android.widget.TextView;
 import android.widget.Toast;
 
@@ -71 +72 @@
         Number[] rawEEG = new Number[512];
         int arrayIndex = 0;
+
+        int minimumScoreTarget = 40;
+        int scoreCurrent = 0;
+        int scoreHigh = 0;
 
 
@@ -86 +91 @@
         Button testFlightButton;
         Button stopTestButton;
+        TextView textViewScore;
+        TextView textViewHighScore;
 
         ImageView imageViewStatus;
@@ -259 +266 @@
                 connectButton.setOnClickListener(this);
 
+                textViewScore = (TextView) v.findViewById(R.id.textViewScore);
+                textViewHighScore = (TextView) v.findViewById(R.id.textViewHighScore);
+
 
                 /**
@@ -266 +276 @@
                 bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
 
-                if(bluetoothAdapter == null) {
+                if (bluetoothAdapter == null) {
                         // Alert user that Bluetooth is not available
                         Toast.makeText(((OrbitTabActivity)getActivity()), "Bluetooth not available", Toast.LENGTH_LONG).show();
@@ -980 +990 @@
         } // updateEEGRawHistory
 
+        // ################################################################
+
+        public void updateScore() {
+
+                int eegAttentionScore = 0;
+                int eegAttention = progressBarAttention.getProgress();
+                int eegAttentionTarget = seekBarAttention.getProgress();
+
+                int eegMeditationScore = 0;
+                int eegMeditation = progressBarMeditation.getProgress();
+                int eegMeditationTarget = seekBarMeditation.getProgress();
+
+                if ((eegAttention >= eegAttentionTarget) &&
+                                (eegAttentionTarget > minimumScoreTarget))
+                        eegAttentionScore = eegAttention;
+
+                if ((eegMeditation >= eegMeditationTarget) &&
+                                (eegMeditationTarget > minimumScoreTarget))
+                        eegMeditationScore = eegMeditation;
+
+                if (eegAttentionScore > eegMeditationScore)
+                        scoreCurrent = scoreCurrent + eegAttentionScore;
+                else
+                        scoreCurrent = scoreCurrent + eegMeditationScore;
+
+                textViewScore.setText(Integer.toString(scoreCurrent));
+
+                if (scoreCurrent > scoreHigh) {
+                        scoreHigh = scoreCurrent;
+                        textViewHighScore.setText(Integer.toString(scoreHigh));
+                }
+
+        } // updateScore
+
+
+        // ################################################################
+
+        public void resetCurrentScore() {
+
+                scoreCurrent = 0;
+                textViewScore.setText(Integer.toString(scoreCurrent));
+
+        } // resetCurrentScore
+
 
 } // FragmentTabFlightThinkGear

android/src/info/puzzlebox/orbit/OrbitTabActivity.java

@@ -15 +15 @@
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 
 import org.apache.http.HttpResponse;
@@ -780 +779 @@
                         }
 
+                        updateScore();
+
                         command = "hover";
 
@@ -786 +787 @@
                         /** Land the helicopter */
                         stopControl();
+
+                        resetCurrentScore();
 
                         command = "neutral";
@@ -964 +967 @@
         // ################################################################
 
+        public void updateScore() {
+
+                FragmentTabFlightThinkGear fragmentFlight = 
+                                (FragmentTabFlightThinkGear) getSupportFragmentManager().findFragmentByTag( getTabFragmentFlightThinkGear() );
+
+                if (fragmentFlight != null)
+                        fragmentFlight.updateScore();
+
+        } // updateScore
+
+
+        // ################################################################
+
+        public void resetCurrentScore() {
+
+                FragmentTabFlightThinkGear fragmentFlight = 
+                                (FragmentTabFlightThinkGear) getSupportFragmentManager().findFragmentByTag( getTabFragmentFlightThinkGear() );
+
+                if (fragmentFlight != null)
+                        fragmentFlight.resetCurrentScore();
+
+        } // resetCurrentScore
+
+
+        // ################################################################
+
         /**
          * @param audioHandler the audioHandler to update command