zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed hidden ping issue and battery/wifi indicator issues

Browse source
This commit is contained in:
anhefti 2022-01-31 14:33:30 +01:00
parent 8985843c66
commit f179a4b25e
4 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/ch/ethz/seb/sebserver/gbl/model/session/ClientConnectionData.java
View file

@ -100,8 +100,7 @@ public class ClientConnectionData {
while (i1.hasNext()) {
final IndicatorValue iv1 = i1.next();
final IndicatorValue iv2 = i2.next();
if (iv1.getIndicatorId().longValue() != iv2.getIndicatorId().longValue() ||
Math.abs(iv1.getValue() - iv2.getValue()) > 0.1) {
if (!iv1.dataEquals(iv2)) {
return false;
}
}

11
src/main/java/ch/ethz/seb/sebserver/gbl/model/session/IndicatorValue.java
View file

@ -38,4 +38,15 @@ public interface IndicatorValue extends IndicatorValueHolder {
}
}
default boolean dataEquals(final IndicatorValue other) {
final Long i1 = getIndicatorId();
final Long i2 = other.getIndicatorId();
if (i1 != null && i2 != null) {
if (i1.longValue() != i2.longValue() || Math.abs(this.getValue() - other.getValue()) > 0.1) {
return false;
}
}
return true;
}
}

2
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ClientIndicatorFactory.java
View file

@ -98,7 +98,7 @@ public class ClientIndicatorFactory {
.getBean(PingIntervalClientIndicator.class);
pingIndicator.setHidden();
final Indicator indicator = new Indicator(
null,
-1L,
clientConnection.examId,
"hidden_ping_indicator",
IndicatorType.LAST_PING,

3
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/indicator/AbstractLogNumberIndicator.java
View file

@ -54,9 +54,6 @@ public abstract class AbstractLogNumberIndicator extends AbstractLogIndicator {
}
private void valueChanged(final String text, final double value) {
this.currentValue = getValue() + 1d;
if (this.tags == null || this.tags.length == 0 || hasTag(text)) {
if (super.ditributedIndicatorValueRecordId != null) {
if (!this.distributedPingCache.updateIndicatorValueAsync(