jantunesmessias
/
flutter-freaccess-hub
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fet: Adicinado Flag para habilitar o botão de voltar no hub

This commit is contained in:
Ivan Antunes 2024-08-26 08:44:06 -03:00
parent ee973ad749
commit 305a6cf9df
4 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
android/app/src/main/AndroidManifest.xml
View File

@ -14,7 +14,8 @@
android:label="FREHub" android:label="FREHub"
tools:replace="android:label" tools:replace="android:label"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:requestLegacyExternalStorage="true"> android:requestLegacyExternalStorage="true"
android:usesCleartextTraffic="true">
<activity <activity
android:name="io.flutter.embedding.android.FlutterFragmentActivity" android:name="io.flutter.embedding.android.FlutterFragmentActivity"

1
lib/backend/api_requests/api_calls.dart
View File

@ -16,7 +16,6 @@ const _kPrivateApiFunctionName = 'ffPrivateApiCall';
class PhpGroup { class PhpGroup {
static String getBaseUrl() => 'https://freaccess.com.br/freaccess'; static String getBaseUrl() => 'https://freaccess.com.br/freaccess';
// static String getBaseUrl() => 'http://192.168.2.204:8080';
static Map<String, String> headers = {}; static Map<String, String> headers = {};
static LoginCall loginCall = LoginCall(); static LoginCall loginCall = LoginCall();
static UpdToken updToken = UpdToken(); static UpdToken updToken = UpdToken();

17
lib/pages/fast_pass_page/fast_pass_page_widget.dart
View File

@ -54,12 +54,9 @@ class _FastPassPageWidgetState extends State<FastPassPageWidget> {
_controllerIOS = controller; _controllerIOS = controller;
}, },
onLoadStop: (controller, url) async { onLoadStop: (controller, url) async {
await controller.evaluateJavascript( await controller.evaluateJavascript(source: "window.localStorage.setItem('fre-token', '\"${widget.freToken}\"')");
source: await controller.evaluateJavascript(source: "window.localStorage.setItem('fre-user-data', '${widget.freUserData}')");
"window.localStorage.setItem('fre-token', '\"${widget.freToken}\"')"); await controller.evaluateJavascript(source: "window.localStorage.setItem('enableBackButton', 'true')");
await controller.evaluateJavascript(
source:
"window.localStorage.setItem('fre-user-data', '${widget.freUserData}')");
}, },
) )
: WebViewWidget( : WebViewWidget(
@ -72,13 +69,13 @@ class _FastPassPageWidgetState extends State<FastPassPageWidget> {
NavigationDelegate( NavigationDelegate(
onProgress: (int progress) {}, onProgress: (int progress) {},
onPageStarted: (String url) { onPageStarted: (String url) {
final String token = final String token = "localStorage.setItem('fre-token', '\"${widget.freToken}\"');";
"localStorage.setItem('fre-token', '\"${widget.freToken}\"');"; final String data = "localStorage.setItem('fre-user-data', '${widget.freUserData}');";
final String data = const String backNavigation = "localStorage.setItem('enableBackButton', 'true');";
"localStorage.setItem('fre-user-data', '${widget.freUserData}');";
_controllerAll.runJavaScript(token); _controllerAll.runJavaScript(token);
_controllerAll.runJavaScript(data); _controllerAll.runJavaScript(data);
_controllerAll.runJavaScript(backNavigation);
}, },
onNavigationRequest: (NavigationRequest request) { onNavigationRequest: (NavigationRequest request) {
if (request.url.startsWith('http') || if (request.url.startsWith('http') ||

30
lib/pages/reservation_page/reservation_page_widget.dart
View File

@ -1,3 +1,5 @@
import 'dart:developer';
import 'package:hub/app_state.dart'; import 'package:hub/app_state.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_inappwebview/flutter_inappwebview.dart'; import 'package:flutter_inappwebview/flutter_inappwebview.dart';
@ -54,14 +56,15 @@ class _ReservationPageWidgetState extends State<ReservationPageWidget> {
_controllerIOS = controller; _controllerIOS = controller;
}, },
onLoadStop: (controller, url) async { onLoadStop: (controller, url) async {
await controller.evaluateJavascript( await controller.evaluateJavascript(source: "window.localStorage.setItem('fre-token', '\"${widget.freToken}\"')");
source: await controller.evaluateJavascript(source: "window.localStorage.setItem('fre-user-data', '${widget.freUserData}')");
"window.localStorage.setItem('fre-token', '\"${widget.freToken}\"')"); await controller.evaluateJavascript(source: "window.localStorage.setItem('enableBackButton', 'true')");
await controller.evaluateJavascript( },
source: onUpdateVisitedHistory: (controller, uri, isVisited) {
"window.localStorage.setItem('fre-user-data', '${widget.freUserData}')"); if (uri.toString().contains('/hub/home')) {
Navigator.pop(context);
}
}, },
) )
: WebViewWidget( : WebViewWidget(
controller: _controllerAll = WebViewController() controller: _controllerAll = WebViewController()
@ -73,13 +76,13 @@ class _ReservationPageWidgetState extends State<ReservationPageWidget> {
NavigationDelegate( NavigationDelegate(
onProgress: (int progress) {}, onProgress: (int progress) {},
onPageStarted: (String url) { onPageStarted: (String url) {
final String token = final String token = "localStorage.setItem('fre-token', '\"${widget.freToken}\"');";
"localStorage.setItem('fre-token', '\"${widget.freToken}\"');"; final String data = "localStorage.setItem('fre-user-data', '${widget.freUserData}');";
final String data = const String backNavigation = "localStorage.setItem('enableBackButton', 'true');";
"localStorage.setItem('fre-user-data', '${widget.freUserData}');";
_controllerAll.runJavaScript(token); _controllerAll.runJavaScript(token);
_controllerAll.runJavaScript(data); _controllerAll.runJavaScript(data);
_controllerAll.runJavaScript(backNavigation);
}, },
onNavigationRequest: (NavigationRequest request) { onNavigationRequest: (NavigationRequest request) {
if (request.url.startsWith('http') || if (request.url.startsWith('http') ||
@ -91,6 +94,11 @@ class _ReservationPageWidgetState extends State<ReservationPageWidget> {
} }
return NavigationDecision.prevent; return NavigationDecision.prevent;
}, },
onUrlChange: (url) {
if (url.url.toString().contains('/hub/home')) {
Navigator.pop(context);
}
}
), ),
) )
..loadRequest(Uri.parse(url)), ..loadRequest(Uri.parse(url)),