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

Merge branch 'develop' into feature/fd-466

This commit is contained in:
J. A. Messias 2024-11-12 10:39:46 -03:00
parent b88cd3e8bd b2fcc1cfca
commit 932234b983
11 changed files with 537 additions and 319 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
android/app/src/debug/AndroidManifest.xml
View File

@ -1,7 +1,124 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.freaccess.hub">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
package="com.freaccess.hub"
xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.USE_BIOMETRIC" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE" />
<application
android:label="FRE ACCESS HUB"
tools:replace="android:label"
android:icon="@mipmap/ic_launcher"
android:requestLegacyExternalStorage="true"
android:usesCleartextTraffic="true">
<activity
android:name=".MainActivity"
android:exported="true"
android:launchMode="singleTop"
android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:hardwareAccelerated="true"
android:windowSoftInputMode="adjustResize"
android:showWhenLocked="true"
android:turnScreenOn="true">
<meta-data
android:name="io.flutter.embedding.android.NormalTheme"
android:resource="@style/NormalTheme"
/>
<meta-data
android:name="io.flutter.embedding.android.SplashScreenDrawable"
android:resource="@drawable/launch_background"
/>
<meta-data android:name="flutter_deeplinking_enabled" android:value="false" />
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter android:autoVerify="true">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="https" android:host="freaccess.com.br" android:pathPrefix="/freaccess/alterarSenha.php" />
</intent-filter>
<intent-filter android:autoVerify="true">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="freaccess" />
</intent-filter>
<intent-filter android:autoVerify="true">
<action android:name="mensagem" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="frehub" android:host="frehub.com" />
</intent-filter>
<intent-filter>
<action android:name="visit_request" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter>
<action android:name="access" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter>
<action android:name="mensagem" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter>
<action android:name="enroll_cond" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<meta-data
android:name="com.google.firebase.messaging.default_notification_icon"
android:resource="@drawable/notification_icon" />
<!-- Don't delete the meta-data below.
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
<meta-data
android:name="flutterEmbedding"
android:value="2" />
<!-- <receiver android:exported="false"
android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationReceiver" />
<receiver android:exported="false"
android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationBootReceiver">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
<action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
<action android:name="android.intent.action.QUICKBOOT_POWERON" />
<action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
</intent-filter>
</receiver> -->
</application>
<queries>
<intent>
<action android:name="android.intent.action.PROCESS_TEXT"/>
<data android:mimeType="text/plain"/>
</intent>
</queries>
</manifest>

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

@ -1,6 +1,9 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.freaccess.hub"
xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@ -20,7 +23,7 @@
android:usesCleartextTraffic="true">
<activity
android:name="io.flutter.embedding.android.FlutterFragmentActivity"
android:name=".MainActivity"
android:exported="true"
android:launchMode="singleTop"
android:theme="@style/LaunchTheme"
@ -30,73 +33,75 @@
android:showWhenLocked="true"
android:turnScreenOn="true">
<meta-data
android:name="io.flutter.embedding.android.NormalTheme"
android:resource="@style/NormalTheme"
/>
<meta-data
android:name="io.flutter.embedding.android.SplashScreenDrawable"
android:resource="@drawable/launch_background"
/>
<meta-data android:name="flutter_deeplinking_enabled" android:value="false" />
<meta-data android:name="flutter_deeplinking_enabled" android:value="false" />
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter android:autoVerify="true">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="https" android:host="freaccess.com.br" android:pathPrefix="/freaccess/alterarSenha.php" />
</intent-filter>
<intent-filter android:autoVerify="true">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="freaccess" />
</intent-filter>
<intent-filter android:autoVerify="true">
<action android:name="mensagem" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="frehub" android:host="frehub.com" />
</intent-filter>
<intent-filter>
<action android:name="visit_request" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter>
<action android:name="access" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter>
<action android:name="mensagem" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter>
<action android:name="enroll_cond" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<meta-data
android:name="com.google.firebase.messaging.default_notification_icon"
android:resource="@drawable/notification_icon" />
<!-- Don't delete the meta-data below.
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
<meta-data
android:name="flutterEmbedding"
android:value="2" />
<!-- <receiver android:exported="false"
android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationReceiver" />
<receiver android:exported="false"
@ -108,7 +113,6 @@
<action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
</intent-filter>
</receiver> -->
</application>
<queries>
<intent>
@ -116,4 +120,5 @@
<data android:mimeType="text/plain"/>
</intent>
</queries>
</manifest>

26
android/app/src/main/kotlin/com/freaccess/hub/MainActivity.kt
View File

@ -1,5 +1,29 @@
package com.freaccess.hub
import android.os.Bundle
import android.provider.Settings
import io.flutter.embedding.android.FlutterFragmentActivity
import io.flutter.embedding.engine.FlutterEngine
import io.flutter.plugin.common.MethodChannel
class MainActivity: FlutterFragmentActivity() {}
class MainActivity: FlutterFragmentActivity() {
private val CHANNEL = "com.freaccess.hub/getAndroidId"
override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
super.configureFlutterEngine(flutterEngine)
MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL).setMethodCallHandler { call, result ->
if (call.method == "getAndroidId") {
val androidId = getAndroidId()
if (androidId != null) {
result.success(androidId)
} else {
result.error("UNAVAILABLE", "Android ID not available.", null)
}
} else {
result.notImplemented()
}
}
}
private fun getAndroidId(): String? {
return Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID)
}
}

19
lib/components/organism_components/bottom_arrow_linked_locals_component/bottom_arrow_linked_locals_component_widget.dart
View File

@ -14,7 +14,8 @@ import '/backend/api_requests/api_calls.dart';
import '/flutter_flow/flutter_flow_theme.dart';
class BottomArrowLinkedLocalsComponentWidget extends StatefulWidget {
const BottomArrowLinkedLocalsComponentWidget({super.key});
const BottomArrowLinkedLocalsComponentWidget({super.key, required this.response});
final ApiCallResponse? response;
@override
State<BottomArrowLinkedLocalsComponentWidget> createState() => _BottomArrowLinkedLocalsComponentWidgetState();
@ -71,16 +72,15 @@ class _BottomArrowLinkedLocalsComponentWidgetState extends State<BottomArrowLink
Future<ApiCallResponse?> _fetchLocals() async {
try {
setState(() => _loading = true);
var response = await PhpGroup.getLocalsCall.call();
final bool isError = response.jsonBody['error'];
final bool isError = widget.response?.jsonBody['error'];
if (isError) {
final String errorMsg = response.jsonBody['error_msg'];
final String errorMsg = widget.response?.jsonBody['error_msg'];
_handleError(context, errorMsg);
return response;
return widget.response;
}
final List<dynamic> locals = response.jsonBody['locais'] ?? [];
final List<dynamic> locals = widget.response?.jsonBody['locais'] ?? [];
final bool isEmpty = locals.isEmpty;
final bool isUnique = locals.length == 1;
@ -99,7 +99,7 @@ class _BottomArrowLinkedLocalsComponentWidgetState extends State<BottomArrowLink
if (isDisabled) {
context.go('/receptionPage');
return response;
return widget.response;
}
if (isEnabled) {
final local = locals[0];
@ -109,10 +109,10 @@ class _BottomArrowLinkedLocalsComponentWidgetState extends State<BottomArrowLink
await StorageHelper().set(SQLiteStorageKey.ownerUUID.value, local['CLU_OWNER_ID'], Storage.SQLiteStorage);
context.pop();
return response;
return widget.response;
}
return response;
return widget.response;
}
_showNoMoreDataSnackBar(context);
setState(() {
@ -131,7 +131,6 @@ class _BottomArrowLinkedLocalsComponentWidgetState extends State<BottomArrowLink
}
static void _handleError(BuildContext context, String errorMsg) {
AuthenticationService.signOut(context);
DialogUtil.error(context, errorMsg);
}

1
lib/components/organism_components/local_profile_component/local_profile_component_model.dart
View File

@ -20,7 +20,6 @@ class LocalProfileComponentModel extends FlutterFlowModel<LocalProfileComponentW
Future<void> getData() async {
cliName = (await StorageHelper().get(SQLiteStorageKey.clientName.value, Storage.SQLiteStorage)) ?? '';
cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
;
setStateCallback?.call();
}

18
lib/components/organism_components/local_profile_component/local_profile_component_widget.dart
View File

@ -3,6 +3,8 @@ import 'dart:developer';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:hub/shared/helpers/base_storage.dart';
import 'package:hub/shared/helpers/storage_helper.dart';
import '/flutter_flow/custom_functions.dart' as functions;
import '/flutter_flow/flutter_flow_theme.dart';
@ -34,10 +36,15 @@ class _LocalProfileComponentWidgetState extends State<LocalProfileComponentWidge
_model = createModel(context, () => LocalProfileComponentModel());
_model.setOnUpdate(onUpdate: () => setState(() {}));
_model.setStateCallback = () => safeSetState(() {});
//
// WidgetsBinding.instance
// .addPostFrameCallback((_) async => await LocalizationService.processLocals(context).then((value) => value == true ? onUpdate() : null));
// LocalizationService.processLocals(context).then((value) => value == true ? onUpdate() : null);
WidgetsBinding.instance.addPostFrameCallback((_) async {
bool initialized = false;
bool isDevLinked = _model.cliUUID.isNotEmpty;
if (!isDevLinked && !initialized) {
initialized = true;
await LocalizationService.processLocals(context).then((value) => value == true ? onUpdate() : null);
}
});
}
@override
@ -90,7 +97,8 @@ class _LocalProfileComponentWidgetState extends State<LocalProfileComponentWidge
hoverColor: Colors.transparent,
highlightColor: Colors.transparent,
onTap: () async {
await LocalizationService.selectLocal(context)
await StorageHelper().set(SQLiteStorageKey.clientUUID.value, '', Storage.SQLiteStorage);
await LocalizationService.processLocals(context)
.then((value) => value == true ? onUpdate() : null);
},
child: ClipRRect(

119
lib/pages/pets_page/pets_page_model.dart
View File

@ -20,15 +20,10 @@ import 'package:hub/shared/utils/limited_text_size.dart';
import 'package:hub/shared/utils/validator_util.dart';
class PetsPageModel extends FlutterFlowModel<PetsPageWidget> {
static PetsPageModel? _instance = PetsPageModel._internal();
PetsPageModel._internal();
factory PetsPageModel() => _instance ?? PetsPageModel._internal();
static void resetInstance() => _instance = null;
late final String devUUID;
late final String userUUID;
late final String cliUUID;
late String petAmountRegister = '0';
late final String petAmountRegister;
dynamic item;
late final TabController tabBarController;
@ -50,6 +45,8 @@ class PetsPageModel extends FlutterFlowModel<PetsPageWidget> {
FFUploadedFile? uploadedTempFile;
String? imgBase64;
late String defaultDropDownText = '';
String? dropDownValue1;
FormFieldController<String>? dropDownValueController1;
@ -108,18 +105,23 @@ class PetsPageModel extends FlutterFlowModel<PetsPageWidget> {
String? Function(BuildContext, String?)? textControllerObservationValidator;
Future<void> initAsync() async {
defaultDropDownText = FFLocalizations.of(buildContext!).getVariableText(
enText: 'Select an option',
ptText: 'Selecione uma opção',
);
dropDownValueController1 = FormFieldController<String>(dropDownValue1 ??= defaultDropDownText);
dropDownValueController2 = FormFieldController<String>(dropDownValue2 ??= defaultDropDownText);
devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
petAmountRegister = await StorageHelper().get(SQLiteStorageKey.petAmount.value, Storage.SQLiteStorage) ?? '0';
petAmountRegister = (await StorageHelper().get(SQLiteStorageKey.petAmount.value, Storage.SQLiteStorage)) ?? '';
safeSetState?.call();
}
@override
void initState(BuildContext context) {
initAsync();
resetInstance();
tabBarController = TabController(
vsync: Navigator.of(context),
length: 2,
@ -143,35 +145,7 @@ class PetsPageModel extends FlutterFlowModel<PetsPageWidget> {
textFieldFocusObservation = FocusNode();
textControllerObservation = TextEditingController();
dropDownValueController1 = FormFieldController<String>(dropDownValue1 ??= 'Selecione uma opção');
dropDownValueController2 = FormFieldController<String>(dropDownValue2 ??= 'Selecione uma opção');
}
@override
void dispose() {
tabBarController.dispose();
textFieldFocusName?.dispose();
textControllerName?.dispose();
textFieldFocusSpecies?.dispose();
textControllerSpecies?.dispose();
textFieldFocusRace?.dispose();
textControllerRace?.dispose();
textFieldFocusColor?.dispose();
textControllerColor?.dispose();
textFieldFocusData?.dispose();
textControllerData?.dispose();
textFieldFocusObservation?.dispose();
textControllerObservation?.dispose();
dropDownValueController1?.dispose();
dropDownValueController2?.dispose();
initAsync();
}
void setEditForm() {
@ -221,26 +195,65 @@ class PetsPageModel extends FlutterFlowModel<PetsPageWidget> {
dropDownValueController2 = FormFieldController<String>(dropDownValue2);
}
@override
void dispose() {
tabBarController.dispose();
textFieldFocusName?.dispose();
textControllerName?.dispose();
textFieldFocusSpecies?.dispose();
textControllerSpecies?.dispose();
textFieldFocusRace?.dispose();
textControllerRace?.dispose();
textFieldFocusColor?.dispose();
textControllerColor?.dispose();
textFieldFocusData?.dispose();
textControllerData?.dispose();
textFieldFocusObservation?.dispose();
textControllerObservation?.dispose();
dropDownValueController1?.dispose();
dropDownValueController2?.dispose();
}
bool isFormValid(BuildContext context) {
if (uploadedLocalFile == null || uploadedLocalFile!.bytes!.isEmpty) {
return false;
}
if (textControllerName!.text.isEmpty || textControllerName!.text.length > 80 || textControllerName!.text == '') {
if (textControllerName.text.isEmpty || textControllerName.text.length > 80 || textControllerName.text == '') {
return false;
}
if (textControllerSpecies!.text.isEmpty || textControllerSpecies!.text == '') {
if (textControllerSpecies.text.isEmpty || textControllerSpecies.text == '') {
return false;
}
if (textControllerRace!.text.isEmpty || textControllerRace!.text == '') {
if (textControllerRace.text.isEmpty || textControllerRace.text == '') {
return false;
}
if (dropDownValue1 == null || dropDownValue1!.isEmpty || dropDownValue1 == '') {
if (dropDownValueController1!.value == defaultDropDownText ||
dropDownValueController1!.value == '' ||
dropDownValueController1!.value == null) {
return false;
}
if (dropDownValue2 == null || dropDownValue2!.isEmpty || dropDownValue2 == '') {
if (dropDownValueController2!.value == defaultDropDownText ||
dropDownValueController2!.value == '' ||
dropDownValueController2!.value == null) {
return false;
}
if (dropDownValue1 == 'Selecione uma opção' || dropDownValue1 == null || dropDownValue1 == '') {
return false;
}
if (dropDownValue2 == 'Selecione uma opção' || dropDownValue2 == null || dropDownValue2 == '') {
return false;
}
return true;
}
@ -263,7 +276,7 @@ class PetsPageModel extends FlutterFlowModel<PetsPageWidget> {
);
if (response.jsonBody['error'] == false) {
DialogUtil.success(
await DialogUtil.success(
buildContext!,
FFLocalizations.of(buildContext!).getVariableText(
enText: 'Pet successfully updated',
@ -284,7 +297,7 @@ class PetsPageModel extends FlutterFlowModel<PetsPageWidget> {
ptText: 'Falha ao atualizar o pet',
);
}
DialogUtil.error(buildContext!, errorMessage);
await DialogUtil.error(buildContext!, errorMessage);
}
}
@ -304,7 +317,7 @@ class PetsPageModel extends FlutterFlowModel<PetsPageWidget> {
);
if (response.jsonBody['error'] == false) {
DialogUtil.success(
await DialogUtil.success(
buildContext!,
FFLocalizations.of(buildContext!).getVariableText(
enText: 'Pet successfully registered',
@ -316,15 +329,16 @@ class PetsPageModel extends FlutterFlowModel<PetsPageWidget> {
String errorMessage;
try {
errorMessage = jsonDecode(response.jsonBody['error_msg'])[0]['message'].toString();
await DialogUtil.error(buildContext!, errorMessage);
} catch (e) {
if (response.jsonBody['error_msg'] == "Limite de Cadastro de Pet Atingido.") {
errorMessage = FFLocalizations.of(buildContext!).getVariableText(
enText: 'Pet registration limit reached',
ptText: 'Limite de cadastro de pets atingido',
);
DialogUtil.error(buildContext!, errorMessage);
await DialogUtil.error(buildContext!, errorMessage);
} else {
DialogUtil.errorDefault(buildContext!);
await DialogUtil.errorDefault(buildContext!);
}
}
}
@ -364,10 +378,8 @@ class PetsPageModel extends FlutterFlowModel<PetsPageWidget> {
// dropDownValue1 = '';
// dropDownValue2 = '';
// dropDownValueController1 =
// FormFieldController<String>('Selecione uma opção');
// dropDownValueController2 =
// FormFieldController<String>('Selecione uma opção');
// dropDownValueController1 = FormFieldController<String>('Selecione uma opção');
// dropDownValueController2 = FormFieldController<String>('Selecione uma opção');
}
Widget buildPetDetails({
@ -378,12 +390,10 @@ class PetsPageModel extends FlutterFlowModel<PetsPageWidget> {
required String cliUUID,
required String cliName,
required PetsPageModel model,
bool isInteractive = true,
}) {
return DetailsComponentWidget(
buttons: [
// EDIT ACTION
if (isInteractive)
FFButtonWidget(
text: FFLocalizations.of(context).getVariableText(
ptText: 'Editar',
@ -418,7 +428,6 @@ class PetsPageModel extends FlutterFlowModel<PetsPageWidget> {
),
// DELETE ACTION
if (isInteractive)
FFButtonWidget(
text: FFLocalizations.of(context).getVariableText(
ptText: 'Excluir',

45
lib/pages/preferences_settings_page/preferences_settings_widget.dart
View File

@ -6,6 +6,7 @@ import 'package:hub/flutter_flow/flutter_flow_util.dart';
import 'package:hub/flutter_flow/nav/nav.dart';
import 'package:hub/pages/preferences_settings_page/preferences_settings_model.dart';
import 'package:hub/shared/utils/limited_text_size.dart';
import 'package:material_symbols_icons/symbols.dart';
import 'package:provider/provider.dart';
@ -104,26 +105,26 @@ class _PreferencesPageWidgetState extends State<PreferencesPageWidget> {
onPressed = () => model.toggleFingerprint(context);
isEnabled = model.isFingerprint;
content = FFLocalizations.of(context).getVariableText(
ptText: 'Ative a autenticação por impressão digital para login seguro.',
enText: 'Enable fingerprint authentication for secure login.',
ptText: 'Autenticar com impressão digital no QRCode',
enText: 'Authenticate with fingerprint on the QRCode',
);
break;
case 1:
icon = Icons.person;
icon = Icons.share;
onPressed = () => model.enablePerson(context);
isEnabled = model.isPerson;
content = FFLocalizations.of(context).getVariableText(
ptText: 'Compartilhe o código de identificação remota',
enText: 'Share the remote identification code',
ptText: 'Compartilhar o código de identificação',
enText: 'Share the identification code',
);
break;
case 2:
icon = Icons.info;
icon = Icons.transfer_within_a_station_outlined;
onPressed = () => model.toggleIdentification(context);
isEnabled = false;
content = FFLocalizations.of(context).getVariableText(
ptText: 'Atualize suas informações de identificação de acesso.',
enText: 'Update your access identification information.',
ptText: 'Habilitar dispositivo para acesso',
enText: 'Enable device for access',
);
break;
case 3:
@ -131,8 +132,8 @@ class _PreferencesPageWidgetState extends State<PreferencesPageWidget> {
onPressed = () => model.toggleNotify(context);
isEnabled = model.isNotify;
content = FFLocalizations.of(context).getVariableText(
ptText: 'Ative para receber sua notificação de acesso',
enText: 'Enable to receive your access notification',
ptText: 'Receber notificação de acesso',
enText: 'Receive access notification',
);
break;
case 4:
@ -140,8 +141,8 @@ class _PreferencesPageWidgetState extends State<PreferencesPageWidget> {
onPressed = () => model.toggleAccess(context);
isEnabled = model.isAccess;
content = FFLocalizations.of(context).getVariableText(
ptText: 'Ative para inserir uma credencial de acesso para o QRCode',
enText: 'Enable to enter an access credential for the QRCode',
ptText: 'Registrar senha de acesso para o QRCode',
enText: 'Register access password for the QRCode',
);
break;
case 5:
@ -149,19 +150,19 @@ class _PreferencesPageWidgetState extends State<PreferencesPageWidget> {
onPressed = () => model.togglePanic(context);
isEnabled = model.isPanic;
content = FFLocalizations.of(context).getVariableText(
ptText: 'Ative para inserir uma credencial de pânico para o QRCode',
enText: 'Enable to enter a panic credential for the QRCode',
ptText: 'Registrar senha de pânico para o QRCode',
enText: 'Register panic password for the QRCode',
);
break;
case 6:
icon = Icons.landscape;
icon = Symbols.digital_out_of_home;
onPressed = () {
model.localUnlink(context);
};
isEnabled = false;
content = FFLocalizations.of(context).getVariableText(
ptText: 'Desative para se desvincular do local selecionado',
enText: 'Enable to unlink from the selected location',
ptText: 'Desvincular do local selecionado',
enText: 'Unlink from selected location',
);
break;
case 7:
@ -169,8 +170,8 @@ class _PreferencesPageWidgetState extends State<PreferencesPageWidget> {
onPressed = () => model.deleteAccount(context);
isEnabled = false;
content = FFLocalizations.of(context).getVariableText(
ptText: 'Delete sua conta e todos os dados associados permanentemente.',
enText: 'Delete your account and all associated data permanently.',
ptText: 'Deletar conta permanentemente',
enText: 'Delete account permanently',
);
break;
case 8:
@ -178,8 +179,8 @@ class _PreferencesPageWidgetState extends State<PreferencesPageWidget> {
onPressed = () => model.logout(context);
isEnabled = false;
content = FFLocalizations.of(context).getVariableText(
ptText: 'Sair da conta atual e voltar para a tela de login.',
enText: 'Log out of the current account and return to the login screen.',
ptText: 'Sair da conta',
enText: 'Logout',
);
break;
default:
@ -187,7 +188,7 @@ class _PreferencesPageWidgetState extends State<PreferencesPageWidget> {
}
return SizedBox(
height: 100,
height: 66,
child: GestureDetector(
onTap: () {
switch (index) {

57
lib/shared/services/localization/localization_service.dart
View File

@ -3,6 +3,8 @@
import 'dart:developer';
import 'package:flutter/material.dart';
import 'package:http/src/response.dart';
import 'package:hub/backend/api_requests/api_manager.dart';
import 'package:hub/flutter_flow/nav/nav.dart';
import 'package:hub/shared/helpers/base_storage.dart';
import 'package:hub/shared/helpers/storage_helper.dart';
@ -21,12 +23,20 @@ class LocalizationService {
try {
final GetLocalsCall callback = PhpGroup.getLocalsCall;
var response = await callback.call();
final bool isError = response.jsonBody['error'];
final bool? isError = response.jsonBody['error'];
if (isError) {
if (isError == true) {
_handleError(context, response.jsonBody['error_msg']);
return;
}
if (response.jsonBody == null) {
final String errorMsg = FFLocalizations.of(context).getVariableText(
enText: 'Verify your connection',
ptText: 'Verifique sua conexão',
);
DialogUtil.error(context, errorMsg).whenComplete(() => selectLocal(context, response));
return;
}
final List<dynamic> locals = response.jsonBody['locais'] ?? [];
final bool isEmpty = locals.isEmpty;
@ -50,13 +60,21 @@ class LocalizationService {
try {
final GetLocalsCall callback = PhpGroup.getLocalsCall;
final ApiCallResponse response = await callback.call();
final bool isError = response.jsonBody['error'];
final bool? isError = response.jsonBody['error'];
if (isError) {
if (isError == true) {
final String errorMsg = response.jsonBody['error_msg'];
_handleError(context, errorMsg);
return false;
}
if (response.jsonBody == null) {
final String errorMsg = FFLocalizations.of(context).getVariableText(
enText: 'Verify your connection',
ptText: 'Verifique sua conexão',
);
DialogUtil.error(context, errorMsg).whenComplete(() => selectLocal(context, response));
return false;
}
final List<dynamic> locals = response.jsonBody['locais'].toList() ?? [];
_logLocalsStatus(locals);
@ -82,7 +100,7 @@ class LocalizationService {
return await _handleEnabled(context, locals[0]);
} else if (isUnselected) {
log('() => isUnselected');
return await selectLocal(context);
return await selectLocal(context, response);
} else if (isSelected) {
log('() => isSelected');
return await processData(context);
@ -95,7 +113,7 @@ class LocalizationService {
if (!isUnique && isPending) log('() => not unique and pending');
if (!isUnique && isBlocked) log('() => not unique and blocked');
log('() => else');
return await selectLocal(context);
return await selectLocal(context, response);
}
} catch (e, s) {
log('() => stack: $s');
@ -105,7 +123,7 @@ class LocalizationService {
enText: 'Error getting locals, verify your connection',
ptText: 'Erro ao obter locais, verifique sua conexão',
);
DialogUtil.error(context, errorMsg).whenComplete(() => selectLocal(context));
DialogUtil.error(context, errorMsg).whenComplete(() => selectLocal(context, null));
return false;
}
}
@ -114,11 +132,18 @@ class LocalizationService {
try {
final GetDadosCall callback = PhpGroup.getDadosCall;
var response = await callback.call();
final bool error = response.jsonBody['error'];
final bool? isError = response.jsonBody['error'];
if (error == true || error == 'true') {
if (isError == true || isError == 'true') {
final String errorMsg = response.jsonBody['error_msg'];
DialogUtil.error(context, errorMsg).whenComplete(() => selectLocal(context));
DialogUtil.error(context, errorMsg).whenComplete(() => selectLocal(context, response));
return false;
} else if (response.jsonBody == null) {
final String errorMsg = FFLocalizations.of(context).getVariableText(
enText: 'Verify your connection',
ptText: 'Verifique sua conexão',
);
DialogUtil.error(context, errorMsg).whenComplete(() => selectLocal(context, response));
return false;
} else {
await _updateStorageUtil(response.jsonBody);
@ -131,14 +156,12 @@ class LocalizationService {
enText: 'Error getting data, verify your connection',
ptText: 'Erro ao obter dados, verifique sua conexão',
);
DialogUtil.error(context, errorMsg).whenComplete(() => selectLocal(context));
DialogUtil.error(context, errorMsg).whenComplete(() => selectLocal(context, null));
return false;
}
}
static Future<bool> selectLocal(BuildContext context) async {
final String? devUUID = await DeviceUtil.getSerialNumber();
log('() A => ${devUUID}');
static Future<bool> selectLocal(BuildContext context, ApiCallResponse? response) async {
return await showModalBottomSheet(
isScrollControlled: true,
backgroundColor: Colors.transparent,
@ -151,7 +174,7 @@ class LocalizationService {
canPop: false,
child: Padding(
padding: MediaQuery.viewInsetsOf(context),
child: const BottomArrowLinkedLocalsComponentWidget(),
child: BottomArrowLinkedLocalsComponentWidget(response: response),
),
),
).then((_) async => await processData(context));
@ -207,6 +230,7 @@ class LocalizationService {
final bool isAuthenticated = userUUID.isNotEmpty && devUUID.isNotEmpty;
final bool isDevLinked = !errorMsg.contains('Esse dispositivo nao pertence a esse usuario');
log('() => isLinked: $errorMsg');
log('() => isLinked: $errorMsg');
if (!isAuthenticated) {
errorMsg = FFLocalizations.of(context).getVariableText(
ptText: 'Erro ao obter credenciais de autenticação',
@ -224,7 +248,7 @@ class LocalizationService {
await DialogUtil.warning(context, errorMsg);
return;
}
await DialogUtil.error(context, errorMsg).whenComplete(() async => await selectLocal(context));
await DialogUtil.error(context, errorMsg).whenComplete(() async => await selectLocal(context, null));
}
static Future<bool> _handleUnavailable(BuildContext context, List<dynamic> locals) async {
@ -313,3 +337,4 @@ class LocalizationService {
await StorageHelper().set(SQLiteStorageKey.userName.value, jsonBody['visitado']['VDO_NOME'], Storage.SQLiteStorage);
}
}

39
lib/shared/utils/device_util.dart
View File

@ -2,42 +2,73 @@ import 'dart:io';
import 'package:device_info_plus/device_info_plus.dart';
import 'package:flutter/services.dart';
class DeviceUtil {
static const MethodChannel _channel = MethodChannel("com.freaccess.hub/getAndroidId");
static Future<String?> getAndroidId() async {
try {
final String? androidId = await _channel.invokeMethod('getAndroidId');
return androidId;
} on PlatformException catch (e) {
print("Failed to get Android ID: '${e.message}'.");
return null;
}
}
static Future<String?> getDevUUID() async {
var deviceInfo = DeviceInfoPlugin();
if (Platform.isIOS) {
// import 'dart:io'
var iosDeviceInfo = await deviceInfo.iosInfo;
return iosDeviceInfo.identifierForVendor; // unique ID on iOS
return iosDeviceInfo.identifierForVendor;
} else if (Platform.isAndroid) {
var androidDeviceInfo = await deviceInfo.androidInfo;
return androidDeviceInfo.id; // unique ID on Android
try {
final String? secureAndroidId = await getAndroidId();
return secureAndroidId;
} catch (e) {
final build = await deviceInfo.androidInfo;
return build.id;
}
}
return null;
}
static Future<String?> getSerialNumber() async {
var deviceInfo = DeviceInfoPlugin();
if (Platform.isIOS) {
// import 'dart:io'
var iosDeviceInfo = await deviceInfo.iosInfo;
return iosDeviceInfo.identifierForVendor; // unique ID on iOS
} else if (Platform.isAndroid) {
var androidDeviceInfo = await deviceInfo.androidInfo;
return androidDeviceInfo.serialNumber; // unique ID on Android
}
return null;
}
static Future<String?> getDeviceOSVersion() async {
var deviceInfo = DeviceInfoPlugin();
if (Platform.isIOS) {
var iosDeviceInfo = await deviceInfo.iosInfo;
return iosDeviceInfo.systemVersion; // unique ID on iOS. e.g. 14.5
} else if (Platform.isAndroid) {
var androidDeviceInfo = await deviceInfo.androidInfo;
return androidDeviceInfo.version.release; // unique ID on Android. e.g . 11
}
return null;
}
}