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

2011-09-20 Miguel de Dios <miguel.dedios@artica.es> 

* res/values/strings.xml, res/values-en/strings.xml,
	res/values-es/strings.xml: added more strings.
	
	* src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java: wip
	the background execution to get events,
	
	* src/pandroid_event_viewer/pandorafms/Main.java, res/layout/main.xml: added
	code to get groups in background process.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4973 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2011-09-20 14:49:05 +00:00
parent a306807032
commit 902670f086
7 changed files with 193 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
extras/pandroid_event_viewer/ChangeLog
View File

@ -1,3 +1,14 @@
2011-09-20 Miguel de Dios <miguel.dedios@artica.es>
* res/values/strings.xml, res/values-en/strings.xml,
res/values-es/strings.xml: added more strings.
* src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java: wip
the background execution to get events,
* src/pandroid_event_viewer/pandorafms/Main.java, res/layout/main.xml: added
code to get groups in background process.
2011-09-19 Miguel de Dios <miguel.dedios@artica.es>
* AndroidManifest.xml: added Options activity.

8
extras/pandroid_event_viewer/res/layout/main.xml
View File

@ -55,10 +55,16 @@
android:layout_height="wrap_content"
android:paddingRight="5dip"
/>
<Spinner
<Spinner
android:id="@+id/group_combo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
/>
<ProgressBar
android:id="@+id/loading_group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
</TableRow>
<TableRow>

1
extras/pandroid_event_viewer/res/values-en/strings.xml
View File

@ -46,4 +46,5 @@
<string name="config_update_succesful_str">Update configuration successful.</string>
<string name="config_update_fail_str">Update configuration is failed.</string>
<string name="please_set_preferences_str">Please set the preferences as the API URL, user and password for your Pandora FMS.</string>
</resources>

1
extras/pandroid_event_viewer/res/values-es/strings.xml
View File

@ -46,4 +46,5 @@
<string name="config_update_succesful_str">Configuración guardada correctamente.</string>
<string name="config_update_fail_str">Configuración no ha podido guardarse..</string>
<string name="please_set_preferences_str">Por favor configure sus preferencias, como la API URL, usuario y contraseña de su Pandora FMS.</string>
</resources>

1
extras/pandroid_event_viewer/res/values/strings.xml
View File

@ -49,4 +49,5 @@
<string name="config_update_succesful_str">Update configuration successful.</string>
<string name="config_update_fail_str">Update configuration is failed.</string>
<string name="please_set_preferences_str">Please set the preferences as the API URL, ser and password for your Pandora FMS.</string>
</resources>

183
extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java
View File

@ -18,6 +18,7 @@ import android.app.TabActivity;
import android.content.Intent;
import android.content.SharedPreferences;
import android.graphics.Region.Op;
import android.os.AsyncTask;
import android.os.Bundle;
import android.util.Log;
import android.view.Menu;
@ -28,29 +29,21 @@ import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.DatePicker;
import android.widget.EditText;
import android.widget.ProgressBar;
import android.widget.Spinner;
import android.widget.TimePicker;
import android.widget.Toast;
public class Main extends Activity {
public PandroidEventviewerActivity object;
public HashMap<Integer, String> pandoraGroups;
public String url;
public String user;
public String password;
public Spinner comboSeverity;
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
SharedPreferences preferences = getSharedPreferences(
this.getString(R.string.const_string_preferences),
Activity.MODE_PRIVATE);
this.url = preferences.getString("url", "");
this.user = preferences.getString("user", "");
this.password = preferences.getString("password", "");
Intent i = getIntent();
this.object = (PandroidEventviewerActivity)i.getSerializableExtra("object");
@ -58,17 +51,35 @@ public class Main extends Activity {
setContentView(R.layout.main);
Spinner combo = (Spinner) findViewById(R.id.group_combo);
this.setGroups(combo);
combo = (Spinner) findViewById(R.id.severity_combo);
ArrayAdapter adapter = ArrayAdapter.createFromResource(
this, R.array.severity_array_values, android.R.layout.simple_spinner_item);
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
combo.setAdapter(adapter);
final Button buttonReset = (Button) findViewById(R.id.button_reset);
final Button buttonSearch = (Button) findViewById(R.id.button_send);
//Check if the user preferences it is set.
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);
toast.show();
buttonReset.setEnabled(false);
buttonSearch.setEnabled(false);
}
else {
Spinner combo;
buttonSearch.setEnabled(false);
buttonReset.setEnabled(false);
new GetGroupsAsyncTask().execute();
comboSeverity = (Spinner) findViewById(R.id.severity_combo);
ArrayAdapter adapter = ArrayAdapter.createFromResource(
this, R.array.severity_array_values, android.R.layout.simple_spinner_item);
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
comboSeverity.setAdapter(adapter);
}
buttonReset.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@ -76,7 +87,6 @@ public class Main extends Activity {
}
});
final Button buttonSearch = (Button) findViewById(R.id.button_send);
buttonSearch.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@ -85,6 +95,84 @@ public class Main extends Activity {
});
}
public ArrayList<String> getGroups() {
ArrayList<String> array = new ArrayList<String>();
try {
DefaultHttpClient httpClient = new DefaultHttpClient();
HttpPost httpPost = new HttpPost(this.object.url);
List<NameValuePair> parameters = new ArrayList<NameValuePair>(2);
parameters.add(new BasicNameValuePair("user", this.object.user));
parameters.add(new BasicNameValuePair("pass", this.object.password));
parameters.add(new BasicNameValuePair("op", "get"));
parameters.add(new BasicNameValuePair("op2", "groups"));
parameters.add(new BasicNameValuePair("other_mode", "url_encode_separator_|"));
parameters.add(new BasicNameValuePair("return_type", "csv"));
parameters.add(new BasicNameValuePair("other", ";"));
UrlEncodedFormEntity entity = new UrlEncodedFormEntity(parameters);
httpPost.setEntity(entity);
HttpResponse response = httpClient.execute(httpPost);
HttpEntity entityResponse = response.getEntity();
String return_api = this.object.convertStreamToString(entityResponse.getContent());
String[] lines = return_api.split("\n");
for (int i= 0; i < lines.length; i++) {
String[] groups = lines[i].split(";", 21);
this.pandoraGroups.put(new Integer(groups[0]), groups[1]);
array.add(groups[1]);
}
}
catch (Exception e) {
Log.e("ERROR THE ", e.getMessage());
}
return array;
}
public class GetGroupsAsyncTask extends AsyncTask<Void, Void, Void> {
public ArrayList<String> lista;
@Override
protected Void doInBackground(Void... params) {
lista = getGroups();
return null;
}
@Override
protected void onPostExecute(Void unused)
{
Spinner combo = (Spinner)findViewById(R.id.group_combo);
ArrayAdapter<String> spinnerArrayAdapter = new ArrayAdapter<String>(getApplicationContext(),
android.R.layout.simple_spinner_item,
lista);
combo.setAdapter(spinnerArrayAdapter);
combo.setSelection(0);
ProgressBar loadingGroup = (ProgressBar) findViewById(R.id.loading_group);
loadingGroup.setVisibility(ProgressBar.GONE);
combo.setVisibility(Spinner.VISIBLE);
Button buttonReset = (Button) findViewById(R.id.button_reset);
Button buttonSearch = (Button) findViewById(R.id.button_send);
buttonReset.setEnabled(true);
buttonSearch.setEnabled(true);
}
}
//For options
@Override
public boolean onCreateOptionsMenu(Menu menu) {
MenuInflater inflater = getMenuInflater();
@ -109,6 +197,8 @@ public class Main extends Activity {
this.object.eventList = new ArrayList<EventListItem>();
this.object.loadInProgress = true;
this.object.executeBackgroundGetEvents();
TabActivity ta = (TabActivity) this.getParent();
ta.getTabHost().setCurrentTab(1);
}
@ -133,53 +223,4 @@ public class Main extends Activity {
timePicker.setCurrentHour(c.get(Calendar.HOUR_OF_DAY));
timePicker.setCurrentMinute(c.get(Calendar.MINUTE));
}
public void setGroups(Spinner combo) {
try {
DefaultHttpClient httpClient = new DefaultHttpClient();
HttpPost httpPost = new HttpPost(this.url);
List<NameValuePair> parameters = new ArrayList<NameValuePair>(2);
parameters.add(new BasicNameValuePair("user", this.user));
parameters.add(new BasicNameValuePair("pass", this.password));
parameters.add(new BasicNameValuePair("op", "get"));
parameters.add(new BasicNameValuePair("op2", "groups"));
parameters.add(new BasicNameValuePair("other_mode", "url_encode_separator_|"));
parameters.add(new BasicNameValuePair("return_type", "csv"));
parameters.add(new BasicNameValuePair("other", ";"));
UrlEncodedFormEntity entity = new UrlEncodedFormEntity(parameters);
httpPost.setEntity(entity);
HttpResponse response = httpClient.execute(httpPost);
HttpEntity entityResponse = response.getEntity();
String return_api = this.object.convertStreamToString(entityResponse.getContent());
String[] lines = return_api.split("\n");
ArrayList<String> array = new ArrayList<String>();
for (int i= 0; i < lines.length; i++) {
String[] groups = lines[i].split(";", 21);
this.pandoraGroups.put(new Integer(groups[0]), groups[1]);
array.add(groups[1]);
}
ArrayAdapter<String> spinnerArrayAdapter = new ArrayAdapter<String>(this,
android.R.layout.simple_spinner_item,
array);
combo.setAdapter(spinnerArrayAdapter);
}
catch (Exception e) {
Log.e("ERROR THE ", e.getMessage());
return;
}
}
}

67
extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java
View File

@ -31,8 +31,11 @@ import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.message.BasicNameValuePair;
import android.R.bool;
import android.app.Activity;
import android.app.TabActivity;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.AsyncTask;
import android.os.Bundle;
import android.util.Log;
import android.widget.TabHost;
@ -40,19 +43,41 @@ import android.widget.TabHost;
public class PandroidEventviewerActivity extends TabActivity implements Serializable {
public ArrayList<EventListItem> eventList;
public boolean loadInProgress;
public boolean getNewListEvents;
public String url;
public String user;
public String password;
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
SharedPreferences preferences = getSharedPreferences(
this.getString(R.string.const_string_preferences),
Activity.MODE_PRIVATE);
this.url = preferences.getString("url", "");
this.user = preferences.getString("user", "");
this.password = preferences.getString("password", "");
this.eventList = new ArrayList<EventListItem>();
this.loadInProgress = false;
this.getNewListEvents = true;
final TabHost tabHost = getTabHost();
//Check if the preferences is setted, if not show the option activity.
if ((user.length() == 0) && (password.length() == 0)
&& (url.length() == 0)) {
Intent i = new Intent(this, Options.class);
startActivity(i);
}
test();
executeBackgroundGetEvents();
Intent i_main = new Intent(this, Main.class);
@ -83,17 +108,16 @@ public class PandroidEventviewerActivity extends TabActivity implements Serializ
tabHost.getTabWidget().getChildAt(1).getLayoutParams().height=45;
}
public void test() {
public void getEvents(boolean newEvents) {
try {
DefaultHttpClient httpClient = new DefaultHttpClient();
HttpPost httpPost = new HttpPost(
"http://192.168.70.112/pandora_console/include/api.php");
HttpPost httpPost = new HttpPost(this.url);
List<NameValuePair> parameters = new ArrayList<NameValuePair>(2);
parameters.add(new BasicNameValuePair("user", "admin"));
parameters.add(new BasicNameValuePair("pass", "pandora"));
List<NameValuePair> parameters = new ArrayList<NameValuePair>();
parameters.add(new BasicNameValuePair("user", this.user));
parameters.add(new BasicNameValuePair("pass", this.password));
parameters.add(new BasicNameValuePair("op", "get"));
parameters.add(new BasicNameValuePair("op2", "events"));
parameters.add(new BasicNameValuePair("other_mode", "url_encode_separator_|"));
@ -210,5 +234,34 @@ public class PandroidEventviewerActivity extends TabActivity implements Serializ
return sb.toString();
}
public void executeBackgroundGetEvents() {
new GetEventsAsyncTask().execute();
}
public class GetEventsAsyncTask extends AsyncTask<Void, Void, Void> {
@Override
protected Void doInBackground(Void... params) {
if (getNewListEvents) {
getEvents(true);
}
else {
getEvents(false);
}
return null;
}
@Override
protected void onPostExecute(Void unused)
{
if (!isFinishing())
{
}
}
}
}