Changeset ebf23f0 in orbit for android/src

Timestamp:

12/27/13 04:18:05 (9 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, Servo

Children:

71f66b0

Parents:

4e6333d

Message:

• Scoring mechanism re-balanced
• Don't display device warning messages more than twice

Location:

android/src/info/puzzlebox/orbit

Files:

• FragmentTabAdvanced.java (modified) (2 diffs)
• FragmentTabFlightThinkGear.java (modified) (2 diffs)
• OrbitTabActivity.java (modified) (1 diff)

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

@@ -986 +986 @@
                         if (! checkBoxInvertControlSignal.isChecked())
                                 checkBoxInvertControlSignal.performClick();
-                        Toast.makeText(((OrbitTabActivity)getActivity()), 
-                                        "Warning: HTC Droid DNA detected, which has known compatability issues with infrared transmitter. Contact Support for more information.", Toast.LENGTH_LONG).show();
+
+                        // Display a warning pop-up about this device, but not more than twice
+                        if (((OrbitTabActivity)getActivity()).deviceWarningMessagesDisplayed < 2) {
+                                Toast.makeText(((OrbitTabActivity)getActivity()), 
+                                                "Warning: HTC Droid DNA detected, which has known compatability issues with infrared transmitter. Contact Support for more information.", Toast.LENGTH_LONG).show();
+                                ((OrbitTabActivity)getActivity()).deviceWarningMessagesDisplayed = 
+                                                ((OrbitTabActivity)getActivity()).deviceWarningMessagesDisplayed + 1;
+                        }
                 } 
 
@@ -996 +1002 @@
                         if (! checkBoxInvertControlSignal.isChecked())
                                 checkBoxInvertControlSignal.performClick();
-                        Toast.makeText(((OrbitTabActivity)getActivity()), 
-                                        "Warning: HTC One detected, which has known compatability issues with infrared transmitter. Contact Support for more information.", Toast.LENGTH_LONG).show();
+
+                        // Display a warning pop-up about this device, but not more than twice
+                        if (((OrbitTabActivity)getActivity()).deviceWarningMessagesDisplayed < 2) {
+                                Toast.makeText(((OrbitTabActivity)getActivity()), 
+                                                "Warning: HTC One detected, which has known compatability issues with infrared transmitter. Contact Support for more information.", Toast.LENGTH_LONG).show();
+                                ((OrbitTabActivity)getActivity()).deviceWarningMessagesDisplayed = 
+                                                ((OrbitTabActivity)getActivity()).deviceWarningMessagesDisplayed + 1;
+                        }
                 } 
 

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

@@ -1004 +1004 @@
 
         public void updateScore() {
+                
+                /**
+                 * Score points based on target slider levels
+                 * If you pass your goal with either Attention or Mediation
+                 * the higher target of the two will counts as points per second.
+                 * 
+                 * Minimum threshold for points is set as "minimumScoreTarget"
+                 * 
+                 * For example, assume minimumScoreTarget is 40%.
+                 * If your target Attention is 60% and you go past to reach 80%
+                 * you will receive 20 points per second (60-40). If your 
+                 * target is 80% and you reach 80% you will receive 40 
+                 * points per second (80-40).
+                 * 
+                 * You can set both Attention and Meditation targets at the
+                 * same time. Reaching either will fly the helicopter but you
+                 * will only receive points for the higher-scoring target of
+                 * the two.
+                 * 
+                 */
 
                 int eegAttentionScore = 0;
@@ -1015 +1035 @@
                 if ((eegAttention >= eegAttentionTarget) &&
                                 (eegAttentionTarget > minimumScoreTarget))
-                        eegAttentionScore = eegAttention;
+                        eegAttentionScore = eegAttentionTarget - minimumScoreTarget;
 
                 if ((eegMeditation >= eegMeditationTarget) &&
                                 (eegMeditationTarget > minimumScoreTarget))
-                        eegMeditationScore = eegMeditation;
+                        eegMeditationScore = eegMeditationTarget - minimumScoreTarget;
 
                 if (eegAttentionScore > eegMeditationScore)

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

@@ -78 +78 @@
         boolean invertControlSignal = false;
         boolean tiltSensorControl = false;
+        int deviceWarningMessagesDisplayed = 0;