Add connect/disconnect and iBeacon data

[~andy/iBeaconNav] / src / edu / ucla / iBeaconNav / Main.java

diff --git a/src/edu/ucla/iBeaconNav/Main.java b/src/edu/ucla/iBeaconNav/Main.java
index 9082279c9640887711cf34454391eb5ce17b396c..e8d25c1c012d1f6f536526960b198c73f8a1c5ab 100644 (file)
--- a/src/edu/ucla/iBeaconNav/Main.java
+++ b/src/edu/ucla/iBeaconNav/Main.java
@@ -30,7 +30,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import android.os.Bundle;
- 
+
 import com.google.android.gms.maps.*;
 import com.google.android.gms.maps.model.*;
 
@@ -67,7 +67,7 @@ public class Main extends Activity
                Util.debug("Main: onRegister_task");
                this.task    = task;
        }
-       
+
        private void onPosition()
        {
                Util.debug("Main: onPosition");
@@ -147,19 +147,23 @@ public class Main extends Activity
                        textView1 = (TextView)findViewById(R.id.stableText);
                        displayNum = 1;
                        break;
+               case BEACON:
+                       textView1 = (TextView)findViewById(R.id.ibLatText);
+                       textView2 = (TextView)findViewById(R.id.ibLonText);
+                       textView3 = (TextView)findViewById(R.id.ibDistText);
+                       displayNum = 3;
+                       break;
                default:
                        Util.debug("Main: Nothing Matches");
                }
-               
-               textView1.setText(Float.toString(data[1]));
-               if (displayNum >1){
-                       textView2.setText(Float.toString(data[2]));
-               }
-               if (displayNum >2){
-                       textView3.setText(Float.toString(data[3]));
+
+               switch (displayNum) {
+                       case 3: textView3.setText(Float.toString(data[3]));
+                       case 2: textView2.setText(Float.toString(data[2]));
+                       case 1: textView1.setText(Float.toString(data[1]));
                }
        }
-       
+
        /* Private service methods */
        private void register()
        {
@@ -220,7 +224,7 @@ public class Main extends Activity
                        this.scroll    = (ScrollView)   findViewById(R.id.debug_scroll);
                        this.rstHdBttn = (Button)       findViewById(R.id.rstHdBttn);
                        this.rstDstBttn= (Button)       findViewById(R.id.rstDstBttn);
-                       
+
                        // TODO - remove these
                        rstHdBttn.setOnClickListener(new View.OnClickListener() {
                                @Override
@@ -230,7 +234,7 @@ public class Main extends Activity
                                        .putExtra("Command",   CMD.Command.RSTHEAD));
                                }
                        });
-                       
+
                        rstDstBttn.setOnClickListener(new View.OnClickListener() {
                                @Override
                                public void onClick(View v) {