diff --git a/siro_driver/lib/controller/functions/face_detect.dart b/siro_driver/lib/controller/functions/face_detect.dart index 9b5f3a0..1661c9b 100755 --- a/siro_driver/lib/controller/functions/face_detect.dart +++ b/siro_driver/lib/controller/functions/face_detect.dart @@ -4,7 +4,6 @@ import 'package:siro_driver/constant/api_key.dart'; import 'package:siro_driver/constant/box_name.dart'; import 'package:siro_driver/main.dart'; import 'package:http/http.dart' as http; -import 'package:http/io_client.dart'; import '../../constant/links.dart'; import 'encrypt_decrypt.dart'; @@ -15,14 +14,10 @@ Future faceDetector() async { await Future.delayed(const Duration(seconds: 2)); var headers = { - // 'Authorization': 'Basic ${AK.basicCompareFaces}', - 'Authorization': 'Basic hamza:12345678', + 'Authorization': 'Basic ${AK.basicCompareFaces}', 'Content-Type': 'application/json' }; - // var request = http.Request('POST', Uri.parse(//Todo - // 'https://face-detect-f6924392c4c7.herokuapp.com/compare_faces')); - var request = http.Request( 'POST', Uri.parse('https://mohkh.online:5000/compare_faces')); @@ -32,39 +27,25 @@ Future faceDetector() async { "url2": "https://api.sefer.live/sefer/card_image/face_detect-${(box.read(BoxName.driverID))}.jpg" }); - print('request.body: ${request.body}'); request.headers.addAll(headers); try { - http.Client client = await createHttpClient(); - http.StreamedResponse response = await client.send(request); - // http.StreamedResponse response = await request.send(); + http.StreamedResponse response = await request.send(); if (response.statusCode == 200) { String result = await response.stream.bytesToString(); - print('result: ${result}'); return result; } else { - print('Error: ${response.reasonPhrase}'); return 'Error: ${response.reasonPhrase}'; } } catch (e) { - print('Exception occurred: $e'); return 'Error: $e'; } } -Future createHttpClient() async { - final SecurityContext securityContext = SecurityContext(); - HttpClient httpClient = HttpClient(context: securityContext); - httpClient.badCertificateCallback = - (X509Certificate cert, String host, int port) => true; // Bypass SSL - return IOClient(httpClient); -} - Future faceDetector2(String url1, String url2) async { var headers = { - 'Authorization': 'Basic hamza:12345678', + 'Authorization': 'Basic ${AK.basicCompareFaces}', 'Content-Type': 'application/json' }; @@ -75,18 +56,10 @@ Future faceDetector2(String url1, String url2) async { request.headers.addAll(headers); try { - http.Client client = await createHttpClient(); // Use custom client - DateTime startTime = DateTime.now(); - http.StreamedResponse response = await client.send(request); - DateTime endTime = DateTime.now(); - Duration duration = endTime.difference(startTime); + http.StreamedResponse response = await request.send(); if (response.statusCode == 200) { - print(await response.stream.bytesToString()); - print(duration.inSeconds); - return await response.stream.bytesToString(); } else { - print(await response.stream.bytesToString()); return 'Error: ${response.reasonPhrase}'; } } catch (e) { diff --git a/siro_rider/android/app/src/main/res/xml/network_security_config.xml b/siro_rider/android/app/src/main/res/xml/network_security_config.xml index e6ae004..561908a 100644 --- a/siro_rider/android/app/src/main/res/xml/network_security_config.xml +++ b/siro_rider/android/app/src/main/res/xml/network_security_config.xml @@ -18,11 +18,4 @@ - - - - - - - \ No newline at end of file diff --git a/siro_service/android/app/src/main/AndroidManifest.xml b/siro_service/android/app/src/main/AndroidManifest.xml index 32951e6..7950956 100644 --- a/siro_service/android/app/src/main/AndroidManifest.xml +++ b/siro_service/android/app/src/main/AndroidManifest.xml @@ -64,6 +64,9 @@