tuanta/sfm_app_final
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix(bugs):

Browse Source 
Can't logout
ui display when user doesn't has device
This commit is contained in:
anhtunz
2025-05-26 11:58:19 +07:00
parent f80e234b1d
commit 01ae020374
10 changed files with 417 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/bloc/home_bloc.dart
View File

@@ -22,6 +22,10 @@ class HomeBloc extends BlocBase {
StreamSink<int> get sinkCountNotification => countNotification.sink; StreamSink<int> get sinkCountNotification => countNotification.sink;
Stream<int> get streamCountNotification => countNotification.stream; Stream<int> get streamCountNotification => countNotification.stream;
final hasJoinedDevice = StreamController<bool?>.broadcast();
StreamSink<bool?> get sinkHasJoinedDevice => hasJoinedDevice.sink;
Stream<bool?> get streamHasJoinedDevice => hasJoinedDevice.stream;
final ownerDevicesStatus = final ownerDevicesStatus =
StreamController<Map<String, List<DeviceWithAlias>>>.broadcast(); StreamController<Map<String, List<DeviceWithAlias>>>.broadcast();
StreamSink<Map<String, List<DeviceWithAlias>>> StreamSink<Map<String, List<DeviceWithAlias>>>

51
lib/bloc/inter_family_bloc.dart
View File

@@ -38,33 +38,48 @@ class InterFamilyBloc extends BlocBase {
void getAllGroup(String role) async { void getAllGroup(String role) async {
List<Group> groups = []; List<Group> groups = [];
sinkCurrentGroups.add(groups); sinkCurrentGroups.add(groups);
final body = await apiServices.getAllGroups(); final body = await apiServices.getAllGroups();
if (body.isNotEmpty) { if (body.isNotEmpty) {
final data = jsonDecode(body); try {
List<dynamic> items = data["items"]; final data = jsonDecode(body);
groups = Group.fromJsonDynamicList(items);
groups = sortGroupByName(groups);
List<Group> currentGroups = groups.where( // Kiểm tra nếu data là một Map và có chứa key "items"
(group) { if (data is Map && data.containsKey("items") && data["items"] is List) {
bool isPublic = group.visibility == "PUBLIC"; List<dynamic> items = data["items"];
groups = Group.fromJsonDynamicList(items);
groups = sortGroupByName(groups);
if (role == ApplicationConstants.OWNER_GROUP) { List<Group> currentGroups = groups.where(
return group.isOwner == true && isPublic; (group) {
} bool isPublic = group.visibility == "PUBLIC";
if (role == ApplicationConstants.PARTICIPANT_GROUP) { if (role == ApplicationConstants.OWNER_GROUP) {
return group.isOwner == null && isPublic; return group.isOwner == true && isPublic;
} }
return false; if (role == ApplicationConstants.PARTICIPANT_GROUP) {
}, return group.isOwner == null && isPublic;
).toList(); }
sinkCurrentGroups.add(currentGroups); return false;
},
).toList();
sinkCurrentGroups.add(currentGroups);
} else {
log("No items found in API response or empty JSON object");
sinkCurrentGroups.add([]);
}
} catch (e) {
// Xử lý lỗi khi jsonDecode thất bại
log("Error decoding JSON: $e");
sinkCurrentGroups.add([]);
}
} else { } else {
log("Get groups from API failed"); log("Get groups from API failed: Empty response");
sinkCurrentGroups.add([]);
} }
log("Inter Family Role: $role"); log("Inter Family Role: $role");
} }

2
lib/feature/device_log/device_logs_screen.dart
View File

@@ -63,7 +63,7 @@ class _DeviceLogsScreenState extends State<DeviceLogsScreen> {
body: StreamBuilder<List<Device>>( body: StreamBuilder<List<Device>>(
stream: deviceLogsBloc.streamAllDevices, stream: deviceLogsBloc.streamAllDevices,
builder: (context, allDevicesSnapshot) { builder: (context, allDevicesSnapshot) {
if (allDevicesSnapshot.data?[0].thingId == null) { if (allDevicesSnapshot.data == null) {
deviceLogsBloc.getAllDevices(); deviceLogsBloc.getAllDevices();
return const Center( return const Center(
child: CircularProgressIndicator(), child: CircularProgressIndicator(),

10
lib/feature/devices/add_new_device_widget.dart
View File

@@ -1,6 +1,7 @@
// ignore_for_file: use_build_context_synchronously // ignore_for_file: use_build_context_synchronously
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:sfm_app/bloc/devices_manager_bloc.dart';
import 'package:sfm_app/product/shared/shared_snack_bar.dart'; import 'package:sfm_app/product/shared/shared_snack_bar.dart';
import '../../product/utils/response_status_utils.dart'; import '../../product/utils/response_status_utils.dart';
import '../../product/constant/enums/role_enums.dart'; import '../../product/constant/enums/role_enums.dart';
@@ -10,7 +11,7 @@ import '../../product/constant/icon/icon_constants.dart';
import '../../product/extension/context_extension.dart'; import '../../product/extension/context_extension.dart';
import '../../product/services/language_services.dart'; import '../../product/services/language_services.dart';
addNewDevice(BuildContext context, String role) async { addNewDevice(BuildContext context, String role, DevicesManagerBloc deviceManagerBloc) async {
TextEditingController extIDController = TextEditingController(text: ""); TextEditingController extIDController = TextEditingController(text: "");
TextEditingController deviceNameController = TextEditingController(text: ""); TextEditingController deviceNameController = TextEditingController(text: "");
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(
@@ -76,7 +77,7 @@ addNewDevice(BuildContext context, String role) async {
Colors.white); Colors.white);
ScaffoldMessenger.of(context).hideCurrentSnackBar(); ScaffoldMessenger.of(context).hideCurrentSnackBar();
} else { } else {
addDevices(context, role, extID, deviceName); addDevices(context, role, extID, deviceName, deviceManagerBloc);
ScaffoldMessenger.of(context).hideCurrentSnackBar(); ScaffoldMessenger.of(context).hideCurrentSnackBar();
} }
}, },
@@ -90,7 +91,7 @@ addNewDevice(BuildContext context, String role) async {
} }
void addDevices( void addDevices(
BuildContext context, String role, String extID, String deviceName) async { BuildContext context, String role, String extID, String deviceName, DevicesManagerBloc deviceManagerBloc) async {
APIServices apiServices = APIServices(); APIServices apiServices = APIServices();
Map<String, dynamic> body = {}; Map<String, dynamic> body = {};
if (role == RoleEnums.ADMIN.name) { if (role == RoleEnums.ADMIN.name) {
@@ -101,6 +102,7 @@ void addDevices(
statusCode, statusCode,
appLocalization(context).notification_create_device_success, appLocalization(context).notification_create_device_success,
appLocalization(context).notification_create_device_failed); appLocalization(context).notification_create_device_failed);
deviceManagerBloc.getDeviceByState(-2);
} else { } else {
body = {"ext_id": extID}; body = {"ext_id": extID};
int statusCode = await apiServices.registerDevice(body); int statusCode = await apiServices.registerDevice(body);
@@ -109,5 +111,7 @@ void addDevices(
statusCode, statusCode,
appLocalization(context).notification_add_device_success, appLocalization(context).notification_add_device_success,
appLocalization(context).notification_device_not_exist); appLocalization(context).notification_device_not_exist);
deviceManagerBloc.getDeviceByState(-2);
} }
} }

168
lib/feature/devices/devices_manager_screen.dart
View File

@@ -29,7 +29,7 @@ class _DevicesManagerScreenState extends State<DevicesManagerScreen> {
late DevicesManagerBloc devicesManagerBloc; late DevicesManagerBloc devicesManagerBloc;
String role = "Undefine"; String role = "Undefine";
APIServices apiServices = APIServices(); APIServices apiServices = APIServices();
List<Device> devices = []; // List<Device> devices = [];
Timer? getAllDevicesTimer; Timer? getAllDevicesTimer;
List<Widget> tags = []; List<Widget> tags = [];
int tagIndex = -2; int tagIndex = -2;
@@ -58,36 +58,60 @@ class _DevicesManagerScreenState extends State<DevicesManagerScreen> {
body: StreamBuilder<List<int>>( body: StreamBuilder<List<int>>(
stream: devicesManagerBloc.streamTagStates, stream: devicesManagerBloc.streamTagStates,
builder: (context, tagSnapshot) { builder: (context, tagSnapshot) {
return SafeArea( return StreamBuilder<String>(
child: StreamBuilder<List<Device>>( stream: devicesManagerBloc.streamUserRole,
stream: devicesManagerBloc.streamAllDevices, initialData: role,
initialData: devices, builder: (context, roleSnapshot) {
builder: (context, allDeviceSnapshot) { return SafeArea(
if (allDeviceSnapshot.data?.isEmpty ?? devices.isEmpty) { child: StreamBuilder<List<Device>>(
devicesManagerBloc stream: devicesManagerBloc.streamAllDevices,
.getDeviceByState(tagSnapshot.data?[0] ?? -2); builder: (context, allDeviceSnapshot) {
return const Center(child: CircularProgressIndicator()); if(allDeviceSnapshot.data == null){
} else { devicesManagerBloc
if (tagSnapshot.data!.isNotEmpty) { .getDeviceByState(tagSnapshot.data?[0] ?? -2);
tagIndex = tagSnapshot.data![0]; return const Center(child: CircularProgressIndicator());
devicesManagerBloc.sinkTagStates.add([tagIndex]); }
} if (allDeviceSnapshot.data!.isEmpty) {
return SingleChildScrollView( return Center(
child: Column( child: Column(
children: [ mainAxisAlignment: MainAxisAlignment.center,
if (tagSnapshot.hasData && crossAxisAlignment: CrossAxisAlignment.center,
tagSnapshot.data!.isNotEmpty && children: [
tagSnapshot.data![0] != -2) Container(
TagState( width: 100,
state: tagSnapshot.data![0], height: 100,
devicesManagerBloc: devicesManagerBloc, decoration: BoxDecoration(
), border: Border.all(color: Theme.of(context).colorScheme.primary),
SizedBox(height: context.lowValue), borderRadius: BorderRadius.circular(50)
StreamBuilder<String>( ),
stream: devicesManagerBloc.streamUserRole, child: IconButton(onPressed: (){
initialData: role, ScaffoldMessenger.of(context)
builder: (context, roleSnapshot) { .clearSnackBars();
return SizedBox( addNewDevice(context,
roleSnapshot.data ?? role, devicesManagerBloc);
}, iconSize: 50, icon: const Icon(Icons.add),),),
SizedBox(height: context.mediumValue,),
Text(appLocalization(context).dont_have_device, style: context.responsiveBodyMediumWithBold,)
],
),
);
} else {
if (tagSnapshot.data!.isNotEmpty) {
tagIndex = tagSnapshot.data![0];
devicesManagerBloc.sinkTagStates.add([tagIndex]);
}
return SingleChildScrollView(
child: Column(
children: [
if (tagSnapshot.hasData &&
tagSnapshot.data!.isNotEmpty &&
tagSnapshot.data![0] != -2)
TagState(
state: tagSnapshot.data![0],
devicesManagerBloc: devicesManagerBloc,
),
SizedBox(height: context.lowValue),
SizedBox(
height: getTableHeight(allDeviceSnapshot.data?.length ?? 1), height: getTableHeight(allDeviceSnapshot.data?.length ?? 1),
child: PaginatedDataTable2( child: PaginatedDataTable2(
wrapInCard: false, wrapInCard: false,
@@ -108,7 +132,7 @@ class _DevicesManagerScreenState extends State<DevicesManagerScreen> {
), ),
columns: [ columns: [
if (roleSnapshot.data == if (roleSnapshot.data ==
RoleEnums.ADMIN.name || RoleEnums.ADMIN.name ||
roleSnapshot.data == roleSnapshot.data ==
RoleEnums.USER.name) RoleEnums.USER.name)
DataColumn2( DataColumn2(
@@ -149,23 +173,23 @@ class _DevicesManagerScreenState extends State<DevicesManagerScreen> {
// log('Chuyen page: $pageIndex'); // log('Chuyen page: $pageIndex');
}, },
rowsPerPage: rowsPerPage:
(allDeviceSnapshot.data?.length ?? 1) < 6 (allDeviceSnapshot.data?.length ?? 1) < 6
? (allDeviceSnapshot.data?.length ?? ? (allDeviceSnapshot.data?.length ??
0) 0)
: 5, : 5,
actions: [ actions: [
if (roleSnapshot.data == if (roleSnapshot.data ==
RoleEnums.USER.name || RoleEnums.USER.name ||
roleSnapshot.data == roleSnapshot.data ==
RoleEnums.ADMIN.name) RoleEnums.ADMIN.name)
IconButton( IconButton(
style: ButtonStyle( style: ButtonStyle(
backgroundColor: backgroundColor:
WidgetStateProperty.all<Color>( WidgetStateProperty.all<Color>(
Colors.green), Colors.green),
iconColor: iconColor:
WidgetStateProperty.all<Color>( WidgetStateProperty.all<Color>(
Colors.white, Colors.white,
), ),
), ),
@@ -173,49 +197,49 @@ class _DevicesManagerScreenState extends State<DevicesManagerScreen> {
ScaffoldMessenger.of(context) ScaffoldMessenger.of(context)
.clearSnackBars(); .clearSnackBars();
addNewDevice(context, addNewDevice(context,
roleSnapshot.data ?? role); roleSnapshot.data ?? role, devicesManagerBloc);
}, },
icon: IconConstants.instance icon: IconConstants.instance
.getMaterialIcon(Icons.add)) .getMaterialIcon(Icons.add))
], ],
source: DeviceSource( source: DeviceSource(
devices: allDeviceSnapshot.data ?? devices, devices: allDeviceSnapshot.data ?? [],
context: context, context: context,
devicesBloc: devicesManagerBloc, devicesBloc: devicesManagerBloc,
role: role, role: role,
), ),
), ),
); ),
}, SizedBox(height: context.lowValue),
Text(
appLocalization(context).overview_message,
style: context.responsiveBodyLargeWithBold
),
StreamBuilder<Map<String, List<Device>>>(
stream: devicesManagerBloc.streamDeviceByState,
builder: (context, devicesByStateSnapshot) {
if (devicesByStateSnapshot.data == null) {
devicesManagerBloc.getDeviceByState(
tagSnapshot.data?[0] ?? -2);
return const Center(
child: CircularProgressIndicator());
} else {
return SharedPieChart(
deviceByState:
devicesByStateSnapshot.data ?? {},
devicesManagerBloc: devicesManagerBloc,
);
}
},
),
],
), ),
SizedBox(height: context.lowValue), );
Text( }
appLocalization(context).overview_message, },
style: context.responsiveBodyLargeWithBold ),
), );
StreamBuilder<Map<String, List<Device>>>( }
stream: devicesManagerBloc.streamDeviceByState,
builder: (context, devicesByStateSnapshot) {
if (devicesByStateSnapshot.data == null) {
devicesManagerBloc.getDeviceByState(
tagSnapshot.data?[0] ?? -2);
return const Center(
child: CircularProgressIndicator());
} else {
return SharedPieChart(
deviceByState:
devicesByStateSnapshot.data ?? {},
devicesManagerBloc: devicesManagerBloc,
);
}
},
),
],
),
);
}
},
),
); );
}), }),
); );

341
lib/feature/home/home_screen.dart
View File

@@ -40,7 +40,8 @@ class _HomeScreenState extends State<HomeScreen> {
homeBloc = BlocProvider.of(context); homeBloc = BlocProvider.of(context);
getOwnerAndJoinedDevices(); getOwnerAndJoinedDevices();
const duration = Duration(seconds: 10); const duration = Duration(seconds: 10);
getAllDevicesTimer = Timer.periodic(duration, (Timer t) => getOwnerAndJoinedDevices()); getAllDevicesTimer =
Timer.periodic(duration, (Timer t) => getOwnerAndJoinedDevices());
} }
@override @override
@@ -81,127 +82,199 @@ class _HomeScreenState extends State<HomeScreen> {
child: StreamBuilder<Map<String, List<DeviceWithAlias>>>( child: StreamBuilder<Map<String, List<DeviceWithAlias>>>(
stream: homeBloc.streamOwnerDevicesStatus, stream: homeBloc.streamOwnerDevicesStatus,
builder: (context, snapshot) { builder: (context, snapshot) {
if (snapshot.data?['state'] != null || snapshot.data?['battery'] != null) { return AnimatedSwitcher(
return ConstrainedBox( duration: context.lowDuration,
constraints: BoxConstraints(minWidth: MediaQuery.of(context).size.width), transitionBuilder:
child: Row( (Widget child, Animation<double> animation) {
mainAxisAlignment: MainAxisAlignment.start, final offsetAnimation = Tween<Offset>(
children: [ begin: const Offset(0.0, 0.2),
if (snapshot.data?['state'] != null) end: Offset.zero,
...snapshot.data!['state']! ).animate(CurvedAnimation(
.map( parent: animation,
(item) => SizedBox( curve: Curves.easeInOut,
width: context.dynamicWidth(0.95), ));
child: FutureBuilder<Widget>( return FadeTransition(
future: warningCard(context, apiServices, item), opacity: animation,
builder: (context, warningCardSnapshot) { child: SlideTransition(
if (warningCardSnapshot.hasData) { position: offsetAnimation,
return warningCardSnapshot.data!; child: child,
} else {
return const SizedBox.shrink();
}
},
),
),
)
.toList(),
if (snapshot.data?['battery'] != null)
...snapshot.data!['battery']!
.map(
(batteryItem) => SizedBox(
width: context.dynamicWidth(0.95),
child: FutureBuilder<Widget>(
future: notificationCard(
context, "lowBattery", appLocalization(context).low_battery_message, batteryItem),
builder: (context, warningCardSnapshot) {
if (warningCardSnapshot.hasData) {
return warningCardSnapshot.data!;
} else {
return const SizedBox.shrink();
}
},
),
),
)
.toList(),
],
),
);
} else {
return Padding(
padding: context.paddingMedium,
child: Center(
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
const Icon(
Icons.check_circle_outline_rounded,
size: 40,
color: Colors.green,
),
SizedBox(width: context.lowValue),
Text(
appLocalization(context).notification_description,
maxLines: 2,
overflow: TextOverflow.ellipsis,
softWrap: true,
textAlign: TextAlign.start,
),
],
), ),
), );
); },
} child: snapshot.data?['state'] != null ||
snapshot.data?['battery'] != null
? ConstrainedBox(
key: const ValueKey('data'),
constraints: BoxConstraints(
minWidth:
MediaQuery.of(context).size.width),
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
if (snapshot.data?['state'] != null)
...snapshot.data!['state']!
.map(
(item) => SizedBox(
width: context.dynamicWidth(0.95),
child: FutureBuilder<Widget>(
future: warningCard(
context, apiServices, item),
builder: (context,
warningCardSnapshot) {
if (warningCardSnapshot
.hasData) {
return warningCardSnapshot
.data!;
} else {
return const SizedBox
.shrink();
}
},
),
),
)
.toList(),
if (snapshot.data?['battery'] != null)
...snapshot.data!['battery']!
.map(
(batteryItem) => SizedBox(
width: context.dynamicWidth(0.95),
child: FutureBuilder<Widget>(
future: notificationCard(
context,
"lowBattery",
appLocalization(context)
.low_battery_message,
batteryItem,
),
builder: (context,
warningCardSnapshot) {
if (warningCardSnapshot
.hasData) {
return warningCardSnapshot
.data!;
} else {
return const SizedBox
.shrink();
}
},
),
),
)
.toList(),
],
),
)
: Padding(
key: const ValueKey('no_data'),
padding: context.paddingMedium,
child: Center(
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
const Icon(
Icons.check_circle_outline_rounded,
size: 40,
color: Colors.green,
),
SizedBox(width: context.lowValue),
Text(
appLocalization(context)
.notification_description,
maxLines: 2,
overflow: TextOverflow.ellipsis,
softWrap: true,
textAlign: TextAlign.start,
),
],
),
),
),
);
}, },
), ),
), ),
), ),
StreamBuilder<bool?>(
stream: homeBloc.streamHasJoinedDevice,
initialData: null,
builder: (context, hasJoinedDeviceSnapshot) {
return StreamBuilder<Map<String, List<DeviceWithAlias>>>(
stream: homeBloc.streamAllDevicesAliasMap,
builder: (context, allDevicesAliasMapSnapshot) {
return StreamBuilder<Map<String, List<DeviceWithAlias>>>(
stream: homeBloc.streamAllDevicesAliasJoinedMap,
builder: (context, allDevicesAliasJoinedMapSnapshot) {
if (hasJoinedDeviceSnapshot.data == null) {
return const CircularProgressIndicator();
} else {
final data = allDevicesAliasMapSnapshot.data!;
final dataJoined =
allDevicesAliasJoinedMapSnapshot.data!;
if (hasJoinedDeviceSnapshot.data == false) {
if (!allDevicesAliasMapSnapshot.hasData ||
allDevicesAliasMapSnapshot.data == null) {
return const Center(
child: CircularProgressIndicator());
}
return OverviewCard(
isOwner: true,
total: data['all']?.length ?? 0,
active: data['online']?.length ?? 0,
StreamBuilder<Map<String, List<DeviceWithAlias>>>( inactive: data['offline']?.length ?? 0,
stream: homeBloc.streamAllDevicesAliasMap, warning: data['warn']?.length ?? 0,
builder: (context, allDevicesAliasMapSnapshot) { unused: data['not-use']?.length ?? 0);
if (!allDevicesAliasMapSnapshot.hasData || } else {
allDevicesAliasMapSnapshot.data == null) { return DefaultTabController(
return const Center(child: CircularProgressIndicator()); length: 2,
} child: Column(
final data = allDevicesAliasMapSnapshot.data!; children: [
return OverviewCard( const TabBar(
isOwner: true, tabs: [
total: data['all']?.length ?? 0, Tab(text: 'Owner Devices'),
active: data['online']?.length ?? 0, Tab(text: 'Joined Devices'),
inactive: data['offline']?.length ?? 0, ],
warning: data['warn']?.length ?? 0, labelColor: Colors.blue,
unused: data['not-use']?.length ?? 0); unselectedLabelColor: Colors.grey,
}), indicatorColor: Colors.blue,
SizedBox(height: context.lowValue), ),
StreamBuilder<Map<String, List<DeviceWithAlias>>>( TabBarView(
stream: homeBloc.streamAllDevicesAliasJoinedMap, children: [
builder: (context, allDevicesAliasJoinedMapSnapshot) { OverviewCard(
if (!allDevicesAliasJoinedMapSnapshot.hasData || isOwner: true,
allDevicesAliasJoinedMapSnapshot.data == null) { total: data['all']?.length ?? 0,
return const Center(child: CircularProgressIndicator()); active: data['online']?.length ?? 0,
} inactive:
final data = allDevicesAliasJoinedMapSnapshot.data!; data['offline']?.length ?? 0,
final total = data['all']?.length ?? 0; warning: data['warn']?.length ?? 0,
final active = data['online']?.length ?? 0; unused:
final inactive = data['offline']?.length ?? 0; data['not-use']?.length ?? 0),
final warning = data['warn']?.length ?? 0; OverviewCard(
final unused = data['not-use']?.length ?? 0; isOwner: false,
total:
if (total == 0 && active == 0 && inactive == 0 && warning == 0 && unused == 0) { dataJoined['all']?.length ?? 0,
return const SizedBox.shrink(); active:
} dataJoined['online']?.length ??
return OverviewCard( 0,
isOwner: false, inactive:
total: total, dataJoined['offline']?.length ??
active: active, 0,
inactive: inactive, warning:
warning: warning, dataJoined['warn']?.length ?? 0,
unused: unused, unused:
dataJoined['not-use']?.length ??
0),
],
),
],
),
);
}
}
},
);
},
); );
}, },
), ),
@@ -217,9 +290,15 @@ class _HomeScreenState extends State<HomeScreen> {
final data = jsonDecode(response); final data = jsonDecode(response);
List<dynamic> result = data["items"]; List<dynamic> result = data["items"];
devices = DeviceWithAlias.fromJsonDynamicList(result); devices = DeviceWithAlias.fromJsonDynamicList(result);
getOwnerDeviceState(devices); List<DeviceWithAlias> publicDevices = [];
checkSettingDevice(devices); for (var device in devices) {
getDeviceStatusAliasMap(devices); if (device.visibility == "PUBLIC") {
publicDevices.add(device);
}
}
getOwnerDeviceState(publicDevices);
checkSettingDevice(publicDevices);
getDeviceStatusAliasMap(publicDevices);
} }
void getOwnerDeviceState(List<DeviceWithAlias> allDevices) async { void getOwnerDeviceState(List<DeviceWithAlias> allDevices) async {
@@ -229,21 +308,23 @@ class _HomeScreenState extends State<HomeScreen> {
ownerDevices.add(device); ownerDevices.add(device);
} }
} }
if (ownerDevicesState.isEmpty || ownerDevicesState.length < devices.length) { if (ownerDevicesState.isEmpty ||
ownerDevicesState.length < devices.length) {
ownerDevicesState.clear(); ownerDevicesState.clear();
ownerDevicesStatus.clear(); ownerDevicesStatus.clear();
homeBloc.sinkOwnerDevicesStatus.add(ownerDevicesStatus); homeBloc.sinkOwnerDevicesStatus.add(ownerDevicesStatus);
int count = 0; int count = 0;
for (var device in ownerDevices) { for (var device in ownerDevices) {
Map<String, dynamic> sensorMap = Map<String, dynamic> sensorMap = DeviceUtils.instance
DeviceUtils.instance.getDeviceSensors(context, device.status?.sensors ?? []); .getDeviceSensors(context, device.status?.sensors ?? []);
if (device.state == 1 || device.state == 3) { if (device.state == 1 || device.state == 3) {
ownerDevicesStatus["state"] ??= []; ownerDevicesStatus["state"] ??= [];
ownerDevicesStatus["state"]!.add(device); ownerDevicesStatus["state"]!.add(device);
homeBloc.sinkOwnerDevicesStatus.add(ownerDevicesStatus); homeBloc.sinkOwnerDevicesStatus.add(ownerDevicesStatus);
count++; count++;
} }
if (sensorMap['sensorBattery'] != appLocalization(context).no_data_message) { if (sensorMap['sensorBattery'] !=
appLocalization(context).no_data_message) {
if (double.parse(sensorMap['sensorBattery']) <= 20) { if (double.parse(sensorMap['sensorBattery']) <= 20) {
ownerDevicesStatus['battery'] ??= []; ownerDevicesStatus['battery'] ??= [];
ownerDevicesStatus['battery']!.add(device); ownerDevicesStatus['battery']!.add(device);
@@ -260,7 +341,7 @@ class _HomeScreenState extends State<HomeScreen> {
void getDeviceStatusAliasMap(List<DeviceWithAlias> devices) { void getDeviceStatusAliasMap(List<DeviceWithAlias> devices) {
allDevicesAliasMap.clear(); allDevicesAliasMap.clear();
allDevicesAliasJoinedMap.clear(); allDevicesAliasJoinedMap.clear();
bool check = false;
for (var key in ['all', 'online', 'offline', 'warning', 'not-use']) { for (var key in ['all', 'online', 'offline', 'warning', 'not-use']) {
allDevicesAliasMap[key] = []; allDevicesAliasMap[key] = [];
allDevicesAliasJoinedMap[key] = []; allDevicesAliasJoinedMap[key] = [];
@@ -282,6 +363,7 @@ class _HomeScreenState extends State<HomeScreen> {
allDevicesAliasMap['not-use']!.add(device); allDevicesAliasMap['not-use']!.add(device);
} }
} else { } else {
check = true;
allDevicesAliasJoinedMap['all']!.add(device); allDevicesAliasJoinedMap['all']!.add(device);
if (device.state == 0 || device.state == 1) { if (device.state == 0 || device.state == 1) {
allDevicesAliasJoinedMap['online']!.add(device); allDevicesAliasJoinedMap['online']!.add(device);
@@ -297,7 +379,7 @@ class _HomeScreenState extends State<HomeScreen> {
} }
} }
} }
homeBloc.sinkHasJoinedDevice.add(check);
homeBloc.sinkAllDevicesAliasMap.add(allDevicesAliasMap); homeBloc.sinkAllDevicesAliasMap.add(allDevicesAliasMap);
homeBloc.sinkAllDevicesAliasJoinedMap.add(allDevicesAliasJoinedMap); homeBloc.sinkAllDevicesAliasJoinedMap.add(allDevicesAliasJoinedMap);
} }
@@ -306,7 +388,8 @@ class _HomeScreenState extends State<HomeScreen> {
if (isFunctionCall) { if (isFunctionCall) {
log("Ham check setting da duoc goi"); log("Ham check setting da duoc goi");
} else { } else {
String? response = await apiServices.getAllSettingsNotificationOfDevices(); String? response =
await apiServices.getAllSettingsNotificationOfDevices();
if (response != "") { if (response != "") {
final data = jsonDecode(response); final data = jsonDecode(response);
final result = data['data']; final result = data['data'];
@@ -314,11 +397,13 @@ class _HomeScreenState extends State<HomeScreen> {
List<DeviceNotificationSettings> list = List<DeviceNotificationSettings> list =
DeviceNotificationSettings.mapFromJson(result).values.toList(); DeviceNotificationSettings.mapFromJson(result).values.toList();
// log("List: $list"); // log("List: $list");
Set<String> thingIdsInList = list.map((device) => device.thingId!).toSet(); Set<String> thingIdsInList =
list.map((device) => device.thingId!).toSet();
for (var device in devices) { for (var device in devices) {
if (!thingIdsInList.contains(device.thingId)) { if (!thingIdsInList.contains(device.thingId)) {
log("Device with Thing ID ${device.thingId} is not in the notification settings list."); log("Device with Thing ID ${device.thingId} is not in the notification settings list.");
await apiServices.setupDeviceNotification(device.thingId!, device.name!); await apiServices.setupDeviceNotification(
device.thingId!, device.name!);
} else { } else {
log("All devices are in the notification settings list."); log("All devices are in the notification settings list.");
} }

113
lib/feature/inter_family/groups/groups_screen.dart
View File

@@ -44,69 +44,76 @@ class _GroupsScreenState extends State<GroupsScreen> {
@override @override
void dispose() { void dispose() {
getAllGroupsTimer?.cancel(); getAllGroupsTimer?.cancel();
super.dispose();
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
if (widget.role == ApplicationConstants.OWNER_GROUP || if (widget.role == ApplicationConstants.OWNER_GROUP ||
widget.role == ApplicationConstants.PARTICIPANT_GROUP) { widget.role == ApplicationConstants.PARTICIPANT_GROUP) {
interFamilyBloc.getAllGroup(widget.role);
return StreamBuilder<List<Group>>( return StreamBuilder<List<Group>>(
stream: interFamilyBloc.streamCurrentGroups, stream: interFamilyBloc.streamCurrentGroups,
builder: (context, groupsSnapshot) { builder: (context, groupsSnapshot) {
return Scaffold( if(groupsSnapshot.data == null){
body: groupsSnapshot.data?.isEmpty ?? true interFamilyBloc.getAllGroup(widget.role);
? const Center( return const Center(child: CircularProgressIndicator(),);
child: CircularProgressIndicator(), }else if(groupsSnapshot.data!.isEmpty){
) return Center(child: Text(appLocalization(context).dont_have_group),);
: ListView.builder( }else {
itemCount: groupsSnapshot.data!.length, return Scaffold(
itemBuilder: (context, index) { body: groupsSnapshot.data?.isEmpty ?? true
return ListTile( ? const Center(
onTap: () { child: CircularProgressIndicator(),
context.pushNamed(AppRoutes.GROUP_DETAIL.name, )
pathParameters: {"groupId": groupsSnapshot.data![index].id!}, : ListView.builder(
extra: widget.role); itemCount: groupsSnapshot.data!.length,
}, itemBuilder: (context, index) {
leading: IconConstants.instance.getMaterialIcon(Icons.diversity_2), return ListTile(
title: Text( onTap: () {
groupsSnapshot.data![index].name ?? '', context.pushNamed(AppRoutes.GROUP_DETAIL.name,
style: const TextStyle(fontWeight: FontWeight.bold), pathParameters: {"groupId": groupsSnapshot.data![index].id!},
), extra: widget.role);
subtitle: Text(groupsSnapshot.data![index].description ?? ""),
trailing: widget.role == ApplicationConstants.OWNER_GROUP
? PopupMenuButton(
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.only(
bottomLeft: Radius.circular(8.0),
bottomRight: Radius.circular(8.0),
topLeft: Radius.circular(8.0),
topRight: Radius.circular(8.0),
),
),
itemBuilder: (ctx) => [
_buildPopupMenuItem(groupsSnapshot.data![index], context,
appLocalization(context).share_group_title, Icons.share, 4),
_buildPopupMenuItem(
groupsSnapshot.data![index],
context,
appLocalization(context).change_group_infomation_title,
Icons.settings_backup_restore,
2),
_buildPopupMenuItem(
groupsSnapshot.data![index],
context,
appLocalization(context).delete_group_title,
Icons.delete_forever_rounded,
3),
],
icon: const Icon(Icons.more_horiz),
)
: const SizedBox.shrink(),
);
}, },
), leading: IconConstants.instance.getMaterialIcon(Icons.diversity_2),
); title: Text(
groupsSnapshot.data![index].name ?? '',
style: const TextStyle(fontWeight: FontWeight.bold),
),
subtitle: Text(groupsSnapshot.data![index].description ?? ""),
trailing: widget.role == ApplicationConstants.OWNER_GROUP
? PopupMenuButton(
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.only(
bottomLeft: Radius.circular(8.0),
bottomRight: Radius.circular(8.0),
topLeft: Radius.circular(8.0),
topRight: Radius.circular(8.0),
),
),
itemBuilder: (ctx) => [
_buildPopupMenuItem(groupsSnapshot.data![index], context,
appLocalization(context).share_group_title, Icons.share, 4),
_buildPopupMenuItem(
groupsSnapshot.data![index],
context,
appLocalization(context).change_group_infomation_title,
Icons.settings_backup_restore,
2),
_buildPopupMenuItem(
groupsSnapshot.data![index],
context,
appLocalization(context).delete_group_title,
Icons.delete_forever_rounded,
3),
],
icon: const Icon(Icons.more_horiz),
)
: const SizedBox.shrink(),
);
},
),
);
}
}, },
); );
} else { } else {

2
lib/feature/main/main_screen.dart
View File

@@ -385,7 +385,7 @@ class _MainScreenState extends State<MainScreen> with WidgetsBindingObserver {
items: _navBarsItems(), items: _navBarsItems(),
handleAndroidBackButtonPress: true, handleAndroidBackButtonPress: true,
resizeToAvoidBottomInset: true, resizeToAvoidBottomInset: true,
stateManagement: true, stateManagement: false,
backgroundColor: backgroundColor:
themeModeSnapshot.data! ? Colors.white : Colors.black, themeModeSnapshot.data! ? Colors.white : Colors.black,
decoration: NavBarDecoration( decoration: NavBarDecoration(

2
lib/main.dart
View File

@@ -1,4 +1,4 @@
import 'dart:developer'; import 'dart:developer';
import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_core/firebase_core.dart';
import 'package:firebase_messaging/firebase_messaging.dart'; import 'package:firebase_messaging/firebase_messaging.dart';

2
lib/product/services/api_services.dart
View File

@@ -69,7 +69,7 @@ class APIServices {
actions: [ actions: [
TextButton( TextButton(
onPressed: () async { onPressed: () async {
var url = Uri.http(ApplicationConstants.DOMAIN, var url = Uri.https(ApplicationConstants.DOMAIN,
APIPathConstants.LOGOUT_PATH); APIPathConstants.LOGOUT_PATH);
final headers = await NetworkManager.instance!.getHeaders(); final headers = await NetworkManager.instance!.getHeaders();
final response = await http.post(url, headers: headers); final response = await http.post(url, headers: headers);