login issue fixed

merge-update-with-lab-changes
Sultan Khan 5 years ago
parent d939b2ec9b
commit b9b5797cbc

@ -52,7 +52,8 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
ProjectViewModel projectProvider; ProjectViewModel projectProvider;
///inject the user data ///inject the user data
AuthenticatedUserObject authenticatedUserObject = locator<AuthenticatedUserObject>(); AuthenticatedUserObject authenticatedUserObject =
locator<AuthenticatedUserObject>();
final FirebaseMessaging _firebaseMessaging = FirebaseMessaging(); final FirebaseMessaging _firebaseMessaging = FirebaseMessaging();
final authService = new AuthProvider(); final authService = new AuthProvider();
@ -134,21 +135,21 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
}); });
_requestIOSPermissions(); _requestIOSPermissions();
pageController = PageController(keepPage: true); pageController = PageController(keepPage: true);
// _firebaseMessaging.setAutoInitEnabled(true); _firebaseMessaging.setAutoInitEnabled(true);
//
// if (Platform.isIOS) { if (Platform.isIOS) {
// _firebaseMessaging.requestNotificationPermissions(); _firebaseMessaging.requestNotificationPermissions();
// } }
//
// _firebaseMessaging.getToken().then((String token) { _firebaseMessaging.getToken().then((String token) {
// sharedPref.setString(PUSH_TOKEN, token); sharedPref.setString(PUSH_TOKEN, token);
// if (token != null) { if (token != null) {
// checkUserStatus(token); checkUserStatus(token);
// } }
// requestPermissions(); requestPermissions();
// }).catchError((err) { }).catchError((err) {
// print(err); print(err);
// }); });
//_firebase Background message handler //_firebase Background message handler
// _firebaseMessaging.configure( // _firebaseMessaging.configure(
@ -345,7 +346,11 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
headline6: headline6:
TextStyle(color: Colors.white, fontWeight: FontWeight.bold), TextStyle(color: Colors.white, fontWeight: FontWeight.bold),
), ),
title: Texts(getText(currentTab).toUpperCase(),bold: true,color: Colors.white,), title: Texts(
getText(currentTab).toUpperCase(),
bold: true,
color: Colors.white,
),
leading: Builder( leading: Builder(
builder: (BuildContext context) { builder: (BuildContext context) {
return IconButton( return IconButton(
@ -373,7 +378,11 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
physics: NeverScrollableScrollPhysics(), physics: NeverScrollableScrollPhysics(),
controller: pageController, controller: pageController,
children: [ children: [
HomePage(goToMyProfile: () {_changeCurrentTab(1);},), HomePage(
goToMyProfile: () {
_changeCurrentTab(1);
},
),
MedicalProfilePage(), MedicalProfilePage(),
BookingOptions(), BookingOptions(),
Container(), Container(),

@ -523,7 +523,7 @@ class _ConfirmLogin extends State<ConfirmLogin> {
checkIfUserAgreedBefore(CheckActivationCode result) { checkIfUserAgreedBefore(CheckActivationCode result) {
print(result); print(result);
if (result.isNeedUserAgreement) { if (result.isNeedUserAgreement ==true) {
//move to agreement page. //move to agreement page.
} else { } else {
insertIMEI(); insertIMEI();

@ -111,7 +111,7 @@ class AuthProvider with ChangeNotifier {
var imei = await sharedPref.getString(PUSH_TOKEN); var imei = await sharedPref.getString(PUSH_TOKEN);
// if (!request.) { // if (!request.) {
newRequest.iMEI = imei; newRequest.iMEI =imei; //imei!=null ? imei : '';
newRequest.firstName = request.firstName + " " + request.lastName; newRequest.firstName = request.firstName + " " + request.lastName;
newRequest.firstNameN = request.firstNameN + " " + request.lastNameN; newRequest.firstNameN = request.firstNameN + " " + request.lastNameN;
newRequest.lastNameN = request.lastNameN ?? ""; newRequest.lastNameN = request.lastNameN ?? "";

Loading…
Cancel
Save