From d38a58a43957d19acd1d815fc8062b0e4145338b Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Fri, 27 Apr 2012 12:30:31 +0000 Subject: [PATCH] 2012-12-27 Miguel de Dios * AndroidManifest.xml, src/pandroid_event_viewer/pandorafms/PopupValidationEvent.java, src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java, src/pandroid_event_viewer/pandorafms/Main.java, src/pandroid_event_viewer/pandorafms/About.java, src/pandroid_event_viewer/pandorafms/Options.java, src/pandroid_event_viewer/pandorafms/Info.java, src/pandroid_event_viewer/pandorafms/EventList.java, res/values/strings.xml,res/values-en/strings.xml, res/values-es/strings.xml,res/layout/info.xml: fixed some things and added more stability and a pretty splashscreen. MERGED FROM BRANCH 4.0.2 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6209 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- .../pandroid_event_viewer/AndroidManifest.xml | 7 ++ extras/pandroid_event_viewer/ChangeLog | 20 +++++- .../pandroid_event_viewer/res/layout/info.xml | 67 +++++++++++++++++++ .../res/values-en/strings.xml | 1 + .../res/values-es/strings.xml | 4 ++ .../res/values/strings.xml | 10 +-- .../pandorafms/About.java | 31 ++++++++- .../pandorafms/EventList.java | 12 +++- .../pandorafms/Info.java | 20 ++++++ .../pandorafms/Main.java | 18 ++++- .../pandorafms/Options.java | 12 +++- .../PandroidEventviewerActivity.java | 5 +- .../pandorafms/PopupValidationEvent.java | 4 +- 13 files changed, 191 insertions(+), 20 deletions(-) create mode 100644 extras/pandroid_event_viewer/res/layout/info.xml create mode 100644 extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Info.java diff --git a/extras/pandroid_event_viewer/AndroidManifest.xml b/extras/pandroid_event_viewer/AndroidManifest.xml index c793683b54..b4a47559f1 100644 --- a/extras/pandroid_event_viewer/AndroidManifest.xml +++ b/extras/pandroid_event_viewer/AndroidManifest.xml @@ -73,6 +73,13 @@ android:theme="@android:style/Theme.Dialog" android:configChanges="orientation|keyboardHidden" > + + diff --git a/extras/pandroid_event_viewer/ChangeLog b/extras/pandroid_event_viewer/ChangeLog index c660be5f56..ecd7dacc07 100644 --- a/extras/pandroid_event_viewer/ChangeLog +++ b/extras/pandroid_event_viewer/ChangeLog @@ -1,7 +1,23 @@ -2011-12-25 Miguel de Dios +2012-12-27 Miguel de Dios + + * AndroidManifest.xml, + src/pandroid_event_viewer/pandorafms/PopupValidationEvent.java, + src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java, + src/pandroid_event_viewer/pandorafms/Main.java, + src/pandroid_event_viewer/pandorafms/About.java, + src/pandroid_event_viewer/pandorafms/Options.java, + src/pandroid_event_viewer/pandorafms/Info.java, + src/pandroid_event_viewer/pandorafms/EventList.java, + res/values/strings.xml,res/values-en/strings.xml, + res/values-es/strings.xml,res/layout/info.xml: fixed some things and + added more stability and a pretty splashscreen. + + MERGED FROM BRANCH 4.0.2 + +2012-04-25 Miguel de Dios Apply patch from user Santiago Munín González - + * src/pandroid_event_viewer/pandorafms/Main.java: fixed the empty combo group because sometimes this is as null. diff --git a/extras/pandroid_event_viewer/res/layout/info.xml b/extras/pandroid_event_viewer/res/layout/info.xml new file mode 100644 index 0000000000..76d7363e82 --- /dev/null +++ b/extras/pandroid_event_viewer/res/layout/info.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/extras/pandroid_event_viewer/res/values-en/strings.xml b/extras/pandroid_event_viewer/res/values-en/strings.xml index 7a6f186d1f..d75d68a894 100644 --- a/extras/pandroid_event_viewer/res/values-en/strings.xml +++ b/extras/pandroid_event_viewer/res/values-en/strings.xml @@ -53,6 +53,7 @@ Update configuration successful. Update configuration is failed. Please set the preferences as the API URL, user and password for your Pandora FMS. + Pandroid Event Viewer is connecting with PandoraFMS public demo, please change the preferences for your Pandora FMS. Update filter sucessful. Update filter is failed. Validate Event diff --git a/extras/pandroid_event_viewer/res/values-es/strings.xml b/extras/pandroid_event_viewer/res/values-es/strings.xml index feceaa4164..afaf1736e8 100644 --- a/extras/pandroid_event_viewer/res/values-es/strings.xml +++ b/extras/pandroid_event_viewer/res/values-es/strings.xml @@ -54,6 +54,7 @@ Configuración guardada correctamente. Configuración no ha podido guardarse.. Por favor configure sus preferencias, como la API URL, usuario y contraseña de su Pandora FMS. + Pandroid Event Viewer esta conectando con la demo pública, por favor cambia en las preferencias para tu Pandora FMS. Actualizado filtro correctamente. Actualización filtro no ha podido guardarse. @@ -93,4 +94,7 @@ Evento validado Visor de eventos para Pandora FMS. + Bienvenido al visor de eventos de Pandora FMS para Android +

Esta aplicación se usa para ver de forma autónoma y cómoda, el estado de los eventos resportados por un servidor de monitorización Pandora FMS. Desde esta aplicación podrá ver en tiempo real los eventos, e incluso validar o filtrarlos.

+

La configuración por defecto apunta al servidor de demo de Pandora FMS en firefly.artica.es. Cambie la configuración para que apunte a su propio servidor de Pandora FMS.

 diff --git a/extras/pandroid_event_viewer/res/values/strings.xml b/extras/pandroid_event_viewer/res/values/strings.xml index 2a62a50f3b..4d50a7b0f8 100644 --- a/extras/pandroid_event_viewer/res/values/strings.xml +++ b/extras/pandroid_event_viewer/res/values/strings.xml @@ -59,6 +59,7 @@ Update configuration successful. Update configuration is failed. Please set the preferences as the API URL, user and password for your Pandora FMS. + Pandroid Event Viewer is connecting with PandoraFMS public demo, please change the preferences for your Pandora FMS. Update filter successful. Update filter is failed. @@ -97,8 +98,9 @@ Unknown event Event validated - - Realtime event viewer for Pandora FMS. - - + + Realtime event viewer for Pandora FMS. + Welcome to Pandora FMS Event viewer for Android +

This app is used for to see confortable and standaralone the events status from the monitoring server of Pandora FMS. From this app you can see in realtime the events and validate or filter.

+

The configuration as default connecting with public demo of Pandora FMS in firefly.artica.es. Please change the configuration for to use your Pandora FMS server.

 diff --git a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/About.java b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/About.java index 60b8cfe21b..7041d7b234 100644 --- a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/About.java +++ b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/About.java @@ -1,9 +1,13 @@ package pandroid_event_viewer.pandorafms; import android.app.Activity; +import android.content.SharedPreferences; import android.os.Bundle; import android.text.Html; import android.text.method.LinkMovementMethod; +import android.util.Log; +import android.view.View; +import android.widget.CheckBox; import android.widget.TextView; public class About extends Activity { @@ -11,10 +15,35 @@ public class About extends Activity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.about); + setContentView(R.layout.info); TextView text = (TextView) findViewById(R.id.url_pandora); text.setText(Html.fromHtml("PandoraFMS.org")); text.setMovementMethod(LinkMovementMethod.getInstance()); + + CheckBox check_show = (CheckBox)findViewById(R.id.dont_show_again_extended); + + check_show.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + CheckBox check_show = (CheckBox)v; + if (check_show.isChecked()) { + SharedPreferences preferences = getSharedPreferences( + getString(R.string.const_string_preferences), + Activity.MODE_PRIVATE); + SharedPreferences.Editor editorPreferences = preferences.edit(); + editorPreferences.putBoolean("show_popup_info", false); + editorPreferences.commit(); + } + else { + SharedPreferences preferences = getSharedPreferences( + getString(R.string.const_string_preferences), + Activity.MODE_PRIVATE); + SharedPreferences.Editor editorPreferences = preferences.edit(); + editorPreferences.putBoolean("show_popup_info", true); + editorPreferences.commit(); + } + } + }); } } diff --git a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/EventList.java b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/EventList.java index e3426d2764..24a99b270b 100644 --- a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/EventList.java +++ b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/EventList.java @@ -115,6 +115,12 @@ public class EventList extends ListActivity { registerReceiver(onBroadcast, new IntentFilter("eventlist.java")); this.toggleLoadingLayout(); + + if (this.object.show_popup_info) { + this.object.show_popup_info = false; + i = new Intent(this, About.class); + startActivity(i); + } } public void onRestart() { @@ -588,7 +594,7 @@ public class EventList extends ListActivity { return return_var; } - private class OnItemClickListener implements OnClickListener{ + private class OnItemClickListener implements OnClickListener{ private int mPosition; private PandroidEventviewerActivity object; OnItemClickListener(int position, PandroidEventviewerActivity object){ @@ -600,8 +606,8 @@ public class EventList extends ListActivity { EventListItem item = this.object.eventList.get(mPosition); item.opened = !item.opened; this.object.eventList.set(mPosition, item); - la.notifyDataSetChanged(); - } + la.notifyDataSetChanged(); + } } public class OnClickListenerButtonValidate implements OnClickListener { diff --git a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Info.java b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Info.java new file mode 100644 index 0000000000..cd37bf6a8b --- /dev/null +++ b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Info.java @@ -0,0 +1,20 @@ +package pandroid_event_viewer.pandorafms; + +import android.app.Activity; +import android.os.Bundle; +import android.text.Html; +import android.text.method.LinkMovementMethod; +import android.widget.TextView; + +public class Info extends Activity { + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + setContentView(R.layout.about); + + TextView text = (TextView) findViewById(R.id.url_pandora); + text.setText(Html.fromHtml("PandoraFMS.org")); + text.setMovementMethod(LinkMovementMethod.getInstance()); + } +} diff --git a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java index c2d141b532..ec97b1f748 100644 --- a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java +++ b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java @@ -56,8 +56,8 @@ public class Main extends Activity { final Button buttonbuttonSetAsFilterWatcher = (Button) findViewById(R.id.button_set_as_filter_watcher); //Check if the user preferences it is set. - if ((object.user.length() == 0) && (object.password.length() == 0) - && (object.url.length() == 0)) { + if (object.user.length() == 0 || object.password.length() == 0 || + object.url.length() == 0) { Toast toast = Toast.makeText(this.getApplicationContext(), this.getString(R.string.please_set_preferences_str), Toast.LENGTH_SHORT); @@ -67,6 +67,12 @@ public class Main extends Activity { buttonSearch.setEnabled(false); buttonbuttonSetAsFilterWatcher.setEnabled(false); } + else if (object.user.equals("demo") || object.password.equals("demo")) { + Toast toast = Toast.makeText(this.getApplicationContext(), + this.getString(R.string.preferences_set_demo_pandora_str), + Toast.LENGTH_LONG); + toast.show(); + } else { buttonSearch.setEnabled(false); buttonReset.setEnabled(false); @@ -81,7 +87,7 @@ public class Main extends Activity { comboSeverity = (Spinner) findViewById(R.id.severity_combo); ArrayAdapter adapter = ArrayAdapter.createFromResource( - this, R.array.severity_array_values, android.R.layout.simple_spinner_item); + this, R.array.severity_array_values, android.R.layout.simple_spinner_item); adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); comboSeverity.setAdapter(adapter); @@ -123,6 +129,12 @@ public class Main extends Activity { save_filter_watcher(); } }); + + if (this.object.show_popup_info) { + this.object.show_popup_info = false; + i = new Intent(this, About.class); + startActivity(i); + } } public void onRestart() { diff --git a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Options.java b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Options.java index ddee3bf7da..f3784f449c 100644 --- a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Options.java +++ b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Options.java @@ -38,9 +38,9 @@ public class Options extends Activity { this.getString(R.string.const_string_preferences), Activity.MODE_PRIVATE); - url = preferences.getString("url", "http://farscape.artica.es/pandora_console"); - user = preferences.getString("user", ""); - password = preferences.getString("password", ""); + url = preferences.getString("url", "http://firefly.artica.es/pandora_demo"); + user = preferences.getString("user", "demo"); + password = preferences.getString("password", "demo"); refreshTimeKey = preferences.getInt("refreshTimeKey", 3); EditText text = (EditText) findViewById(R.id.url); @@ -64,6 +64,12 @@ public class Options extends Activity { save_options(); } }); + + if (this.object.show_popup_info) { + this.object.show_popup_info = false; + i = new Intent(this, About.class); + startActivity(i); + } } public void save_options() { diff --git a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java index 95733d3506..72ead65f45 100644 --- a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java +++ b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java @@ -54,6 +54,7 @@ public class PandroidEventviewerActivity extends TabActivity implements Serializ public boolean getNewListEvents; //Configuration + public boolean show_popup_info; public String url; public String user; public String password; @@ -84,7 +85,8 @@ public class PandroidEventviewerActivity extends TabActivity implements Serializ SharedPreferences preferences = getSharedPreferences( this.getString(R.string.const_string_preferences), Activity.MODE_PRIVATE); - + + this.show_popup_info = preferences.getBoolean("show_popup_info", true); this.url = preferences.getString("url", ""); this.user = preferences.getString("user", ""); this.password = preferences.getString("password", ""); @@ -316,6 +318,7 @@ public class PandroidEventviewerActivity extends TabActivity implements Serializ entityResponse = response.getEntity(); return_api = Core.convertStreamToString(entityResponse.getContent()); return_api = return_api.replace("\n", ""); + Log.e("PandroidEventviewerActivity getEvents", return_api); this.count_events = new Long(return_api).longValue(); Log.e("getEvents", return_api); diff --git a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PopupValidationEvent.java b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PopupValidationEvent.java index 8dbf305c7d..ac8f96a62b 100644 --- a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PopupValidationEvent.java +++ b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PopupValidationEvent.java @@ -149,9 +149,7 @@ public class PopupValidationEvent extends Activity { Toast toast = Toast.makeText(getApplicationContext(), text, Toast.LENGTH_SHORT); toast.show(); - if (result) { - destroyPopup(); - } + destroyPopup(); } } }