diff --git a/packages/chicken/lib/presentation/pages/role/view.dart b/packages/chicken/lib/presentation/pages/role/view.dart index fb660f9..61a4be5 100644 --- a/packages/chicken/lib/presentation/pages/role/view.dart +++ b/packages/chicken/lib/presentation/pages/role/view.dart @@ -34,7 +34,10 @@ class RolePage extends GetView { title: role.keys.first, onTap: () async { String route = role.values.first; - await controller.gService.saveSelectedRole(route); + await controller.gService.saveSelectedRole( + Module.chicken, + route, + ); Get.offAllNamed(route); }, ); @@ -106,7 +109,10 @@ class RolePage extends GetView { child: InkWell( onTap: onTap, child: Center( - child: Text(title, style: AppFonts.yekan12Bold.copyWith(color: AppColor.blueNormal)), + child: Text( + title, + style: AppFonts.yekan12Bold.copyWith(color: AppColor.blueNormal), + ), ), ), ); diff --git a/packages/core/lib/data/model/local/app_model/app_model.dart b/packages/core/lib/data/model/local/app_model/app_model.dart index 837cec3..3ea2cde 100644 --- a/packages/core/lib/data/model/local/app_model/app_model.dart +++ b/packages/core/lib/data/model/local/app_model/app_model.dart @@ -16,21 +16,12 @@ class AppModel extends HiveObject { @HiveField(3) List? targetPages; - AppModel({this.isFirstRun, this.isDarkMode, this.selectedModule, this.targetPages}); - - AppModel copyWith({ - bool? isFirstRun, - bool? isDarkMode, - Module? selectedModule, - List? targetPages, - }) { - return AppModel( - isFirstRun: isFirstRun ?? this.isFirstRun, - isDarkMode: isDarkMode ?? this.isDarkMode, - selectedModule: selectedModule ?? this.selectedModule, - targetPages: targetPages ?? this.targetPages, - ); - } + AppModel({ + this.isFirstRun, + this.isDarkMode, + this.selectedModule, + this.targetPages, + }); @override String toString() { @@ -51,11 +42,8 @@ class TargetPage extends HiveObject { TargetPage({required this.route, this.functions, this.module}); - TargetPage copyWith({String? route, List? functions, Module? module}) { - return TargetPage( - route: route ?? this.route, - functions: functions ?? this.functions, - module: module ?? this.module, - ); + @override + String toString() { + return 'TargetPage{route: $route, functions: $functions, module: $module}'; } } diff --git a/packages/core/lib/data/services/g_service.dart b/packages/core/lib/data/services/g_service.dart index 5659864..8516eeb 100644 --- a/packages/core/lib/data/services/g_service.dart +++ b/packages/core/lib/data/services/g_service.dart @@ -40,14 +40,13 @@ class GService extends GetxService { return res; } - Future saveSelectedRole(String route) async { + Future saveSelectedRole(Module module,String route) async { AppModel model = box.values.first; - model.targetPages?.first.route = route; - - await model.save(); - AppModel model2 = box.values.first; - - iLog("Saved route: $model2"); + TargetPage? targetPage = model.targetPages?.firstWhere((element) => element.module == module); + if(targetPage!=null){ + targetPage.route =route; + model.save(); + } } Future setIsNotFirstTime() async {