eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-04 10:09:42 +00:00
Code Activity

reformatted more code

Browse Source
This commit is contained in:
Axel Uhl committed 2015-03-05 00:35:13 +01:00
1 parent 7b5573497f
commit 9a33bc91f2
1 file changed
+62 -77
Download Patch File Download Diff File Expand all files Collapse all files
mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java
+62 -77
View File
@@ -60,7 +60,6 @@ public class RegattaActivity extends BaseActivity {
public CompetitorInfo competitor;
public LeaderboardInfo leaderboard;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -98,8 +97,7 @@ public class RegattaActivity extends BaseActivity {
@Override
public void onStart() {
super.onStart();
if (prefs.getTrackerIsTracking())
{
if (prefs.getTrackerIsTracking()) {
String checkinDigest = prefs.getTrackerIsTrackingCheckinDigest();
startTrackingActivity(checkinDigest);
}
@@ -127,8 +125,8 @@ public class RegattaActivity extends BaseActivity {
return super.onOptionsItemSelected(item);
}
}
private RegattaFragment getRegattaFragment()
{
private RegattaFragment getRegattaFragment() {
return (RegattaFragment) getSupportFragmentManager().findFragmentById(R.id.content_frame);
}
@@ -144,57 +142,54 @@ public class RegattaActivity extends BaseActivity {
});
}
// private void flagImageUpdated() {
// runOnUiThread(new Runnable() {
// @Override
// public void run() {
// ImageView flagImageView = (ImageView) findViewById(R.id.flag_image);
// }
// });
// }
// private void flagImageUpdated() {
// runOnUiThread(new Runnable() {
// @Override
// public void run() {
// ImageView flagImageView = (ImageView) findViewById(R.id.flag_image);
// }
// });
// }
@Override
protected void onResume() {
TextView competitorNameTextView = (TextView)findViewById(R.id.competitor_name);
TextView competitorNameTextView = (TextView) findViewById(R.id.competitor_name);
competitorNameTextView.setText(competitor.name);
TextView sailIdTextView = (TextView)findViewById(R.id.sail_id);
TextView sailIdTextView = (TextView) findViewById(R.id.sail_id);
sailIdTextView.setText(competitor.sailId);
// ImageView flagImageView = (ImageView)findViewById(R.id.flag_image);
//String flagStr = String.format("%s.png", countryCode);
// String uri = "@drawable/" + competitor.countryCode.toLowerCase(Locale.getDefault());
//
// int imageResource = getResources().getIdentifier(uri, null, getPackageName());
//
// try {
// Drawable res = getResources().getDrawable(imageResource);
// flagImageView.setImageDrawable(res);
// } catch (Exception e) {
// e.printStackTrace();
// }
// ImageView flagImageView = (ImageView)findViewById(R.id.flag_image);
// String flagStr = String.format("%s.png", countryCode);
// String uri = "@drawable/" + competitor.countryCode.toLowerCase(Locale.getDefault());
//
// int imageResource = getResources().getIdentifier(uri, null, getPackageName());
//
// try {
// Drawable res = getResources().getDrawable(imageResource);
// flagImageView.setImageDrawable(res);
// } catch (Exception e) {
// e.printStackTrace();
// }
getRegattaFragment().setChangePhotoButtonHidden(true);
//ExLog.w(this, TAG, "Event Image URL: " + event.imageUrl);
// ExLog.w(this, TAG, "Event Image URL: " + event.imageUrl);
ImageView imageView = (ImageView) findViewById(R.id.userImage);
Bitmap storedImage = getStoredImage(getLeaderboardImageFileName(leaderboard.name));
if (storedImage == null)
{
if (event.imageUrl != null)
{
if (storedImage == null) {
if (event.imageUrl != null) {
new DownloadLeaderboardImageTask(imageView).execute(event.imageUrl);
}
}
else
{
} else {
imageView.setImageBitmap(storedImage);
userImageUpdated();
}
ImageView flagImageView = (ImageView)findViewById(R.id.flag_image);
Bitmap storedFlagImage = getStoredImage(getFlagImageFileName(competitor.countryCode.toLowerCase(Locale.getDefault())));
ImageView flagImageView = (ImageView) findViewById(R.id.flag_image);
Bitmap storedFlagImage = getStoredImage(getFlagImageFileName(competitor.countryCode.toLowerCase(Locale
.getDefault())));
if (storedFlagImage == null) {
String urlStr = String.format("%s/gwt/images/flags/%s.png", event.server,
@@ -211,8 +206,7 @@ public class RegattaActivity extends BaseActivity {
*
* @param bitmap
*/
public void updateLeaderboardPictureChosenByUser(final Bitmap bitmap)
{
public void updateLeaderboardPictureChosenByUser(final Bitmap bitmap) {
storeImageAndSendToServer(bitmap, getLeaderboardImageFileName(leaderboard.name), true);
runOnUiThread(new Runnable() {
@@ -228,13 +222,13 @@ public class RegattaActivity extends BaseActivity {
/**
* Store image for quicker retrieval later and trigger upload to server.
*
* @param images
*/
private void storeImageAndSendToServer(Bitmap image, String fileName, boolean sendToServer) {
File pictureFile = getImageFile(fileName);
if (pictureFile == null) {
Log.d(TAG,
"Error creating media file, check storage permissions: ");// e.getMessage());
Log.d(TAG, "Error creating media file, check storage permissions: ");// e.getMessage());
return;
}
try {
@@ -254,13 +248,12 @@ public class RegattaActivity extends BaseActivity {
/**
* Get stored image if there's one saved.
*
* @return
*/
private Bitmap getStoredImage(String fileName)
{
private Bitmap getStoredImage(String fileName) {
File pictureFile = getImageFile(fileName);
if (pictureFile == null)
{
if (pictureFile == null) {
return null;
}
@@ -270,9 +263,9 @@ public class RegattaActivity extends BaseActivity {
return image;
}
/**
* Silently send the team image to the server.
*
* @param imageFile
*/
private void sendTeamImageToServer(File imageFile) {
@@ -281,14 +274,14 @@ public class RegattaActivity extends BaseActivity {
}
final String uploadURLStr = event.server
+ prefs.getServerUploadTeamImagePath().replace(
"{competitor_id}", competitor.id);
+ prefs.getServerUploadTeamImagePath().replace("{competitor_id}", competitor.id);
new UploadTeamImageTask(imageFile).execute(uploadURLStr);
}
/**
* Get Path for cached leaderbaord image.
*
* @return
*/
public File getImageFile(String fileName) {
@@ -296,7 +289,7 @@ public class RegattaActivity extends BaseActivity {
File mediaStorageDir = getMediaStorageDir();
File mediaFile;
String mImageName="MI_"+ fileName +".png";
String mImageName = "MI_" + fileName + ".png";
mediaFile = new File(mediaStorageDir.getPath() + File.separator + mImageName);
return mediaFile;
}
@@ -315,17 +308,14 @@ public class RegattaActivity extends BaseActivity {
File mediaStorageDir;
if (Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) {
mediaStorageDir = new File(
Environment.getExternalStorageDirectory()
+ "/Android/data/"
+ getApplicationContext().getPackageName()
+ "/Files");
mediaStorageDir = new File(Environment.getExternalStorageDirectory() + "/Android/data/"
+ getApplicationContext().getPackageName() + "/Files");
} else {
mediaStorageDir = getApplicationContext().getCacheDir();
}
if (! mediaStorageDir.exists()){
if (! mediaStorageDir.mkdirs()){
if (!mediaStorageDir.exists()) {
if (!mediaStorageDir.mkdirs()) {
return null;
}
}
@@ -349,7 +339,7 @@ public class RegattaActivity extends BaseActivity {
HttpClient httpclient = new DefaultHttpClient();
HttpPost httppost = new HttpPost(uploadUrl);
InputStreamEntity reqEntity = new InputStreamEntity( new FileInputStream(imageFile), -1);
InputStreamEntity reqEntity = new InputStreamEntity(new FileInputStream(imageFile), -1);
reqEntity.setContentType("image/jpeg");
reqEntity.setChunked(true); // Send in multiple parts if needed
httppost.setEntity(reqEntity);
@@ -366,8 +356,7 @@ public class RegattaActivity extends BaseActivity {
@Override
protected void onCancelled() {
super.onCancelled();
Toast.makeText(RegattaActivity.this,
getString(R.string.error_sending_team_image_to_server),
Toast.makeText(RegattaActivity.this, getString(R.string.error_sending_team_image_to_server),
Toast.LENGTH_LONG).show();
}
@@ -376,7 +365,6 @@ public class RegattaActivity extends BaseActivity {
}
}
private class DownloadLeaderboardImageTask extends AsyncTask<String, Void, Bitmap> {
ImageView bmImage;
String downloadUrl;
@@ -456,11 +444,9 @@ public class RegattaActivity extends BaseActivity {
/**
* Check out from regatta;
*/
public void checkout()
{
public void checkout() {
final String checkoutURLStr = event.server
+ prefs.getServerCheckoutPath().replace("{leaderboard-name}",
Uri.encode(leaderboard.name));
+ prefs.getServerCheckoutPath().replace("{leaderboard-name}", Uri.encode(leaderboard.name));
showProgressDialog(R.string.please_wait, R.string.checking_out);
@@ -470,20 +456,21 @@ public class RegattaActivity extends BaseActivity {
checkoutData.put("deviceUuid", UniqueDeviceUuid.getUniqueId(this));
checkoutData.put("toMillis", System.currentTimeMillis());
} catch (JSONException e) {
showErrorPopup(
R.string.error,
R.string.error_could_not_complete_operation_on_server_try_again);
showErrorPopup(R.string.error, R.string.error_could_not_complete_operation_on_server_try_again);
ExLog.e(this, TAG, "Error populating checkout-data: " + e.getMessage());
return;
}
try {
HttpJsonPostRequest request = new HttpJsonPostRequest(new URL(checkoutURLStr), checkoutData.toString(), this);
NetworkHelper.getInstance(this).executeHttpJsonRequestAsnchronously(request, new NetworkHelperSuccessListener() {
HttpJsonPostRequest request = new HttpJsonPostRequest(new URL(checkoutURLStr), checkoutData.toString(),
this);
NetworkHelper.getInstance(this).executeHttpJsonRequestAsnchronously(request,
new NetworkHelperSuccessListener() {
@Override
public void performAction(JSONObject response) {
DatabaseHelper.getInstance().deleteRegattaFromDatabase(RegattaActivity.this, event.checkinDigest);
DatabaseHelper.getInstance().deleteRegattaFromDatabase(RegattaActivity.this,
event.checkinDigest);
deleteImageFile(getLeaderboardImageFileName(leaderboard.name));
dismissProgressDialog();
finish();
@@ -493,7 +480,8 @@ public class RegattaActivity extends BaseActivity {
@Override
public void performAction(NetworkHelperError e) {
dismissProgressDialog();
showErrorPopup(R.string.error,R.string.error_could_not_complete_operation_on_server_try_again);
showErrorPopup(R.string.error,
R.string.error_could_not_complete_operation_on_server_try_again);
}
});
@@ -506,12 +494,9 @@ public class RegattaActivity extends BaseActivity {
public void onBackPressed() {
RegattaFragment fragment = (RegattaFragment) getSupportFragmentManager().findFragmentById(R.id.content_frame);
if (fragment.isShowingBigCheckoutButton())
{
//do nothing, user must checkout himself at this point.
}
else
{
if (fragment.isShowingBigCheckoutButton()) {
// do nothing, user must checkout himself at this point.
} else {
super.onBackPressed();
}
}