Team4388/RidgeScout
1
0
Fork 0
mirror of https://github.com/Team4388/RidgeScout.git synced 2026-06-09 00:37:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix more scouting data crashing

Browse Source
This commit is contained in:
Michael Mikovsky
2025-03-15 06:09:47 -06:00
parent d458ad7669
commit 534207ebb1
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/build.gradle.kts
+2 -2
View File
@@ -25,8 +25,8 @@ android {
applicationId = "com.ridgebotics.ridgescout" applicationId = "com.ridgebotics.ridgescout"
minSdk = 24 minSdk = 24
targetSdk = 34 targetSdk = 34
versionCode = 10 // **IMPORTANT** Increment this before releasing on github versionCode = 11 // **IMPORTANT** Increment this before releasing on github
versionName = "1.3"// **IMPORTANT** Change this before releasing on github (<Year num since 2024>.<Update Version>) versionName = "1.4"// **IMPORTANT** Change this before releasing on github (<Year num since 2024>.<Update Version>)
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
} }
app/src/main/java/com/ridgebotics/ridgescout/ui/data/TeamsFragment.java
+12 -7
View File
@@ -101,8 +101,8 @@ public class TeamsFragment extends Fragment {
// tv.setTextSize(16); // tv.setTextSize(16);
// ll.addView(tv); // ll.addView(tv);
add_pit_data(team); try {add_pit_data(team);}catch(Exception e){AlertManager.error(e);}
add_match_data(team, mode); try {add_match_data(team, mode);}catch(Exception e){AlertManager.error(e);}
} }
public void add_pit_data(frcTeam team){ public void add_pit_data(frcTeam team){
@@ -273,7 +273,8 @@ public class TeamsFragment extends Fragment {
binding.matchArea.addView(tv); binding.matchArea.addView(tv);
match_latest_values[i].add_individual_view(binding.matchArea, psda.data.array[i]); if(psda.data.array[i] != null)
match_latest_values[i].add_individual_view(binding.matchArea, psda.data.array[i]);
} }
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
@@ -293,7 +294,8 @@ public class TeamsFragment extends Fragment {
try { try {
ScoutingDataWriter.ParsedScoutingDataResult psda = ScoutingDataWriter.load(files[i], match_values, match_transferValues); ScoutingDataWriter.ParsedScoutingDataResult psda = ScoutingDataWriter.load(files[i], match_values, match_transferValues);
for (int a = 0; a < data.length; a++) { for (int a = 0; a < data.length; a++) {
data[a][i] = psda.data.array[a]; if(psda.data.array[a] != null && psda.data.array[a].get() != null)
data[a][i] = psda.data.array[a];
} }
} catch (Exception e){ } catch (Exception e){
e.printStackTrace(); e.printStackTrace();
@@ -313,7 +315,8 @@ public class TeamsFragment extends Fragment {
tv.setTextSize(30); tv.setTextSize(30);
binding.matchArea.addView(tv); binding.matchArea.addView(tv);
match_latest_values[i].add_compiled_view(binding.matchArea, data[i]); if(data[i] != null)
match_latest_values[i].add_compiled_view(binding.matchArea, data[i]);
} }
} }
@@ -327,7 +330,8 @@ public class TeamsFragment extends Fragment {
try { try {
ScoutingDataWriter.ParsedScoutingDataResult psda = ScoutingDataWriter.load(files[i], match_values, match_transferValues); ScoutingDataWriter.ParsedScoutingDataResult psda = ScoutingDataWriter.load(files[i], match_values, match_transferValues);
for (int a = 0; a < data.length; a++) { for (int a = 0; a < data.length; a++) {
data[a][i] = psda.data.array[a]; if(psda.data.array[a] != null && psda.data.array[a].get() != null)
data[a][i] = psda.data.array[a];
} }
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
@@ -347,7 +351,8 @@ public class TeamsFragment extends Fragment {
tv.setTextSize(30); tv.setTextSize(30);
binding.matchArea.addView(tv); binding.matchArea.addView(tv);
match_latest_values[i].add_history_view(binding.matchArea, data[i]); if(data[i] != null)
match_latest_values[i].add_history_view(binding.matchArea, data[i]);
} }
} }
} }
app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/CSVExport.java
+1 -1
View File
@@ -70,7 +70,7 @@ public class CSVExport {
data += tempData; data += tempData;
} catch (Exception e){ } catch (Exception e){
e.printStackTrace(); e.printStackTrace();
data += ("null,".repeat(pit_latest_values.length)); data += ("null,".repeat(match_latest_values.length));
} }
} }