tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
mdtrooper 2013-12-12 11:19:15 +00:00
parent d9edb3b62f
commit c9508d2dad
6 changed files with 68 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pandora_agents/android/ChangeLog
View File

@ -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,

2
pandora_agents/android/mobile/res/layout/simple_spinner_item.xml
View File

@ -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" />

2
pandora_agents/android/tablet/res/layout/simple_spinner_item.xml
View File

@ -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" />

43
pandora_agents/android/tablet/res/layout/statusnosim.xml
View File

@ -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"

2
pandora_agents/android/tablet/src/pandroid/agent/Core.java
View File

@ -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";

10
pandora_agents/android/tablet/src/pandroid/agent/Status.java
View File

@ -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);
}