diff --git a/lib/controllers/main_controllers.dart b/lib/controllers/main_controllers.dart index acbe820..bc1b047 100644 --- a/lib/controllers/main_controllers.dart +++ b/lib/controllers/main_controllers.dart @@ -6,7 +6,7 @@ class MainControllers{ var senha = senhaDigitada.toUpperCase(); // Faz a criptografia da senha inserida String senhaMD5 = grHashString(GRCryptoType.md5, senha); - // Retira o tipo (1, 2 ou 3) da senha do Usuário + // Retira o tipo (1, 2 ou 3) da senha do Usuário+ int tipo = int.parse(senhaUsuario.substring(0, 1)); // Define a possição inicial da quebra da senha int posicaoInicialMin = 0; diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart index 2a9ba5a..855feec 100644 --- a/lib/screens/home_screen.dart +++ b/lib/screens/home_screen.dart @@ -6,6 +6,7 @@ import 'package:educa_controle_acesso/widgets/text_custom.dart'; import 'package:flutter/material.dart'; import '../models/aluno_model.dart'; import '../models/login_model.dart'; +import '../utils/fixos.dart'; import '../widgets/buttom_custom.dart'; import '../widgets/dados_alunos_container.dart'; import 'package:http/http.dart' as http; @@ -41,7 +42,7 @@ class _HomeScreenState extends State { alunos.clear(); String q = inputPesquisa.text.replaceAll(' ', '%20').toUpperCase(); // print(q); - final url = 'http://192.168.18.2:8000/aluno?NOME=$q&CIDADE=${widget.dados[0]}'; + final url = 'http://${Fixos.IP_API_PORTA}/aluno?NOME=$q&CIDADE=${widget.dados[0]}'; print(url); final response = await http.get(Uri.parse(url)); var map = json.decode(response.body); @@ -93,7 +94,7 @@ class _HomeScreenState extends State { setState(() { buscandoDados = true; }); - final url = 'http://192.168.18.2:8000/acesso_maria?LOGIN=${inputPesquisa.text.toUpperCase()}&CIDADE=${widget.dados[0]}'; + final url = 'http://${Fixos.IP_API_PORTA}/acesso_maria?LOGIN=${inputPesquisa.text.toUpperCase()}&CIDADE=${widget.dados[0]}'; print(url); final response = await http.get(Uri.parse(url)); var map = json.decode(response.body); @@ -125,7 +126,7 @@ class _HomeScreenState extends State { setState(() { buscandoDados = true; }); - final url = 'http://192.168.18.2:8000/acesso_base?LOGIN=${inputPesquisa.text.toUpperCase()}&CIDADE=${widget.dados[0]}'; + final url = 'http://${Fixos.IP_API_PORTA}/acesso_base?LOGIN=${inputPesquisa.text.toUpperCase()}&CIDADE=${widget.dados[0]}'; print(url); final response = await http.get(Uri.parse(url)); var map = json.decode(response.body); @@ -146,7 +147,7 @@ class _HomeScreenState extends State { } inserirAcessos(int index)async{ - final url = 'http://192.168.18.2:8000/inserir_acesso'; + final url = 'http://${Fixos.IP_API_PORTA}/inserir_acesso'; final response = await http.post( Uri.parse(url), body:{ diff --git a/lib/screens/login_screen.dart b/lib/screens/login_screen.dart index b9cbef2..b97f571 100644 --- a/lib/screens/login_screen.dart +++ b/lib/screens/login_screen.dart @@ -5,6 +5,7 @@ import 'package:educa_controle_acesso/widgets/text_custom.dart'; import 'package:flutter/material.dart'; import '../controllers/main_controllers.dart'; import '../utils/colors.dart'; +import '../utils/fixos.dart'; import '../widgets/buttom_custom.dart'; import '../widgets/snackBars.dart'; import 'package:http/http.dart' as http; @@ -67,7 +68,7 @@ class _LoginScreenState extends State { cidade = Cidades().listCidades[i].cidadeQuery.toUpperCase(); } } - final url = 'http://192.168.18.2:8000/acesso_maria?LOGIN=${inputLogin.text.toUpperCase()}&CIDADE=$cidade'; + final url = 'http://${Fixos.IP_API_PORTA}/acesso_maria?LOGIN=${inputLogin.text.toUpperCase()}&CIDADE=$cidade'; print(url); final response = await http.get(Uri.parse(url)); var map = json.decode(response.body); @@ -101,7 +102,7 @@ class _LoginScreenState extends State { } } - final url = 'http://192.168.18.2:8000/logincontrole?NO_USERNAME=${inputLogin.text.toUpperCase()}&CIDADE=$cidade'; + final url = 'http://${Fixos.IP_API_PORTA}/logincontrole?NO_USERNAME=${inputLogin.text.toUpperCase()}&CIDADE=$cidade'; print(url); final response = await http.get(Uri.parse(url)); var map = json.decode(response.body); @@ -149,6 +150,7 @@ class _LoginScreenState extends State { child: Column( mainAxisSize: MainAxisSize.min, children: [ + Spacer(), Container( child: Image.asset("assets/images/logoEduca.png",width:width * 0.15,height: height * 0.12) ), @@ -170,7 +172,7 @@ class _LoginScreenState extends State { controller: inputSenha, title: 'SENHA', obscure: true, - width: width * 0.18, + width: width>900? width * 0.18:width*0.5, colorBorder: PaletteColors.white, ), ), @@ -181,7 +183,7 @@ class _LoginScreenState extends State { inputFormatters: [], controller: inputCodigo, title: 'CÓDIGO', - width: width * 0.18, + width: width>900? width * 0.18:width*0.5, colorBorder: PaletteColors.white, ), ), @@ -203,6 +205,13 @@ class _LoginScreenState extends State { colorBorder: PaletteColors.primaryColor, onPressed: ()=>verificacao(), ), + Spacer(), + Row( + children: [ + Spacer(), + TextCustom(text: 'versão 1.0'), + ], + ) ], ), ) diff --git a/lib/screens/responsible_register_screen.dart b/lib/screens/responsible_register_screen.dart index f4c64d2..1d205ed 100644 --- a/lib/screens/responsible_register_screen.dart +++ b/lib/screens/responsible_register_screen.dart @@ -8,6 +8,7 @@ import 'package:flutter/services.dart'; import 'package:get/get.dart'; import 'package:intl/intl.dart'; import '../utils/colors.dart'; +import '../utils/fixos.dart'; import '../widgets/buttom_custom.dart'; import '../widgets/caixa_texto_container.dart'; import '../widgets/input_text.dart'; @@ -38,7 +39,7 @@ class _ResponsibleRegisterScreenState extends State { bool carregando = true; bloquearResponsavel(int index)async{ - final url = 'http://192.168.18.2:8000/inserirpais'; + final url = 'http://${Fixos.IP_API_PORTA}/inserirpais'; final response = await http.post( Uri.parse(url), @@ -77,7 +78,7 @@ class _ResponsibleRegisterScreenState extends State { } inserirDB(int index)async{ - final url = 'http://192.168.18.2:8000/inserirpais'; + final url = 'http://${Fixos.IP_API_PORTA}/inserirpais'; final response = await http.post( Uri.parse(url), @@ -206,8 +207,8 @@ class _ResponsibleRegisterScreenState extends State { } paisBanco()async{ - final url = 'http://192.168.18.2:8000/pais?CD_ALUNO=${widget.alunoModel.dados['CD_ALUNO']}'; - // print(url); + final url = 'http://${Fixos.IP_API_PORTA}/pais?CD_ALUNO=${widget.alunoModel.dados['CD_ALUNO']}'; + print(url); final response = await http.get(Uri.parse(url)); var map = json.decode(response.body); // print(map); @@ -219,7 +220,7 @@ class _ResponsibleRegisterScreenState extends State { setState(() { carregando = true; }); - final url = 'http://192.168.18.2:8000/deleta?CPF=$cpf'; + final url = 'http://${Fixos.IP_API_PORTA}/deleta?CPF=$cpf'; // print(url); final response = await http.get(Uri.parse(url)); // print(response.body); diff --git a/lib/utils/fixos.dart b/lib/utils/fixos.dart new file mode 100644 index 0000000..71c9d0a --- /dev/null +++ b/lib/utils/fixos.dart @@ -0,0 +1,3 @@ +class Fixos{ + static const String IP_API_PORTA = '192.168.0.42:8013'; +} \ No newline at end of file diff --git a/web/index.html b/web/index.html index 7709403..99a968a 100644 --- a/web/index.html +++ b/web/index.html @@ -1,19 +1,7 @@ -