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

Merge branch 'master' into fix/alarm-delete-event-order

Browse Source
This commit is contained in:
Dmytro Skarzhynets 2025-04-25 15:41:12 +03:00 committed by GitHub
commit b1d86d128c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/src/test/java/org/thingsboard/server/transport/lwm2m/ota/AbstractOtaLwM2MIntegrationTest.java
View File

@ -120,7 +120,7 @@ public abstract class AbstractOtaLwM2MIntegrationTest extends AbstractLwM2MInteg
public static final String CLIENT_LWM2M_SETTINGS_19 = public static final String CLIENT_LWM2M_SETTINGS_19 =
" {\n" + " {\n" +
" \"useObject19ForOta\": true,\n" + " \"useObject19ForOtaInfo\": true,\n" +
" \"edrxCycle\": null,\n" + " \"edrxCycle\": null,\n" +
" \"powerMode\": \"DRX\",\n" + " \"powerMode\": \"DRX\",\n" +
" \"fwUpdateResource\": null,\n" + " \"fwUpdateResource\": null,\n" +

2
ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-device-profile-transport-configuration.component.html
View File

@ -53,7 +53,7 @@
<section formGroupName="clientLwM2mSettings"> <section formGroupName="clientLwM2mSettings">
<fieldset class="fields-group"> <fieldset class="fields-group">
<legend class="group-title" translate>device-profile.lwm2m.ota-update</legend> <legend class="group-title" translate>device-profile.lwm2m.ota-update</legend>
<mat-checkbox formControlName="useObject19ForOta"> <mat-checkbox formControlName="useObject19ForOtaInfo">
<span tb-hint-tooltip-icon="{{ 'device-profile.lwm2m.use-object-19-for-ota-update-hint' | translate }}"> <span tb-hint-tooltip-icon="{{ 'device-profile.lwm2m.use-object-19-for-ota-update-hint' | translate }}">
{{ 'device-profile.lwm2m.use-object-19-for-ota-update' | translate }} {{ 'device-profile.lwm2m.use-object-19-for-ota-update' | translate }}
</span> </span>

4
ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-device-profile-transport-configuration.component.ts
View File

@ -104,7 +104,7 @@ export class Lwm2mDeviceProfileTransportConfigurationComponent implements Contro
bootstrap: [[]], bootstrap: [[]],
clientLwM2mSettings: this.fb.group({ clientLwM2mSettings: this.fb.group({
clientOnlyObserveAfterConnect: [1, []], clientOnlyObserveAfterConnect: [1, []],
useObject19ForOta: [false], useObject19ForOtaInfo: [false],
fwUpdateStrategy: [1, []], fwUpdateStrategy: [1, []],
swUpdateStrategy: [1, []], swUpdateStrategy: [1, []],
fwUpdateResource: [{value: '', disabled: true}, []], fwUpdateResource: [{value: '', disabled: true}, []],
@ -263,7 +263,7 @@ export class Lwm2mDeviceProfileTransportConfigurationComponent implements Contro
bootstrapServerUpdateEnable: this.configurationValue.bootstrapServerUpdateEnable || false, bootstrapServerUpdateEnable: this.configurationValue.bootstrapServerUpdateEnable || false,
clientLwM2mSettings: { clientLwM2mSettings: {
clientOnlyObserveAfterConnect: this.configurationValue.clientLwM2mSettings.clientOnlyObserveAfterConnect, clientOnlyObserveAfterConnect: this.configurationValue.clientLwM2mSettings.clientOnlyObserveAfterConnect,
useObject19ForOta: this.configurationValue.clientLwM2mSettings.useObject19ForOta ?? false, useObject19ForOtaInfo: this.configurationValue.clientLwM2mSettings.useObject19ForOtaInfo ?? false,
fwUpdateStrategy: this.configurationValue.clientLwM2mSettings.fwUpdateStrategy || 1, fwUpdateStrategy: this.configurationValue.clientLwM2mSettings.fwUpdateStrategy || 1,
swUpdateStrategy: this.configurationValue.clientLwM2mSettings.swUpdateStrategy || 1, swUpdateStrategy: this.configurationValue.clientLwM2mSettings.swUpdateStrategy || 1,
fwUpdateResource: this.configurationValue.clientLwM2mSettings.fwUpdateResource || '', fwUpdateResource: this.configurationValue.clientLwM2mSettings.fwUpdateResource || '',

2
ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-profile-config.models.ts
View File

@ -169,7 +169,7 @@ export interface Lwm2mProfileConfigModels {
export interface ClientLwM2mSettings { export interface ClientLwM2mSettings {
clientOnlyObserveAfterConnect: number; clientOnlyObserveAfterConnect: number;
useObject19ForOta?: boolean; useObject19ForOtaInfo?: boolean;
fwUpdateStrategy: number; fwUpdateStrategy: number;
swUpdateStrategy: number; swUpdateStrategy: number;
fwUpdateResource?: string; fwUpdateResource?: string;