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

lwm2m: object-id-version

Browse Source
This commit is contained in:
nick 2024-05-05 19:43:16 +03:00
parent 9cc2efb5c4
commit 39cff913f2
13 changed files with 69 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,28 +91,11 @@
<tb-power-mode-settings [parentForm]="clientSettingsFormGroup">
</tb-power-mode-settings>
</fieldset>
<mat-slide-toggle class="mat-slider"
formControlName="compositeOperationsSupport">{{ 'device-profile.lwm2m.composite-operations-support' | translate }}</mat-slide-toggle>
<!-- <mat-accordion multi="true">-->
<!-- <div *ngIf="false">-->
<!-- <mat-expansion-panel>-->
<!-- <mat-expansion-panel-header>-->
<!-- <mat-panel-title>{{ 'device-profile.lwm2m.client-strategy' | translate }}</mat-panel-title>-->
<!-- </mat-expansion-panel-header>-->
<!-- <ng-template matExpansionPanelContent>-->
<!-- <div fxLayout="column">-->
<!-- <mat-form-field class="mat-block">-->
<!-- <mat-label>{{ 'device-profile.lwm2m.client-strategy-label' | translate }}</mat-label>-->
<!-- <mat-select formControlName="clientOnlyObserveAfterConnect">-->
<!-- <mat-option value=1>{{ 'device-profile.lwm2m.client-strategy-only-observe' | translate }}</mat-option>-->
<!-- <mat-option value=2>{{ 'device-profile.lwm2m.client-strategy-read-all' | translate }}</mat-option>-->
<!-- </mat-select>-->
<!-- </mat-form-field>-->
<!-- </div>-->
<!-- </ng-template>-->
<!-- </mat-expansion-panel>-->
<!-- </div>-->
<!-- </mat-accordion>-->
<mat-select formControlName="defaultObjectIDVer">
<mat-option *ngFor="let objectIDVer of objectIDVers" [value]="objectIDVer">
{{ objectIDVerTranslationMap.get(objectIDVer) | translate}}
</mat-option>
</mat-select>
</section>
</ng-template>
</mat-tab>

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

@ -40,9 +40,11 @@ import {
ObjectLwM2M,
OBSERVE,
PowerMode,
ObjectIDVer,
RESOURCES,
ServerSecurityConfig,
TELEMETRY
TELEMETRY,
ObjectIDVerTranslationMap
} from './lwm2m-profile-config.models';
import { DeviceProfileService } from '@core/http/device-profile.service';
import { deepClone, isDefinedAndNotNull, isEmpty, isUndefined } from '@core/utils';
@ -80,6 +82,10 @@ export class Lwm2mDeviceProfileTransportConfigurationComponent implements Contro
lwm2mDeviceProfileFormGroup: UntypedFormGroup;
configurationValue: Lwm2mProfileConfigModels;
objectIDVers = Object.values(ObjectIDVer);
objectIDVerTranslationMap = ObjectIDVerTranslationMap;
sortFunction: (key: string, value: object) => object;
get required(): boolean {
@ -117,7 +123,7 @@ export class Lwm2mDeviceProfileTransportConfigurationComponent implements Contro
edrxCycle: [{disabled: true, value: 0}, Validators.required],
psmActivityTimer: [{disabled: true, value: 0}, Validators.required],
pagingTransmissionWindow: [{disabled: true, value: 0}, Validators.required],
compositeOperationsSupport: [false]
defaultObjectIDVer: [ObjectIDVer.V1_1, Validators.required]
})
});
@ -276,7 +282,7 @@ export class Lwm2mDeviceProfileTransportConfigurationComponent implements Contro
pagingTransmissionWindow:
this.configurationValue.clientLwM2mSettings.pagingTransmissionWindow || DEFAULT_PAGING_TRANSMISSION_WINDOW,
psmActivityTimer: this.configurationValue.clientLwM2mSettings.psmActivityTimer || DEFAULT_PSM_ACTIVITY_TIMER,
compositeOperationsSupport: this.configurationValue.clientLwM2mSettings.compositeOperationsSupport || false
defaultObjectIDVer: this.configurationValue.clientLwM2mSettings.defaultObjectIDVer || ObjectIDVer.V1_1
}
},
{emitEvent: false});

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

@ -122,6 +122,18 @@ export const PowerModeTranslationMap = new Map<PowerMode, string>(
]
);
export enum ObjectIDVer {
V1_0 = '1.0',
V1_1 = '1.1'
}
export const ObjectIDVerTranslationMap = new Map<ObjectIDVer, string>(
[
[ObjectIDVer.V1_0, 'device-profile.lwm2m.default-object-id-ver.v1-0'],
[ObjectIDVer.V1_1, 'device-profile.lwm2m.default-object-id-ver.v1-1']
]
);
export interface ServerSecurityConfig {
host?: string;
port?: number;
@ -163,7 +175,7 @@ export interface ClientLwM2mSettings {
edrxCycle?: number;
pagingTransmissionWindow?: number;
psmActivityTimer?: number;
compositeOperationsSupport: boolean;
defaultObjectIDVer: string;
}
export interface ObservableAttributes {
@ -190,7 +202,7 @@ export function getDefaultProfileClientLwM2mSettingsConfig(): ClientLwM2mSetting
fwUpdateStrategy: 1,
swUpdateStrategy: 1,
powerMode: PowerMode.DRX,
compositeOperationsSupport: false
defaultObjectIDVer: ObjectIDVer.V1_1
};
}

5
ui-ngx/src/assets/locale/locale.constant-ar_AE.json
View File

@ -2079,7 +2079,10 @@
"min-evaluation-period": "الفترة الدنيا للتقييم",
"max-evaluation-period": "الفترة القصوى للتقييم"
},
"composite-operations-support": "يدعم عمليات القراءة/الكتابة/المراقبة المركبة"
"default-object-id-ver": {
"v1-0": "\"1.0\" هي قيمة إصدار الكائن إذا كان إصدار الكائن فارغًا.",
"v1-1": "\"1.1\" هي قيمة إصدار الكائن إذا كان إصدار الكائن فارغًا."
}
},
"snmp": {
"add-communication-config": "إضافة تكوين الاتصال",

5
ui-ngx/src/assets/locale/locale.constant-ca_ES.json
View File

@ -1711,7 +1711,10 @@
"min-evaluation-period": "Període mínim d'avaluació",
"max-evaluation-period": "Període màxim d'avaluació"
},
"composite-operations-support": "Admet operacions compostes de lectura/escriptura/observació"
"default-object-id-ver": {
"v1-0": "\"1.0\" és el valor de la versió de l'objecte si la versió de l'objecte està buida.",
"v1-1": "\"1.1\" és el valor de la versió de l'objecte si la versió de l'objecte està buida."
}
},
"snmp": {
"add-communication-config": "Afegeix la configuració de comunicació",

7
ui-ngx/src/assets/locale/locale.constant-cs_CZ.json
View File

@ -1302,8 +1302,11 @@
"min-evaluation-period": "Minimální interval evaluace",
"max-evaluation-period": "Maximální interval evaluace"
},
"composite-operations-support": "Podporuje kompozitní Read/Write/Observe operace"
},
"default-object-id-ver": {
"v1-0": "\"1.0\" je hodnota verze objektu, pokud je verze objektu prázdná.",
"v1-1": "\"1.1\" je hodnota verze objektu, pokud je verze objektu prázdná."
}
},
"snmp": {
"add-communication-config": "Přidat konfiguraci komunikace",
"add-mapping": "Přidat mapování",

5
ui-ngx/src/assets/locale/locale.constant-en_US.json
View File

@ -1899,7 +1899,10 @@
"min-evaluation-period": "Minimum evaluation period",
"max-evaluation-period": "Maximum evaluation period"
},
"composite-operations-support": "Supports composite Read/Write/Observe operations"
"default-object-id-ver": {
"v1-0": "\"1.0\" is the object's version value if the object's version is empty.",
"v1-1": "\"1.1\" is the object's version value if the object's version is empty."
}
},
"snmp": {
"add-communication-config": "Add communication config",

5
ui-ngx/src/assets/locale/locale.constant-es_ES.json
View File

@ -1836,7 +1836,10 @@
"min-evaluation-period": "Período mínimo de evaluación",
"max-evaluation-period": "Período máximo de evaluación"
},
"composite-operations-support": "Soporta operaciones Lectura/Escritura/Observación Compuestas"
"default-object-id-ver": {
"v1-0": "\"1.0\" es el valor de la versión del objeto si la versión del objeto está vacía.",
"v1-1": "\"1.1\" es el valor de la versión del objeto si la versión del objeto está vacía."
}
},
"snmp": {
"add-communication-config": "Añadir configuración de comunicaciones",

5
ui-ngx/src/assets/locale/locale.constant-nl_BE.json
View File

@ -1936,7 +1936,10 @@
"min-evaluation-period": "Minimale evaluatieperiode",
"max-evaluation-period": "Maximale evaluatieperiode"
},
"composite-operations-support": "Ondersteunt samengestelde lees-/schrijf-/observatiebewerkingen"
"default-object-id-ver": {
"v1-0": "\"1.0\" is de versiewaarde van het object als de versie van het object leeg is..",
"v1-1": "\"1.1\" is de versiewaarde van het object als de versie van het object leeg is."
}
},
"snmp": {
"add-communication-config": "Communicatieconfiguratie toevoegen",

5
ui-ngx/src/assets/locale/locale.constant-pl_PL.json
View File

@ -1873,7 +1873,10 @@
"min-evaluation-period":"Minimalny okres oceny",
"max-evaluation-period":"Maksymalny okres oceny"
},
"composite-operations-support":"Obsługuje operacje złożone Odczyt/Zapis/Obserwacja"
"default-object-id-ver": {
"v1-0": "\"1.0\" to wartość wersji obiektu, jeśli wersja obiektu jest pusta.",
"v1-1": "\"1.1\" to wartość wersji obiektu, jeśli wersja obiektu jest pusta."
}
},
"snmp":{
"add-communication-config":"Dodaj konfigurację komunikacji",

5
ui-ngx/src/assets/locale/locale.constant-tr_TR.json
View File

@ -1317,7 +1317,10 @@
"min-evaluation-period": "Minimum değerlendirme süresi",
"max-evaluation-period": "Maksimum değerlendirme süresi"
},
"composite-operations-support": "İç içe Okuma/Yazma/Gözlemleme işlemlerini destekler"
"default-object-id-ver": {
"v1-0": "\"1.0\", nesnenin sürümü boşsa nesnenin sürüm değeridir.",
"v1-1": "\"1.1\", nesnenin sürümü boşsa nesnenin sürüm değeridir."
}
},
"snmp": {
"add-communication-config": "İletişim yapılandırması ekle",

5
ui-ngx/src/assets/locale/locale.constant-zh_CN.json
View File

@ -1873,7 +1873,10 @@
"min-evaluation-period": "最小评估周期",
"max-evaluation-period": "最大评估周期"
},
"composite-operations-support": "支持复合读取/写入/观察操作"
"default-object-id-ver": {
"v1-0": "如果对象版本为空，则“1.0”是对象版本的值。",
"v1-1": "如果对象版本为空，则“1.1”是对象版本的值。"
}
},
"snmp": {
"add-communication-config": "添加通信配置",

5
ui-ngx/src/assets/locale/locale.constant-zh_TW.json
View File

@ -1511,7 +1511,10 @@
"min-evaluation-period": "最小評估期間",
"max-evaluation-period": "最大評估期間"
},
"composite-operations-support": "支持複合讀/寫/觀察 操作"
"default-object-id-ver": {
"v1-0": "如果物件的版本為空，則「1.0」是物件的版本值。",
"v1-1": "如果物件的版本為空，則「1.1」是物件的版本值。"
}
},
"snmp": {
"add-communication-config": "新增通訊配置",