nmelone/flutter_thingsboard_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update thingsboard client library

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/core/context/tb_context.dart
View File

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

16
lib/core/entity/entity_details_page.dart
View File

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