Commit 040473ac80fc9d82aaa32e75563d35a89d390682
Committed by
Andrew Shvayka
1 parent
3d04d5b1
added edrxCycle to the Lwm2mDeviceTransportConfiguration
Showing
6 changed files
with
13 additions
and
2 deletions
... | ... | @@ -462,9 +462,12 @@ public class DefaultTransportApiService implements TransportApiService { |
462 | 462 | |
463 | 463 | private DeviceInfoProto getDeviceInfoProto(Device device) throws JsonProcessingException { |
464 | 464 | PowerMode powerMode = null; |
465 | + Long edrxCycle = null; | |
465 | 466 | switch (device.getDeviceData().getTransportConfiguration().getType()) { |
466 | 467 | case LWM2M: |
467 | - powerMode = ((Lwm2mDeviceTransportConfiguration) device.getDeviceData().getTransportConfiguration()).getPowerMode(); | |
468 | + Lwm2mDeviceTransportConfiguration transportConfiguration = (Lwm2mDeviceTransportConfiguration) device.getDeviceData().getTransportConfiguration(); | |
469 | + powerMode = transportConfiguration.getPowerMode(); | |
470 | + edrxCycle = transportConfiguration.getEdrxCycle(); | |
468 | 471 | break; |
469 | 472 | } |
470 | 473 | |
... | ... | @@ -482,6 +485,7 @@ public class DefaultTransportApiService implements TransportApiService { |
482 | 485 | .setAdditionalInfo(mapper.writeValueAsString(device.getAdditionalInfo())); |
483 | 486 | if (powerMode != null) { |
484 | 487 | builder.setPowerMode(powerMode.name()); |
488 | + builder.setEdrxCycle(edrxCycle); | |
485 | 489 | } |
486 | 490 | return builder.build(); |
487 | 491 | } | ... | ... |
... | ... | @@ -93,6 +93,8 @@ public class LwM2mClient implements Serializable { |
93 | 93 | @Getter |
94 | 94 | private PowerMode powerMode; |
95 | 95 | @Getter |
96 | + private Long edrxCycle; | |
97 | + @Getter | |
96 | 98 | @Setter |
97 | 99 | private Registration registration; |
98 | 100 | |
... | ... | @@ -115,6 +117,7 @@ public class LwM2mClient implements Serializable { |
115 | 117 | this.deviceId = new UUID(session.getDeviceIdMSB(), session.getDeviceIdLSB()); |
116 | 118 | this.profileId = new UUID(session.getDeviceProfileIdMSB(), session.getDeviceProfileIdLSB()); |
117 | 119 | this.powerMode = credentials.getDeviceInfo().getPowerMode(); |
120 | + this.edrxCycle = credentials.getDeviceInfo().getEdrxCycle(); | |
118 | 121 | } |
119 | 122 | |
120 | 123 | public void lock() { | ... | ... |
... | ... | @@ -443,6 +443,7 @@ public class DefaultTransportService implements TransportService { |
443 | 443 | tdi.setDeviceType(di.getDeviceType()); |
444 | 444 | if (StringUtils.isNotEmpty(di.getPowerMode())) { |
445 | 445 | tdi.setPowerMode(PowerMode.valueOf(di.getPowerMode())); |
446 | + tdi.setEdrxCycle(di.getEdrxCycle()); | |
446 | 447 | } |
447 | 448 | return tdi; |
448 | 449 | } | ... | ... |