| 
					
				 | 
			
			
				@@ -41,7 +41,7 @@ class AppRouter extends RootStackRouter { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       Parameters param = resolver.route.queryParams; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       router.removeLast(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       if (!kIsWeb && U.getAccessCode() != null && param.isEmpty) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        router.pushNamed('/app/${Uri.encodeComponent(U.getAccessCode()!)}'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        router.pushPath('/app/${Uri.encodeComponent(U.getAccessCode()!)}'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } else{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         FlutterNativeSplash.remove(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         resolver.next(); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -65,7 +65,7 @@ class AppRouter extends RootStackRouter { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       if (pid == null || stb) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        router.pushNamed("/qr?new=true"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        router.pushPath("/qr?new=true"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       if(vRedirector.fragment != '' && U.getAccessCode() != null){ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -89,10 +89,10 @@ class AppRouter extends RootStackRouter { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           await _sharedPreferencesManager.clearKey(SharedPreferencesManager.keyAccessCode); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           await _sharedPreferencesManager.clearKey(SharedPreferencesManager.keySerialCode); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           await _sharedPreferencesManager.clearKey(SharedPreferencesManager.version); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          router.pushNamed("/qr?new=true"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          router.pushPath("/qr?new=true"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } else if(_isNewAccessCode(rawPid, U.getAccessCode()!)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        router.pushNamed("/change-code/$rawPid"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        router.pushPath("/change-code/$rawPid"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (_sharedPreferencesManager.getInt(SharedPreferencesManager.version) == null){ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -105,7 +105,7 @@ class AppRouter extends RootStackRouter { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             await _sharedPreferencesManager.clearKey(SharedPreferencesManager.keyAccessCode); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             await _sharedPreferencesManager.clearKey(SharedPreferencesManager.keySerialCode); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             await _sharedPreferencesManager.clearKey(SharedPreferencesManager.version); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            router.pushNamed("/qr?new=true"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            router.pushPath("/qr?new=true"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -119,9 +119,9 @@ class AppRouter extends RootStackRouter { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     AutoRouteGuard.simple((resolver, router) async{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       router.removeLast(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       if (!_isValidVersion()) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        router.pushNamed('/app/${Uri.encodeComponent(U.getAccessCode()!)}/license'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        router.pushPath('/app/${Uri.encodeComponent(U.getAccessCode()!)}/license'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } else if (_isLoggedIn()) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        router.pushNamed('/app/${Uri.encodeComponent(U.getAccessCode()!)}/menu'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        !kIsWeb? router.pushAndPopUntil(AppResponsive(), predicate: (_) => false) : router.pushPath('/app/${Uri.encodeComponent(U.getAccessCode()!)}/menu'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } else{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         resolver.next(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -132,9 +132,9 @@ class AppRouter extends RootStackRouter { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     AutoRouteGuard.simple((resolver, router) async{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       router.removeLast(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       if (!_isValidVersion()) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        router.pushNamed('/app/${Uri.encodeComponent(U.getAccessCode()!)}/license'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        router.pushPath('/app/${Uri.encodeComponent(U.getAccessCode()!)}/license'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } else if (!_isLoggedIn()) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        router.pushNamed('/app/${Uri.encodeComponent(U.getAccessCode()!)}/login'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        router.pushPath('/app/${Uri.encodeComponent(U.getAccessCode()!)}/login'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } else{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         resolver.next(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } 
			 |