mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-08 21:30:57 +00:00
fixed bug in individual recall of ess startprocedure. xray can not be displayed several times anymore.
This commit is contained in:
1 parent
d7614d97e1
commit
bf36151a4a
2 files changed
+28
-4
No files matched your search
+12
-1
@@ -316,7 +316,18 @@ public class ExtremeSailingSeriesStartProcedure implements StartProcedure {
|
|||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else return false;
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean getIndividualRecallRemoved() {
|
||||||
|
if(this.individualRecallFinder.getIndividualRecallDisplayedTime()!=null){
|
||||||
|
if(this.individualRecallFinder.getIndividualRecallDisplayedRemovalTime()!=null){
|
||||||
|
if(this.individualRecallFinder.getIndividualRecallDisplayedRemovalTime().after(this.individualRecallFinder.getIndividualRecallDisplayedTime())){
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+16
-3
@@ -30,6 +30,7 @@ public class EssRunningRaceFragment extends RaceFragment implements EssRunningRa
|
|||||||
private ImageView individualRecallFlag;
|
private ImageView individualRecallFlag;
|
||||||
private TextView individualRecallLabel;
|
private TextView individualRecallLabel;
|
||||||
ImageButton abortingFlagButton;
|
ImageButton abortingFlagButton;
|
||||||
|
ImageButton individualRecallButton;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||||
@@ -67,7 +68,7 @@ public class EssRunningRaceFragment extends RaceFragment implements EssRunningRa
|
|||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
ImageButton individualRecallButton = (ImageButton) getView().findViewById(R.id.individualRecallButton);
|
individualRecallButton = (ImageButton) getView().findViewById(R.id.individualRecallButton);
|
||||||
individualRecallButton.setOnClickListener(new OnClickListener() {
|
individualRecallButton.setOnClickListener(new OnClickListener() {
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
TimePoint now = MillisecondsTimePoint.now();
|
TimePoint now = MillisecondsTimePoint.now();
|
||||||
@@ -81,6 +82,16 @@ public class EssRunningRaceFragment extends RaceFragment implements EssRunningRa
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (getRace().getState().getStartProcedure() instanceof ExtremeSailingSeriesStartProcedure) {
|
||||||
|
ExtremeSailingSeriesStartProcedure essStartProcedure = ((ExtremeSailingSeriesStartProcedure) getRace()
|
||||||
|
.getState().getStartProcedure());
|
||||||
|
if (essStartProcedure.getIndividualRecallDisplayed()) {
|
||||||
|
setIndividualRecallDisplayedInView();
|
||||||
|
} else if(essStartProcedure.getIndividualRecallRemoved()){
|
||||||
|
setIndividualRecallRemovedInView();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void showDisplayGeneralRecallDialog() {
|
private void showDisplayGeneralRecallDialog() {
|
||||||
@@ -186,8 +197,10 @@ public class EssRunningRaceFragment extends RaceFragment implements EssRunningRa
|
|||||||
private void setIndividualRecallRemovedInView() {
|
private void setIndividualRecallRemovedInView() {
|
||||||
moveImageDown(individualRecallFlag);
|
moveImageDown(individualRecallFlag);
|
||||||
//setXrayCountdownLabel();
|
//setXrayCountdownLabel();
|
||||||
String setIndividualRecallUp = getActivity().getResources().getString(R.string.choose_xray_flag_up);
|
//String setIndividualRecallUp = getActivity().getResources().getString(R.string.choose_xray_flag_up);
|
||||||
individualRecallLabel.setText(setIndividualRecallUp);
|
//individualRecallLabel.setText(setIndividualRecallUp);
|
||||||
|
individualRecallLabel.setVisibility(View.GONE);
|
||||||
|
individualRecallButton.setVisibility(View.GONE);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void moveImageUp(ImageView image) {
|
protected void moveImageUp(ImageView image) {
|
||||||
|
|||||||
Reference in new issue
Block a user