Browse Source

Fix get wrong full name in action screen

phase2_dev
Đại Võ 1 year ago
parent
commit
bd01a21ae7
6 changed files with 21 additions and 7 deletions
  1. +2
    -0
      lib/data/api/dio_provider.dart
  2. +5
    -1
      lib/presentation/screens/account/sc_account.dart
  3. +4
    -1
      lib/presentation/screens/actions/environment_update/sc_edit_action_environment_update.dart
  4. +3
    -1
      lib/presentation/screens/actions/sc_action.dart
  5. +3
    -3
      lib/presentation/screens/login/login_page.dart
  6. +4
    -1
      lib/presentation/screens/tabbar/tabbar.dart

+ 2
- 0
lib/data/api/dio_provider.dart View File

@@ -155,10 +155,12 @@ class UnauthorizedInterceptor extends InterceptorsWrapper {
pref.saveString(DATA_CONST.TOKEN_KEY, "");
pref.saveString(DATA_CONST.PUSH_KEY, "");
pref.saveString(DATA_CONST.CURRENT_FULL_NAME, "");
LocalStorage.save(LocalStorageKey.full_name, '');
});
}
} catch (e) {
pref.saveString(DATA_CONST.CURRENT_FULL_NAME, "");
LocalStorage.save(LocalStorageKey.full_name, '');
pref.saveString(DATA_CONST.TOKEN_KEY, "");
pref.saveString(DATA_CONST.PUSH_KEY, "");
}

+ 5
- 1
lib/presentation/screens/account/sc_account.dart View File

@@ -10,6 +10,8 @@ import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:flutter_bloc/flutter_bloc.dart';

import '../../../utils/local_storage.dart';

class AccountScreen extends StatefulWidget {
@override
_AccountScreenState createState() => _AccountScreenState();
@@ -44,11 +46,13 @@ class _AccountScreenState extends State<AccountScreen> {
_userRepository.deleteFcmToken(pushKey).then((value) {}).catchError((err) {}).whenComplete(() {
pref.saveString(DATA_CONST.TOKEN_KEY, "");
pref.saveString(DATA_CONST.PUSH_KEY, "");
pref.saveString(DATA_CONST.CURRENT_FULL_NAME, "");
});
}
pref.saveString(DATA_CONST.CURRENT_FULL_NAME, "");
LocalStorage.save(LocalStorageKey.full_name, '');
} catch (e) {
pref.saveString(DATA_CONST.CURRENT_FULL_NAME, "");
LocalStorage.save(LocalStorageKey.full_name, '');
pref.saveString(DATA_CONST.TOKEN_KEY, "");
pref.saveString(DATA_CONST.PUSH_KEY, "");
}

+ 4
- 1
lib/presentation/screens/actions/environment_update/sc_edit_action_environment_update.dart View File

@@ -25,6 +25,8 @@ import 'package:get/get.dart';
import 'package:keyboard_dismisser/keyboard_dismisser.dart';
import 'package:farm_tpf/utils/formatter.dart';

import '../../../../utils/local_storage.dart';

class EditActionEnvironmentUpdate extends StatefulWidget {
final int cropId;
final bool isEdit;
@@ -54,7 +56,8 @@ class _EditActionEnvironmentUpdateState extends State<EditActionEnvironmentUpdat
var changeFileController = Get.put(ChangeFileController());

Future<Null> getSharedPrefs() async {
var currentFullName = await pref.getString(DATA_CONST.CURRENT_FULL_NAME);
// var currentFullName = await pref.getString(DATA_CONST.CURRENT_FULL_NAME);
var currentFullName = LocalStorage.getString(LocalStorageKey.full_name);
_executeByController.text = currentFullName ?? "";
}


+ 3
- 1
lib/presentation/screens/actions/sc_action.dart View File

@@ -31,6 +31,7 @@ import 'package:get/get.dart';
import 'package:keyboard_dismisser/keyboard_dismisser.dart';
import 'package:farm_tpf/utils/formatter.dart';

import '../../../utils/local_storage.dart';
import 'controller/ChangeFieldInForm.dart';
import 'controller/ChangeSupplyUsing.dart';
import 'controller/ChangeWorker.dart';
@@ -83,7 +84,8 @@ class _ActionScreenState extends State<ActionScreen> {
var isValidated = false;

Future<Null> getSharedPrefs() async {
var currentFullName = await pref.getString(DATA_CONST.CURRENT_FULL_NAME);
// var currentFullName = await pref.getString(DATA_CONST.CURRENT_FULL_NAME);
var currentFullName = LocalStorage.getString(LocalStorageKey.full_name);
_executeByController.text = currentFullName ?? "";
}


+ 3
- 3
lib/presentation/screens/login/login_page.dart View File

@@ -35,8 +35,8 @@ class _LoginPageState extends State<LoginPage> {
void initState() {
super.initState();
if (kDebugMode) {
loginBloc.usernameCtl.text = 'quanly2';
loginBloc.passwordCtl.text = '123456';
loginBloc.usernameCtl.text = 'gd_doannong';
loginBloc.passwordCtl.text = 'abcd1234';
}
}

@@ -126,7 +126,7 @@ class _LoginPageState extends State<LoginPage> {
// ),
// ),
Positioned(
top: 140.h,
top: 100.h,
right: 40.w,
left: 40.w,
child: Image.asset(

+ 4
- 1
lib/presentation/screens/tabbar/tabbar.dart View File

@@ -15,6 +15,7 @@ import 'package:farm_tpf/utils/NotificationsBloc.dart';
import 'package:farm_tpf/utils/const_color.dart';
import 'package:farm_tpf/utils/const_common.dart';
import 'package:farm_tpf/utils/const_icons.dart';
import 'package:farm_tpf/utils/local_storage.dart';
import 'package:farm_tpf/utils/pref.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
@@ -52,7 +53,8 @@ class _TabbarScreenState extends State<TabbarScreen> {

Future<Null> getSharedPrefs() async {
token = await pref.getString(DATA_CONST.TOKEN_KEY);
currentFullName = await pref.getString(DATA_CONST.CURRENT_FULL_NAME);
// currentFullName = await pref.getString(DATA_CONST.CURRENT_FULL_NAME);
currentFullName = LocalStorage.getString(LocalStorageKey.full_name);
var options = BaseOptions(baseUrl: ConstCommon.baseUrl);
options.headers["Authorization"] = "Bearer $token";
client = Dio(options);
@@ -125,6 +127,7 @@ class _TabbarScreenState extends State<TabbarScreen> {
try {
var currentUser = await _userRepository.getUser();
pref.saveString(DATA_CONST.CURRENT_FULL_NAME, currentUser.fullName ?? '');
LocalStorage.save(LocalStorageKey.full_name, currentUser.fullName ?? '');
print("fullname: ${currentUser.fullName}");
} catch (e) {
print("error: ${e.toString()}");

Loading…
Cancel
Save