fix : liveStock ui

This commit is contained in:
2025-09-30 12:50:05 +03:30
parent c5ee862c43
commit b4cf253143
6 changed files with 11 additions and 40 deletions

View File

@@ -1,5 +1,5 @@
sdk.dir=C:/Users/Housh11/AppData/Local/Android/Sdk sdk.dir=C:/Users/Housh11/AppData/Local/Android/Sdk
flutter.sdk=C:\\src\\flutter flutter.sdk=C:\\src\\flutter
flutter.buildMode=debug flutter.buildMode=release
flutter.versionName=1.3.11 flutter.versionName=1.3.13
flutter.versionCode=8 flutter.versionCode=10

View File

@@ -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/auth/auth_repository_imp.dart';
import 'package:rasadyar_livestock/data/repository/livestock/livestock_repository.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/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/hive_registrar.g.dart';
import 'package:rasadyar_livestock/presentation/routes/app_pages.dart'; import 'package:rasadyar_livestock/presentation/routes/app_pages.dart';
import '../data/data_source/local/tmp/tmp_local_data-source.dart'; import '../data/data_source/local/tmp/tmp_local_data-source.dart';
GetIt diLiveStock= GetIt.asNewInstance(); GetIt diLiveStock = GetIt.asNewInstance();
Future<void> setupLiveStockDI() async { Future<void> setupLiveStockDI() async {
diLiveStock.registerSingleton(DioErrorHandler()); diLiveStock.registerSingleton(DioErrorHandler());
@@ -21,9 +22,10 @@ Future<void> setupLiveStockDI() async {
await IsolatedHive.initFlutter(); await IsolatedHive.initFlutter();
IsolatedHive.registerAdapters(); IsolatedHive.registerAdapters();
final tokenService = Get.find<TokenStorageService>(); final tokenService = Get.find<TokenStorageService>();
Get.lazyPut(() => LiveStockStorageService());
if (tokenService.baseurl.value == null) { 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 // First register AppInterceptor with lazy callbacks
@@ -42,7 +44,7 @@ Future<void> setupLiveStockDI() async {
return null; return null;
}, },
saveTokenCallback: (String newToken) async { saveTokenCallback: (String newToken) async {
// await tokenService.saveAccessToken(newToken); // await tokenService.saveAccessToken(newToken);
}, },
clearTokenCallback: () async { clearTokenCallback: () async {
await tokenService.deleteModuleTokens(Module.liveStocks); await tokenService.deleteModuleTokens(Module.liveStocks);
@@ -97,34 +99,4 @@ Future<void> setupLiveStockDI() async {
Future<void> removeLiveStockDI() async { Future<void> removeLiveStockDI() async {
eLog("removeLiveStockDI"); eLog("removeLiveStockDI");
await diLiveStock.resetScope(); await diLiveStock.resetScope();
/* if (diLiveStock.isRegistered<DioErrorHandler>()) {
diLiveStock.unregister<DioErrorHandler>();
}
if (diLiveStock.isRegistered<AppInterceptor>()) {
diLiveStock.unregister<AppInterceptor>();
}
if (diLiveStock.isRegistered<DioRemote>()) {
diLiveStock.unregister<DioRemote>();
}
if (diLiveStock.isRegistered<AuthRemoteDataSource>()) {
diLiveStock.unregister<AuthRemoteDataSource>();
}
if (diLiveStock.isRegistered<AuthRepository>()) {
diLiveStock.unregister<AuthRepository>();
}
if (diLiveStock.isRegistered<LivestockRemoteDataSource>()) {
diLiveStock.unregister<LivestockRemoteDataSource>();
}
if (diLiveStock.isRegistered<TmpLocalDataSource>()) {
diLiveStock.unregister<TmpLocalDataSource>();
}
if (diLiveStock.isRegistered<LivestockRepository>()) {
diLiveStock.unregister<LivestockRepository>();
}
if (diLiveStock.isRegistered<ImagePicker>()) {
diLiveStock.unregister<ImagePicker>();
}*/
} }

View File

@@ -2,6 +2,5 @@ import 'package:rasadyar_core/core.dart';
import 'package:rasadyar_livestock/presentation/widgets/base_page/logic.dart' hide BaseLogic; import 'package:rasadyar_livestock/presentation/widgets/base_page/logic.dart' hide BaseLogic;
class MapLogic extends GetxController { class MapLogic extends GetxController {
var ss = Get.find<DraggableBottomSheetController>();
BaseLogic baseLogic = Get.find<BaseLogic>(); BaseLogic baseLogic = Get.find<BaseLogic>();
} }

View File

@@ -1,6 +1,6 @@
name: rasadyar_livestock name: rasadyar_livestock
description: A starting point for Dart libraries or applications. description: A starting point for Dart libraries or applications.
version: 2.0.0 version: 2.0.1
publish_to: 'none' publish_to: 'none'
# repository: https://github.com/my_org/my_repo # repository: https://github.com/my_org/my_repo

View File

@@ -1383,7 +1383,7 @@ packages:
path: "packages/livestock" path: "packages/livestock"
relative: true relative: true
source: path source: path
version: "2.0.0" version: "2.0.1"
rive: rive:
dependency: transitive dependency: transitive
description: description:

View File

@@ -1,7 +1,7 @@
name: rasadyar_app name: rasadyar_app
description: "A new Flutter project." description: "A new Flutter project."
publish_to: 'none' publish_to: 'none'
version: 1.3.11+8 version: 1.3.13+10
environment: environment:
sdk: ^3.9.2 sdk: ^3.9.2