From 0f4735399c711b9f3fb1507b7fd855c954460707 Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Thu, 12 Dec 2013 11:19:15 +0000
Subject: [PATCH] 2013-12-12 Miguel de Dios <miguel.dedios@artica.es>

	* tablet/src/pandroid/agent/Core.java,

	tablet/src/pandroid/agent/Status.java.

	tablet/res/layout/statusnosim.xml,

	tablet/res/layout/simple_spinner_item.xml,

	mobile/res/layout/simple_spinner_item.xml: some changes.






git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9215 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_agents/android/ChangeLog              | 13 ++++++
 .../mobile/res/layout/simple_spinner_item.xml |  2 +-
 .../tablet/res/layout/simple_spinner_item.xml |  2 +-
 .../android/tablet/res/layout/statusnosim.xml | 43 ++++++++++++++++++-
 .../tablet/src/pandroid/agent/Core.java       |  2 +-
 .../tablet/src/pandroid/agent/Status.java     | 10 +++++
 6 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/pandora_agents/android/ChangeLog b/pandora_agents/android/ChangeLog
index bad0bef39f..29e2f08e27 100644
--- a/pandora_agents/android/ChangeLog
+++ b/pandora_agents/android/ChangeLog
@@ -1,3 +1,16 @@
+2013-12-12 Miguel de Dios <miguel.dedios@artica.es>
+	
+	* tablet/src/pandroid/agent/Core.java,
+	tablet/src/pandroid/agent/Status.java.
+	tablet/res/layout/statusnosim.xml,
+	tablet/res/layout/simple_spinner_item.xml,
+	mobile/res/layout/simple_spinner_item.xml: some changes.
+
+2013-12-11 Miguel de Dios <miguel.dedios@artica.es>
+	
+	* tablet/src/pandroid/agent/Core.java: set firefly as the default
+	server address.
+
 2013-12-11 Miguel de Dios <miguel.dedios@artica.es>
 	
 	* mobile/src/pandroid/agent/Setup.java,
diff --git a/pandora_agents/android/mobile/res/layout/simple_spinner_item.xml b/pandora_agents/android/mobile/res/layout/simple_spinner_item.xml
index 1dd05a2cb9..b12067c7c8 100644
--- a/pandora_agents/android/mobile/res/layout/simple_spinner_item.xml
+++ b/pandora_agents/android/mobile/res/layout/simple_spinner_item.xml
@@ -4,5 +4,5 @@
     android:singleLine="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:textColor="#ffffff"
+    android:textColor="#00ff00"
     android:ellipsize="marquee" />
\ No newline at end of file
diff --git a/pandora_agents/android/tablet/res/layout/simple_spinner_item.xml b/pandora_agents/android/tablet/res/layout/simple_spinner_item.xml
index 1dd05a2cb9..b12067c7c8 100644
--- a/pandora_agents/android/tablet/res/layout/simple_spinner_item.xml
+++ b/pandora_agents/android/tablet/res/layout/simple_spinner_item.xml
@@ -4,5 +4,5 @@
     android:singleLine="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:textColor="#ffffff"
+    android:textColor="#00ff00"
     android:ellipsize="marquee" />
\ No newline at end of file
diff --git a/pandora_agents/android/tablet/res/layout/statusnosim.xml b/pandora_agents/android/tablet/res/layout/statusnosim.xml
index 7d6f8d23a5..d3b7da27a5 100644
--- a/pandora_agents/android/tablet/res/layout/statusnosim.xml
+++ b/pandora_agents/android/tablet/res/layout/statusnosim.xml
@@ -75,6 +75,47 @@
 					android:layout_below="@id/latitude_label_str"
 					
 				/>
+				
+				 <TableRow
+                    android:id="@+id/tableRow6"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/latitude_value_str" >
+
+                    <TextView
+                        android:id="@+id/receive_bytes_value_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/receive_bytes"
+                        android:textSize="14sp"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/receive_bytes_value"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
+                </TableRow>
+
+                <TableRow
+                    android:id="@+id/tableRow7"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/tableRow6" >
+
+                    <TextView
+                        android:id="@+id/transmit_bytes_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/transmit_bytes"
+                        android:textSize="14sp"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/transmit_bytes_value"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
+                </TableRow>
+				
 				<TextView
 					android:id="@+id/longitude_label_str"
 					android:layout_width="wrap_content"
@@ -82,7 +123,7 @@
 					android:text="@string/longitude"
 					android:textSize="14sp"
 					android:textStyle="bold"
-					android:layout_below="@id/latitude_value_str"
+					android:layout_below="@id/tableRow7"
 				/>
 				<TextView
 					android:id="@+id/longitude_value_str"
diff --git a/pandora_agents/android/tablet/src/pandroid/agent/Core.java b/pandora_agents/android/tablet/src/pandroid/agent/Core.java
index 1069a13847..b489132161 100644
--- a/pandora_agents/android/tablet/src/pandroid/agent/Core.java
+++ b/pandora_agents/android/tablet/src/pandroid/agent/Core.java
@@ -42,7 +42,7 @@ public class Core {
 	//					  DEFAULT CONFIGURATION MODULES					//
 	//																	//
 
-	static volatile public String defaultServerAddr = "192.168.70.182";  //master address
+	static volatile public String defaultServerAddr = "firefly.artica.es";  //master address
 	static volatile public String defaultServerPort = "41121";
 	static volatile public int defaultInterval = 300;
 	static volatile public String defaultAgentName = "pandroid";
diff --git a/pandora_agents/android/tablet/src/pandroid/agent/Status.java b/pandora_agents/android/tablet/src/pandroid/agent/Status.java
index dfb99d17ac..05dd920832 100644
--- a/pandora_agents/android/tablet/src/pandroid/agent/Status.java
+++ b/pandora_agents/android/tablet/src/pandroid/agent/Status.java
@@ -238,6 +238,16 @@ public class Status  extends Activity {
 		if (Core.upTime != 0) {
 			textView.setText("" + Core.upTime+" "+ getString(R.string.seconds));
 		}
+		
+		// receiveBytes
+		textView = (TextView)findViewById(R.id.receive_bytes_value);
+		textView.setText("");
+		textView.setText("" + Core.receiveBytes);
+
+		// transmiteBytes
+		textView = (TextView)findViewById(R.id.transmit_bytes_value);
+		textView.setText("");
+		textView.setText("" + Core.transmitBytes);
 
 	}