From 66a979f92478c8ac249432ab09bcea34d381b8fe Mon Sep 17 00:00:00 2001 From: Aamir Date: Tue, 16 Apr 2024 11:30:49 +0300 Subject: [PATCH] changes local --- lib/pages/livecare/incoming_call.dart | 2 +- lib/uitl/push-notification-handler.dart | 1 - .../call/chat_incoming_call_screen.dart | 89 +------------------ lib/voipcall/provider/chat_call_provider.dart | 44 +++------ 4 files changed, 16 insertions(+), 120 deletions(-) diff --git a/lib/pages/livecare/incoming_call.dart b/lib/pages/livecare/incoming_call.dart index a402c6b7..5e33d390 100644 --- a/lib/pages/livecare/incoming_call.dart +++ b/lib/pages/livecare/incoming_call.dart @@ -291,7 +291,7 @@ class _IncomingCallState extends State with SingleTickerProviderSt Duration(seconds: 30), () async { if (!isAccepted) { - callProv!.NoAnswer(); + await callProv!.noAnswer(); } }, ); diff --git a/lib/uitl/push-notification-handler.dart b/lib/uitl/push-notification-handler.dart index 0cf0e3d3..a01951e0 100644 --- a/lib/uitl/push-notification-handler.dart +++ b/lib/uitl/push-notification-handler.dart @@ -359,7 +359,6 @@ class PushNotificationHandler { // Permission.audio, // Permission.microphone, ].request(); - print("=-=-=-=-=-=-=-=-=-=-"); print(statuses[Permission.location]); } } catch (_) { diff --git a/lib/voipcall/call/chat_incoming_call_screen.dart b/lib/voipcall/call/chat_incoming_call_screen.dart index b6ab7283..11c44692 100644 --- a/lib/voipcall/call/chat_incoming_call_screen.dart +++ b/lib/voipcall/call/chat_incoming_call_screen.dart @@ -34,91 +34,6 @@ class _StartCallPageState extends State { super.dispose(); } - // void startCall() async { - // IncomingCallModel? sessionData; - // // dynamic calls = await FlutterCallkitIncoming.activeCalls(); - // // if (calls.isNotEmpty) { - // // sessionData.extra.callerDetails = {"id":341682,"userName":"Aamir.Muhammad","email":"Aamir.Muhammad@cloudsolutions.com.sa","phone":null,"title":"Aamir Saleem Ahmad Dost Muhammad","token":"eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJuYW1laWQiOiIzNDE2ODIiLCJlbWFpbCI6IkFhbWlyLk11aGFtbWFkQGNsb3Vkc29sdXRpb25zLmNvbS5zYSIsImh0dHA6Ly9zY2hlbWFzLm1pY3Jvc29mdC5jb20vd3MvMjAwOC8wNi9pZGVudGl0eS9jbGFpbXMvdXNlcmRhdGEiOiJBYW1pci5NdWhhbW1hZCIsIm5iZiI6MTcwNzIwNTAyMywiZXhwIjoxNzA3MjkxNDIzLCJpYXQiOjE3MDcyMDUwMjN9.Zz2bcsMwiLAAWGZh2E_p5Qs6ItMt0JHhDFI_0DLdggCQtt6HHcT4n8nvqMZx-uYr3jLwqhA_IAjTuaCeSE15sw","isDomainUser":true,"isActiveCode":false,"encryptedUserId":"nn7RkYzbnQc=","encryptedUserName":"/QruOyp4QMcmNXKZlljUgg=="}; - // // sessionData = IncomingCallModel.fromRawJson(jsonEncode(calls[0])); - // // if (kDebugMode) { - // // print(sessionData!.toRawJson()); - // // } - // if (cProv!.isUserOnline) { - // AppState().isBackgroundCall = true; - // if (kDebugMode) { - // print("====== Processing Incoming Call in Online State ========="); - // } - // await cProv!.startIncomingCallViaKit(inCallData: sessionData!.extra!.callerDetails!.toJson(), isVCall: sessionData.extra!.callType == "video" ? true : false); - // cProv!.init(); - // isCallConnected = true; - // } else { - // AppState().isBackgroundCall = true; - // if (kDebugMode) { - // print("====== Processing Incoming Call ========="); - // } - // // cProv.isUserOnline = provider.isUserOnline; - // await cProv!.startIncomingCallViaKit(inCallData: sessionData!.extra!.callerDetails!.toJson(), isVCall: sessionData!.extra!.callType == "video" ? true : false); - // try { - // AppState().setchatUserDetails = UserAutoLoginModel(response: Response.fromJson(sessionData.extra!.loginDetails!.toJson()), errorResponses: null); - // // await cProv!.buildHubConnection().whenComplete(() { - // // cProv!.init(); - // // isCallConnected = true; - // // }); - // } catch (e) { - // print(e); - // } - // } - // //} - // - // // cProv.startRecording(); - // } - - // void startIosCall() async { - // IosCallPayload iosCallPayload = widget.payload!; - // var userID = iosCallPayload.incomingCallReciverId; - // var callType = iosCallPayload.incomingCallType; - // SingleUserChatModel inCallData = SingleUserChatModel( - // targetUserName: iosCallPayload.incomingCallerName, - // chatEventId: 3, - // targetUserId: int.parse(iosCallPayload.incomingCallerId!), - // currentUserId: int.parse(userID.toString()), - // ); - // if (cProv!.isUserOnline) { - // AppState().isBackgroundCall = true; - // if (kDebugMode) { - // print("====== Processing Incoming Call in Online State ========="); - // } - // await cProv!.startIncomingCallViaKit(inCallData: inCallData.toJson(), isVCall: callType == "video" ? true : false); - // cProv!.init(); - // isCallConnected = true; - // } else { - // if (kDebugMode) { - // print("====== Processing Incoming Call ========="); - // } - // AppState().isBackgroundCall = true; - // UserAutoLoginModel userLoginResponse = await ChatService().getUserCallToken(userid: userID.toString()); - // if (userLoginResponse.response != null) { - // AppState().setchatUserDetails = userLoginResponse; - // AppSharedPrefs().setStringFromPrefs("userLoginChatDetails", jsonEncode(userLoginResponse.response)); - // - // await cProv!.startIncomingCallViaKit(inCallData: inCallData.toJson(), isVCall: callType == "video" ? true : false); - // try { - // AppState().setchatUserDetails = UserAutoLoginModel(response: userLoginResponse.response, errorResponses: null); - // // await cProv!.buildHubConnection().whenComplete(() { - // // cProv!.init(); - // // isCallConnected = true; - // // }); - // } catch (e) { - // print(e); - // } - // } - // } - // } - - // void startIosCall() { - // cProv!.startCallByRTC(); - // } - @override Widget build(BuildContext context) { return Scaffold( @@ -333,8 +248,8 @@ class _StartCallPageState extends State { ), RawMaterialButton( constraints: const BoxConstraints(), - onPressed: () { - prov.handleCallComplete([{}]); + onPressed: () async { + await prov.noAnswer(); }, elevation: 2.0, fillColor: MyColors.redA3Color, diff --git a/lib/voipcall/provider/chat_call_provider.dart b/lib/voipcall/provider/chat_call_provider.dart index 0fb97064..f54ff471 100644 --- a/lib/voipcall/provider/chat_call_provider.dart +++ b/lib/voipcall/provider/chat_call_provider.dart @@ -890,7 +890,14 @@ class ChatCallProvider with ChangeNotifier, DiagnosticableTreeMixin { // // notifyListeners(); // } - NoAnswer() { + noAnswer() async { + if (!isCallConnected && !isAccepted) { + await ping("Call_NoAnswer"); + } else if (!isCallConnected) { + await ping("Call_Decline"); + } else if (isCallConnected || isAccepted) { + await ping("Call_Complete"); + } handleCallComplete([{}]); } @@ -947,11 +954,11 @@ class ChatCallProvider with ChangeNotifier, DiagnosticableTreeMixin { } ping(String eventName) async { - print("============ $eventName ====================="); - if (chatHubConnection != null) if (chatHubConnection!.state == HubConnectionState.Connected) { - print("============ CONNECTED =============="); + print("=-=-=-=-=-=-=- $eventName =-=-=-=-=-=-=-=-=-=-"); + if (chatHubConnection != null && chatHubConnection!.state == HubConnectionState.Connected) { dynamic payload = {"UserID": int.parse(incomingCallData!.receiverID!)}; if (eventName == "Call_Complete") payload = {"from": patientID, "to": doctorID}; + print("Payload ==" + payload.toString()); await chatHubConnection!.invoke(eventName, args: [payload]).onError((error, stackTrace) {}).whenComplete(() { if (eventName == "Call_Decline" || eventName == "Call_Complete" || eventName == "Call_NoAnswer") { if (chatHubConnection != null) { @@ -960,9 +967,9 @@ class ChatCallProvider with ChangeNotifier, DiagnosticableTreeMixin { } }); } else { - print("============ ELSE RECONNECT =============="); + print("============ RECONNECT =============="); chatHubConnection = await createHub(); - chatHubConnection!.start(); + await chatHubConnection!.start(); ping(eventName); } } @@ -1051,13 +1058,6 @@ class ChatCallProvider with ChangeNotifier, DiagnosticableTreeMixin { handleCallComplete(List? params) { print("----------handle Call Complete Received ----------"); dynamic items = params!.toList(); - debuglogger.d(items); - if (isCallConnected) ping("Call_Complete"); - if (!isCallConnected && !isAccepted) { - ping("Call_NoAnswer"); - } else { - if (!isCallConnected) ping("Call_Decline"); - } isCallConnected = false; isCallStarted = false; isVideoCall = false; @@ -1180,21 +1180,3 @@ class HttpOverrideCertificateVerificationInDev extends HttpOverrides { return super.createHttpClient(context)..badCertificateCallback = (X509Certificate cert, String host, int port) => true; } } - -// class ChatService extends BaseService { -// Future getUserCallToken({required String userid}) async { -// getUserToken.UserAutoLoginModel userLoginResponse = getUserToken.UserAutoLoginModel(); -// http.post(Uri.parse("${ApiConsts.chatLoginTokenUrl}externaluserlogin"), body: { -// "employeeNumber": userid, -// "password": "FxIu26rWIKoF8n6mpbOmAjDLphzFGmpG", -// }).then((response) { -// userLoginResponse = getUserToken.userAutoLoginModelFromJson(response.body); -// }).onError((error, stackTrace) { -// hasError = true; -// print(error); -// super.error = error.toString(); -// }); -// -// return userLoginResponse; -// } -// }