diff --git a/ScoutingApp/app/src/main/java/com/example/scoutingapp/MainActivity.java b/ScoutingApp/app/src/main/java/com/example/scoutingapp/MainActivity.java
index 387cd09..0172bf8 100644
--- a/ScoutingApp/app/src/main/java/com/example/scoutingapp/MainActivity.java
+++ b/ScoutingApp/app/src/main/java/com/example/scoutingapp/MainActivity.java
@@ -15,15 +15,15 @@ import androidx.core.graphics.Insets;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
+import org.json.JSONArray;
+import org.json.JSONObject;
+
import java.io.IOException;
-import okhttp3.Call;
-import okhttp3.Callback;
import okhttp3.Headers;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
-import okhttp3.ResponseBody;
public class MainActivity extends AppCompatActivity {
@@ -52,11 +52,14 @@ public class MainActivity extends AppCompatActivity {
public final class AsynchronousGet {
private final OkHttpClient client = new OkHttpClient();
- /*
- public int[] getMatchTeams(String eventKey, int qualMatchNum) throws Exception {
+
+
+ public String[][] getMatchTeams(String eventKey, int qualMatchNum) throws Exception {
// https://www.thebluealliance.com/api/v3/event/2024melew/teams?X-TBA-Auth-Key=0zxxGYSvY7xI2onqcWg0NT0sEtmtR6hCpmYJ29nwfxvqrP3Mf1M3lRZO5x6Kc3kt
// https://www.thebluealliance.com/api/v3/match/2024melew_qm1?X-TBA-Auth-Key=0zxxGYSvY7xI2onqcWg0NT0sEtmtR6hCpmYJ29nwfxvqrP3Mf1M3lRZO5x6Kc3kt
+ String fein;
+
Request request = new Request.Builder()
.url("https://www.thebluealliance.com/api/v3/match/" + eventKey + "_qm" + qualMatchNum + "?X-TBA-Auth-Key=0zxxGYSvY7xI2onqcWg0NT0sEtmtR6hCpmYJ29nwfxvqrP3Mf1M3lRZO5x6Kc3kt")
.build();
@@ -68,15 +71,20 @@ public class MainActivity extends AppCompatActivity {
for(int i = 0; i < responseHeaders.size(); i++){
System.out.println(responseHeaders.name(i) + ": " + responseHeaders.value(i));
}
- //fein = response.body().string();
+ fein = response.body().string();
}
+ JSONObject teamsJSON = new JSONObject(fein);
+ JSONArray blueTeamsJSON = teamsJSON.getJSONObject("alliances").getJSONObject("blue").getJSONArray("team_keys");
+ JSONArray redTeamsJSON = teamsJSON.getJSONObject("alliances").getJSONObject("blue").getJSONArray("team_keys");
+ String[] blueTeams = {blueTeamsJSON.getString(0), blueTeamsJSON.getString(1), blueTeamsJSON.getString(2)};
+ String[] redTeams = {redTeamsJSON.getString(0), redTeamsJSON.getString(1), redTeamsJSON.getString(2)};
- //return
+ return new String[][]{blueTeams, redTeams};
}
- */
+
}
private void makeIntent()
diff --git a/ScoutingApp/app/src/main/res/layout/activity_main.xml b/ScoutingApp/app/src/main/res/layout/activity_main.xml
index 0d8b962..ab4261c 100644
--- a/ScoutingApp/app/src/main/res/layout/activity_main.xml
+++ b/ScoutingApp/app/src/main/res/layout/activity_main.xml
@@ -18,11 +18,19 @@
app:layout_constraintTop_toTopOf="parent" />
+ tools:layout_editor_absoluteX="75dp"
+ tools:layout_editor_absoluteY="94dp" />
+
+
\ No newline at end of file