wildercayden/ScoutingApp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved makeCSV to AutoActivty and made it funtional

Browse Source
This commit is contained in:
wildercayden 2025-01-23 13:16:02 -05:00 committed by GitHub
parent 45d46c5814
commit a5a1f52753
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 59 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
ScoutingApp/app/src/main/java/com/example/scoutingapp/AutoActivity.java
View File

@ -1,5 +1,6 @@
package com.example.scoutingapp;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.os.Vibrator;
@ -13,7 +14,18 @@ import androidx.core.graphics.Insets;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
public class AutoActivity extends AppCompatActivity {
private String L4;
private String L3;
private String L2;
private String L1;
private String canLeavestring;
private String reefPickupstring;
private String coralPickupstring;
private int l4Scored = 0;
private int l3Scored = 0;
private int l2Scored = 0;
@ -101,10 +113,53 @@ public class AutoActivity extends AppCompatActivity {
nextButton.setOnLongClickListener((v) -> {
//submit data
CSVmake(AutoActivity.this);
Intent intent = new Intent(this, TeleActivity.class);
startActivity(intent);
Log.d("test", intent.toString());
return true;
});
}
public void makeSring(){
String L4 = String.valueOf(l4Scored);
String L3 = String.valueOf(l3Scored);
String L2 = String.valueOf(l2Scored);
String L1 = String.valueOf(l1Scored);
if(canLeave== true){
canLeavestring = "yes";
} else {
canLeavestring = "no";
}
if(reefPickup== true){
reefPickupstring = "yes";
} else {
reefPickupstring = "no";
}
if(reefPickup== true){
reefPickupstring = "yes";
} else {
reefPickupstring = "no";
}
if( coralPickup== true){
coralPickupstring = "yes";
} else {
coralPickupstring = "no";
}
}
public void CSVmake(Context context) {
//adds the strings
String CSVLine = String.format("%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s",
L4, L3, L2, L1, canLeavestring, reefPickupstring, coralPickupstring );
//makes the file
File csvFile = new File(context.getFilesDir(), "match_data.csv");
//writes to file
try (FileWriter writer = new FileWriter(csvFile, true)) {
writer.append(CSVLine).append("\n");
Log.d("CSVFilePath", csvFile.getAbsolutePath());
} catch (IOException e) {
Log.d("CSVFail", "CSV didn't make");
}
}
}

48
ScoutingApp/app/src/main/java/com/example/scoutingapp/Submit.java
View File

@ -1,23 +1,19 @@
package com.example.scoutingapp;
import android.content.Context;
import android.content.Intent;
import android.util.Log;
import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
import com.google.api.client.json.gson.GsonFactory;
import com.google.api.services.sheets.v4.Sheets;
import com.google.api.services.sheets.v4.model.UpdateValuesResponse;
import com.google.api.services.sheets.v4.model.ValueRange;
import com.google.auth.http.HttpCredentialsAdapter;
import com.google.auth.oauth2.ServiceAccountCredentials;
import com.google.common.collect.Lists;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
@ -26,44 +22,8 @@ import java.util.Arrays;
import java.util.List;
public class Submit {
private String teamNumber;
private String matchNumber;
private String Taxiing;
private String autoCoral;
private String autoAlgea;
private String floorPickup;
private String HPPickup;
private String startingLocation;
private String teleopCoral;
private String teleopAlgea;
private String HPScore;
private String teleopFloorPickup;
private String Endgame;
private String Climb;
private String Notes;
public String getTeamNumberTest()
{ teamNumber = "2647";
return teamNumber;
}
public void CSVmake(Context context) {
//adds the strings
String CSVLine = String.format("%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s",
teamNumber, matchNumber, Taxiing, autoCoral, autoAlgea, floorPickup, HPPickup,
startingLocation, teleopCoral, teleopAlgea, HPScore, teleopFloorPickup, Endgame, Climb, Notes);
//makes the file
File csvFile = new File(context.getExternalFilesDir(null), "match_data.csv");
//writes to file
try (FileWriter writer = new FileWriter(csvFile, true)) {
writer.append(CSVLine).append("\n");
Log.d("CSVFilePath", csvFile.getAbsolutePath());
} catch (IOException e) {
Log.d("CSVFail", "CSV didn't make");
}
}
void uploadCSV(Context context) {
void uploadSheets(Context context) {
new Thread(() -> {
try {
//adds account info
@ -77,7 +37,7 @@ public class Submit {
).setApplicationName("Scouting App").build();
//make sure the file is there
File csvFile = new File(context.getExternalFilesDir(null), "match_data.csv");
File csvFile = new File(context.getFilesDir(), "match_data.csv");
if (!csvFile.exists()) {
Log.d("CSVError", "CSV file does not exist.");
return;
@ -122,7 +82,7 @@ public class Submit {
public void deleteCSVFile(Context context) {
//Finds the file
File csvFile = new File(context.getExternalFilesDir(null), "match_data.csv");
File csvFile = new File(context.getFilesDir(), "match_data.csv");
//Checks if the file exists
if (csvFile.exists()) {