diff --git a/android/local.properties b/android/local.properties index 462c4e6..d7bc8de 100644 --- a/android/local.properties +++ b/android/local.properties @@ -1,5 +1,5 @@ sdk.dir=C:/Users/Housh11/AppData/Local/Android/Sdk flutter.sdk=C:\\src\\flutter -flutter.buildMode=debug -flutter.versionName=1.3.11 -flutter.versionCode=8 \ No newline at end of file +flutter.buildMode=release +flutter.versionName=1.3.13 +flutter.versionCode=10 \ No newline at end of file diff --git a/packages/livestock/lib/injection/live_stock_di.dart b/packages/livestock/lib/injection/live_stock_di.dart index 17958ab..16230be 100644 --- a/packages/livestock/lib/injection/live_stock_di.dart +++ b/packages/livestock/lib/injection/live_stock_di.dart @@ -8,12 +8,13 @@ import 'package:rasadyar_livestock/data/repository/auth/auth_repository.dart'; import 'package:rasadyar_livestock/data/repository/auth/auth_repository_imp.dart'; import 'package:rasadyar_livestock/data/repository/livestock/livestock_repository.dart'; import 'package:rasadyar_livestock/data/repository/livestock/livestock_repository_imp.dart'; +import 'package:rasadyar_livestock/data/service/live_stock_storage_service.dart'; import 'package:rasadyar_livestock/hive_registrar.g.dart'; import 'package:rasadyar_livestock/presentation/routes/app_pages.dart'; import '../data/data_source/local/tmp/tmp_local_data-source.dart'; -GetIt diLiveStock= GetIt.asNewInstance(); +GetIt diLiveStock = GetIt.asNewInstance(); Future setupLiveStockDI() async { diLiveStock.registerSingleton(DioErrorHandler()); @@ -21,9 +22,10 @@ Future setupLiveStockDI() async { await IsolatedHive.initFlutter(); IsolatedHive.registerAdapters(); final tokenService = Get.find(); + Get.lazyPut(() => LiveStockStorageService()); if (tokenService.baseurl.value == null) { - await tokenService.saveBaseUrl(Module.inspection,'https://api.dam.rasadyar.net/'); + await tokenService.saveBaseUrl(Module.inspection, 'https://api.dam.rasadyar.net/'); } // First register AppInterceptor with lazy callbacks @@ -42,7 +44,7 @@ Future setupLiveStockDI() async { return null; }, saveTokenCallback: (String newToken) async { - // await tokenService.saveAccessToken(newToken); + // await tokenService.saveAccessToken(newToken); }, clearTokenCallback: () async { await tokenService.deleteModuleTokens(Module.liveStocks); @@ -97,34 +99,4 @@ Future setupLiveStockDI() async { Future removeLiveStockDI() async { eLog("removeLiveStockDI"); await diLiveStock.resetScope(); - - - - /* if (diLiveStock.isRegistered()) { - diLiveStock.unregister(); - } - if (diLiveStock.isRegistered()) { - diLiveStock.unregister(); - } - if (diLiveStock.isRegistered()) { - diLiveStock.unregister(); - } - if (diLiveStock.isRegistered()) { - diLiveStock.unregister(); - } - if (diLiveStock.isRegistered()) { - diLiveStock.unregister(); - } - if (diLiveStock.isRegistered()) { - diLiveStock.unregister(); - } - if (diLiveStock.isRegistered()) { - diLiveStock.unregister(); - } - if (diLiveStock.isRegistered()) { - diLiveStock.unregister(); - } - if (diLiveStock.isRegistered()) { - diLiveStock.unregister(); - }*/ } diff --git a/packages/livestock/lib/presentation/page/map/logic.dart b/packages/livestock/lib/presentation/page/map/logic.dart index 675ace3..cf293d5 100644 --- a/packages/livestock/lib/presentation/page/map/logic.dart +++ b/packages/livestock/lib/presentation/page/map/logic.dart @@ -2,6 +2,5 @@ import 'package:rasadyar_core/core.dart'; import 'package:rasadyar_livestock/presentation/widgets/base_page/logic.dart' hide BaseLogic; class MapLogic extends GetxController { - var ss = Get.find(); BaseLogic baseLogic = Get.find(); } diff --git a/packages/livestock/pubspec.yaml b/packages/livestock/pubspec.yaml index eda216a..696d390 100644 --- a/packages/livestock/pubspec.yaml +++ b/packages/livestock/pubspec.yaml @@ -1,6 +1,6 @@ name: rasadyar_livestock description: A starting point for Dart libraries or applications. -version: 2.0.0 +version: 2.0.1 publish_to: 'none' # repository: https://github.com/my_org/my_repo diff --git a/pubspec.lock b/pubspec.lock index c9a43bf..665dd0d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1383,7 +1383,7 @@ packages: path: "packages/livestock" relative: true source: path - version: "2.0.0" + version: "2.0.1" rive: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index da53400..0996ef5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: rasadyar_app description: "A new Flutter project." publish_to: 'none' -version: 1.3.11+8 +version: 1.3.13+10 environment: sdk: ^3.9.2