mirror-github-bspeice
/
itcs4180
mirror of https://github.com/bspeice/itcs4180
1
0
Fork 0
Code Issues Releases Wiki Activity

FoundActivity now loads Webview

master
tokugawa 2014-04-26 01:08:30 -04:00
parent e29d802998
commit f3582b1815
3 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
UNCCScavenger/src/edu/uncc/scavenger/FoundActivity.java
View File

@ -39,7 +39,7 @@ public class FoundActivity extends Activity {
tryMoreButton = (Button)findViewById(R.id.tryMoreButton);
restLocation = (RestLocation)(getIntent().getSerializableExtra("restLocation"));
//moreInfoWebView.loadUrl(restLocation.getKey());
moreInfoWebView.loadData(restLocation.getKey(), "text/html", "UTF-8");
tryMoreButton.setOnClickListener(new OnClickListener(){
@ -50,9 +50,6 @@ public class FoundActivity extends Activity {
finish();
}
});
//TODO
//Add found location to database
}
@Override

10
UNCCScavenger/src/edu/uncc/scavenger/MainActivity.java
View File

@ -12,6 +12,7 @@ import java.util.List;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.os.StrictMode;
import android.util.Log;
import android.view.Menu;
import android.view.View;
@ -99,15 +100,6 @@ public class MainActivity extends Activity {
}
}.execute();
new LocationClient.VerifyAsync(this) {
@Override
protected void onPostExecute(String result) {
super.onPostExecute(result);
key = result;
Toast.makeText(getApplicationContext(), key, Toast.LENGTH_SHORT).show();
}
}.execute("1", "Belk Tower");
}
@Override

45
UNCCScavenger/src/edu/uncc/scavenger/SearchActivity.java
View File

@ -11,6 +11,7 @@ import java.net.URL;
import java.util.List;
import edu.uncc.scavenger.database.LocationDatabaseHelper;
import edu.uncc.scavenger.rest.LocationClient;
import edu.uncc.scavenger.rest.RestLocation;
import android.app.Activity;
import android.app.AlertDialog;
@ -41,6 +42,7 @@ public class SearchActivity extends Activity {
TextView locationText, riddleView;
Intent intent;
RestLocation restLocation;
String key;
@Override
protected void onCreate(Bundle savedInstanceState) {
@ -171,23 +173,32 @@ public class SearchActivity extends Activity {
if (resultCode == RESULT_OK)
{
String contents = data.getStringExtra("SCAN_RESULT");
if(contents.equals(restLocation.getName()))
{
//Add found to the database
/*List locations = LocationDatabaseHelper.getInstance(this).fetchAll();
if (locations != null && locations.size() > 0)
{
locations.get(restLocation.getId()-1);
}*/
intent = new Intent(SearchActivity.this, FoundActivity.class);
intent.putExtra("restLocation", restLocation);
startActivity(intent);
finish();
}
else
{
Toast.makeText(SearchActivity.this, "Incorrect place found: "+contents, Toast.LENGTH_SHORT).show();
}
new LocationClient.VerifyAsync(this) {
@Override
protected void onPostExecute(String result) {
super.onPostExecute(result);
key = result;
Toast.makeText(getApplicationContext(), key, Toast.LENGTH_SHORT).show();
if(key!= null)
{
//Add found to the database
/*List locations = LocationDatabaseHelper.getInstance(this).fetchAll();
if (locations != null && locations.size() > 0)
{
locations.get(restLocation.getId()-1);
}*/
restLocation.setKey(key);
intent = new Intent(SearchActivity.this, FoundActivity.class);
intent.putExtra("restLocation", restLocation);
startActivity(intent);
finish();
}
else
{
Toast.makeText(SearchActivity.this, "Incorrect place found", Toast.LENGTH_SHORT).show();
}
}
}.execute(restLocation.getName(), contents);
}
else if (resultCode == RESULT_CANCELED)
{