dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Lwm2m test OTA fix bug. Object9.

Browse Source
This commit is contained in:
nickAS21 2021-09-14 23:06:39 +03:00
parent d808ba04bf
commit 604b7e380f
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/attributes/DefaultLwM2MAttributesService.java
View File

@ -26,6 +26,7 @@ import org.eclipse.leshan.core.node.LwM2mPath;
import org.eclipse.leshan.core.node.LwM2mResource; import org.eclipse.leshan.core.node.LwM2mResource;
import org.eclipse.leshan.core.node.LwM2mResourceInstance; import org.eclipse.leshan.core.node.LwM2mResourceInstance;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.thingsboard.server.common.data.ota.OtaPackageType;
import org.thingsboard.server.common.transport.TransportService; import org.thingsboard.server.common.transport.TransportService;
import org.thingsboard.server.common.transport.TransportServiceCallback; import org.thingsboard.server.common.transport.TransportServiceCallback;
import org.thingsboard.server.gen.transport.TransportProtos; import org.thingsboard.server.gen.transport.TransportProtos;
@ -137,6 +138,7 @@ public class DefaultLwM2MAttributesService implements LwM2MAttributesService {
List<TransportProtos.TsKvProto> otherAttributes = new ArrayList<>(); List<TransportProtos.TsKvProto> otherAttributes = new ArrayList<>();
for (TransportProtos.TsKvProto tsKvProto : msg.getSharedUpdatedList()) { for (TransportProtos.TsKvProto tsKvProto : msg.getSharedUpdatedList()) {
String attrName = tsKvProto.getKv().getKey(); String attrName = tsKvProto.getKv().getKey();
if (attrName.contains(OtaPackageType.FIRMWARE.getKeyPrefix()) || attrName.contains(OtaPackageType.SOFTWARE.getKeyPrefix())) {
if (DefaultLwM2MOtaUpdateService.FIRMWARE_TITLE.equals(attrName)) { if (DefaultLwM2MOtaUpdateService.FIRMWARE_TITLE.equals(attrName)) {
newFirmwareTitle = getStrValue(tsKvProto); newFirmwareTitle = getStrValue(tsKvProto);
} else if (DefaultLwM2MOtaUpdateService.FIRMWARE_VERSION.equals(attrName)) { } else if (DefaultLwM2MOtaUpdateService.FIRMWARE_VERSION.equals(attrName)) {
@ -153,12 +155,8 @@ public class DefaultLwM2MAttributesService implements LwM2MAttributesService {
newSoftwareTag = getStrValue(tsKvProto); newSoftwareTag = getStrValue(tsKvProto);
} else if (DefaultLwM2MOtaUpdateService.SOFTWARE_URL.equals(attrName)) { } else if (DefaultLwM2MOtaUpdateService.SOFTWARE_URL.equals(attrName)) {
newSoftwareUrl = getStrValue(tsKvProto); newSoftwareUrl = getStrValue(tsKvProto);
} else if (!DefaultLwM2MOtaUpdateService.FIRMWARE_SIZE.equals(attrName) && }
!DefaultLwM2MOtaUpdateService.FIRMWARE_CHECKSUM.equals(attrName) && } else {
!DefaultLwM2MOtaUpdateService.FIRMWARE_CHECKSUM_ALGORITHM.equals(attrName) &&
!DefaultLwM2MOtaUpdateService.SOFTWARE_SIZE.equals(attrName) &&
!DefaultLwM2MOtaUpdateService.SOFTWARE_CHECKSUM.equals(attrName) &&
!DefaultLwM2MOtaUpdateService.SOFTWARE_CHECKSUM_ALGORITHM.equals(attrName)){
otherAttributes.add(tsKvProto); otherAttributes.add(tsKvProto);
} }
} }