Update thingsboard client library

This commit is contained in:
Igor Kulikov
2021-06-24 19:21:53 +03:00
parent f25888e5f6
commit 2187211f00
10 changed files with 35 additions and 25 deletions

View File

@@ -256,8 +256,7 @@ class TbContext {
log.debug('authUser: ${tbClient.getAuthUser()}'); log.debug('authUser: ${tbClient.getAuthUser()}');
if (tbClient.getAuthUser()!.userId != null) { if (tbClient.getAuthUser()!.userId != null) {
try { try {
userDetails = await tbClient.getUserService().getUser( userDetails = await tbClient.getUserService().getUser();
tbClient.getAuthUser()!.userId!);
homeDashboard = await tbClient.getDashboardService().getHomeDashboardInfo(); homeDashboard = await tbClient.getDashboardService().getHomeDashboardInfo();
} catch (e) { } catch (e) {
tbClient.logout(); tbClient.logout();

View File

@@ -46,7 +46,7 @@ abstract class EntityDetailsPage<T extends BaseData> extends TbPageWidget<Entity
@override @override
_EntityDetailsPageState createState() => _EntityDetailsPageState(); _EntityDetailsPageState createState() => _EntityDetailsPageState();
Future<T> fetchEntity(String id); Future<T?> fetchEntity(String id);
ValueNotifier<String>? detailsTitle() { ValueNotifier<String>? detailsTitle() {
return null; return null;
@@ -58,7 +58,7 @@ abstract class EntityDetailsPage<T extends BaseData> extends TbPageWidget<Entity
class _EntityDetailsPageState<T extends BaseData> extends TbPageState<EntityDetailsPage<T>, _EntityDetailsPageState<T>> { class _EntityDetailsPageState<T extends BaseData> extends TbPageState<EntityDetailsPage<T>, _EntityDetailsPageState<T>> {
late Future<T> entityFuture; late Future<T?> entityFuture;
late ValueNotifier<String> titleValue; late ValueNotifier<String> titleValue;
@override @override
@@ -112,12 +112,16 @@ class _EntityDetailsPageState<T extends BaseData> extends TbPageState<EntityDeta
}, },
), ),
), ),
body: FutureBuilder<T>( body: FutureBuilder<T?>(
future: entityFuture, future: entityFuture,
builder: (context, snapshot) { builder: (context, snapshot) {
if (snapshot.hasData) { if (snapshot.connectionState == ConnectionState.done) {
var entity = snapshot.data!; var entity = snapshot.data;
return widget.buildEntityDetails(context, entity); if (entity != null) {
return widget.buildEntityDetails(context, entity);
} else {
return Center(child: Text('Requested entity does not exists.'));
}
} else { } else {
return Center(child: TbProgressIndicator( return Center(child: TbProgressIndicator(
size: 50.0, size: 50.0,

View File

@@ -278,7 +278,7 @@ class _AlarmCardState extends TbContextState<AlarmCard, _AlarmCardState> {
alarm.id!.id!); alarm.id!.id!);
setState(() { setState(() {
loading = false; loading = false;
this.alarm = newAlarm; this.alarm = newAlarm!;
}); });
} }
} }
@@ -294,7 +294,7 @@ class _AlarmCardState extends TbContextState<AlarmCard, _AlarmCardState> {
alarm.id!.id!); alarm.id!.id!);
setState(() { setState(() {
loading = false; loading = false;
this.alarm = newAlarm; this.alarm = newAlarm!;
}); });
} }
} }

View File

@@ -12,7 +12,7 @@ class AssetDetailsPage extends EntityDetailsPage<AssetInfo> {
defaultTitle: 'Asset', subTitle: 'Asset details'); defaultTitle: 'Asset', subTitle: 'Asset details');
@override @override
Future<AssetInfo> fetchEntity(String assetId) { Future<AssetInfo?> fetchEntity(String assetId) {
return tbClient.getAssetService().getAssetInfo(assetId); return tbClient.getAssetService().getAssetInfo(assetId);
} }

View File

@@ -8,7 +8,7 @@ class CustomerDetailsPage extends ContactBasedDetailsPage<Customer> {
super(tbContext, entityId: customerId, defaultTitle: 'Customer', subTitle: 'Customer details'); super(tbContext, entityId: customerId, defaultTitle: 'Customer', subTitle: 'Customer details');
@override @override
Future<Customer> fetchEntity(String customerId) { Future<Customer?> fetchEntity(String customerId) {
return tbClient.getCustomerService().getCustomer(customerId); return tbClient.getCustomerService().getCustomer(customerId);
} }

View File

@@ -12,7 +12,7 @@ class DeviceDetailsPage extends EntityDetailsPage<DeviceInfo> {
defaultTitle: 'Device'); defaultTitle: 'Device');
@override @override
Future<DeviceInfo> fetchEntity(String deviceId) { Future<DeviceInfo?> fetchEntity(String deviceId) {
return tbClient.getDeviceService().getDeviceInfo(deviceId); return tbClient.getDeviceService().getDeviceInfo(deviceId);
} }

View File

@@ -140,7 +140,7 @@ class _ProfilePageState extends TbPageState<ProfilePage, _ProfilePageState> {
Future<void> _loadUser() async { Future<void> _loadUser() async {
_isLoadingNotifier.value = true; _isLoadingNotifier.value = true;
_currentUser = await tbClient.getUserService().getUser(tbClient.getAuthUser()!.userId!); _currentUser = await tbClient.getUserService().getUser();
_setUser(); _setUser();
_isLoadingNotifier.value = false; _isLoadingNotifier.value = false;
} }

View File

@@ -8,7 +8,7 @@ class TenantDetailsPage extends ContactBasedDetailsPage<Tenant> {
super(tbContext, entityId: tenantId, defaultTitle: 'Tenant', subTitle: 'Tenant details'); super(tbContext, entityId: tenantId, defaultTitle: 'Tenant', subTitle: 'Tenant details');
@override @override
Future<Tenant> fetchEntity(String tenantId) { Future<Tenant?> fetchEntity(String tenantId) {
return tbClient.getTenantService().getTenant(tenantId); return tbClient.getTenantService().getTenant(tenantId);
} }

View File

@@ -8,8 +8,8 @@ abstract class DeviceProfileCache {
var deviceProfile = _cache[name]; var deviceProfile = _cache[name];
if (deviceProfile == null) { if (deviceProfile == null) {
var device = await tbClient.getDeviceService().getDevice(deviceId); var device = await tbClient.getDeviceService().getDevice(deviceId);
deviceProfile = await tbClient.getDeviceProfileService().getDeviceProfileInfo(device.deviceProfileId!.id!); deviceProfile = await tbClient.getDeviceProfileService().getDeviceProfileInfo(device!.deviceProfileId!.id!);
_cache[name] = deviceProfile; _cache[name] = deviceProfile!;
} }
return deviceProfile; return deviceProfile;
} }

View File

@@ -70,7 +70,7 @@ packages:
name: convert name: convert
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.0.0" version: "3.0.1"
crypto: crypto:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -209,14 +209,14 @@ packages:
name: geolocator name: geolocator
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "7.1.0" version: "7.1.1"
geolocator_platform_interface: geolocator_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: geolocator_platform_interface name: geolocator_platform_interface
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.1" version: "2.2.0"
geolocator_web: geolocator_web:
dependency: transitive dependency: transitive
description: description:
@@ -251,7 +251,7 @@ packages:
name: image_picker name: image_picker
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.8.0+3" version: "0.8.1"
image_picker_for_web: image_picker_for_web:
dependency: transitive dependency: transitive
description: description:
@@ -363,7 +363,7 @@ packages:
name: pedantic name: pedantic
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.11.0" version: "1.11.1"
petitparser: petitparser:
dependency: transitive dependency: transitive
description: description:
@@ -384,7 +384,7 @@ packages:
name: pointycastle name: pointycastle
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.1.1" version: "3.1.2"
qr_code_scanner: qr_code_scanner:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -458,7 +458,7 @@ packages:
description: description:
path: "." path: "."
ref: HEAD ref: HEAD
resolved-ref: a899f22d6cd784c72df7abcf42ff190b9d227ee5 resolved-ref: "937ab8d40f33f70d6fb4a7a8c96ce974cc08e48d"
url: "git@github.com:thingsboard/dart_thingsboard_client.git" url: "git@github.com:thingsboard/dart_thingsboard_client.git"
source: git source: git
version: "1.0.0" version: "1.0.0"
@@ -475,7 +475,7 @@ packages:
name: url_launcher name: url_launcher
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "6.0.6" version: "6.0.7"
url_launcher_linux: url_launcher_linux:
dependency: transitive dependency: transitive
description: description:
@@ -518,6 +518,13 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.0" version: "2.1.0"
web_socket_channel:
dependency: transitive
description:
name: web_socket_channel
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
xml: xml:
dependency: transitive dependency: transitive
description: description: