diff --git a/lib/pages/livecare/incoming_call.dart b/lib/pages/livecare/incoming_call.dart index ec832e96..d81aaec5 100644 --- a/lib/pages/livecare/incoming_call.dart +++ b/lib/pages/livecare/incoming_call.dart @@ -234,12 +234,12 @@ class _IncomingCallState extends State with SingleTickerProviderSt await _controller.dispose(); await Navigator.of(context).pushReplacement( MaterialPageRoute( - fullscreenDialog: true, + // fullscreenDialog: true, builder: (BuildContext context) { - if (openCallInWeb) + // if (openCallInWeb) return VideoCallWebPage(receiverId: widget.incomingCallData.receiverID, callerId: widget.incomingCallData.callerID); - else - return CallHomePage(receiverId: widget.incomingCallData.receiverID, callerId: widget.incomingCallData.callerID); + // else + // return CallHomePage(receiverId: widget.incomingCallData.receiverID, callerId: widget.incomingCallData.callerID); }, ), ); diff --git a/lib/pages/livecare/video-call-web-page.dart b/lib/pages/livecare/video-call-web-page.dart index 2aa802b0..9cc20020 100644 --- a/lib/pages/livecare/video-call-web-page.dart +++ b/lib/pages/livecare/video-call-web-page.dart @@ -1,3 +1,4 @@ +import 'package:diplomaticquarterapp/pages/landing/landing_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -6,7 +7,7 @@ import 'package:flutter_inappwebview/flutter_inappwebview.dart'; class VideoCallWebPage extends StatelessWidget{ final GlobalKey webViewKey = GlobalKey(); - InAppWebViewController webViewController; + // InAppWebViewController webViewController; InAppWebViewController controller; URLRequest request; @@ -51,7 +52,7 @@ class VideoCallWebPage extends StatelessWidget{ ), extendBodyBehindAppBar: true, extendBody: false, - backgroundColor: Colors.white, + // backgroundColor: Colors.white, body: Column( children: [ SizedBox(height: MediaQuery.of(context).viewPadding.top), @@ -82,7 +83,10 @@ class VideoCallWebPage extends StatelessWidget{ ); } - onWebViewCreated(InAppWebViewController controller) => this.controller = controller; + onWebViewCreated(InAppWebViewController controller) { + this.controller = controller; + LandingPage.isOpenCallPage = true; + } onConsoleMessage(controller, ConsoleMessage consoleMessage){ print(consoleMessage); @@ -95,7 +99,12 @@ class VideoCallWebPage extends StatelessWidget{ onLoadStart(InAppWebViewController controller, Uri url) { print(url); if(url.toString().toLowerCase().contains("endcallpage")){ - Navigator.pop(webViewKey.currentContext); + LandingPage.isOpenCallPage = false; + if(LandingPage.isOpenCallPage == true) { + print("END CALL!!!"); + // controller.goBack(); + Navigator.pop(webViewKey.currentContext); + } } } diff --git a/lib/services/appointment_services/GetDoctorsList.dart b/lib/services/appointment_services/GetDoctorsList.dart index e9613628..383af15b 100644 --- a/lib/services/appointment_services/GetDoctorsList.dart +++ b/lib/services/appointment_services/GetDoctorsList.dart @@ -698,6 +698,7 @@ class DoctorsListService extends BaseService { "ProjectID": projectID, "ServiceID": serviceID, "AcceptedBy": docID, + "IsFlutter": true, "DeviceToken": deviceToken, "Latitude": lat, "Longitude": long, diff --git a/lib/uitl/push-notification-handler.dart b/lib/uitl/push-notification-handler.dart index f261df26..76399a1a 100644 --- a/lib/uitl/push-notification-handler.dart +++ b/lib/uitl/push-notification-handler.dart @@ -1,18 +1,18 @@ import 'dart:convert'; import 'dart:io'; - import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/models/LiveCare/IncomingCallData.dart'; import 'package:diplomaticquarterapp/pages/landing/landing_page.dart'; import 'package:diplomaticquarterapp/pages/livecare/incoming_call.dart'; import 'package:diplomaticquarterapp/uitl/app-permissions.dart'; -import 'package:firebase_messaging/firebase_messaging.dart'; -import 'package:firebase_messaging/firebase_messaging.dart' as fir; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_hms_gms_availability/flutter_hms_gms_availability.dart'; import 'package:huawei_push/huawei_push.dart' as h_push; +import 'package:firebase_messaging/firebase_messaging.dart'; +import 'package:firebase_messaging/firebase_messaging.dart' as fir; +import 'package:flutter_hms_gms_availability/flutter_hms_gms_availability.dart'; +import 'package:shared_preferences/shared_preferences.dart'; import 'app_shared_preferences.dart'; import 'navigation_service.dart'; @@ -23,15 +23,10 @@ Future backgroundMessageHandler(dynamic message) async { if (message is h_push.RemoteMessage) { // if huawei remote message convert it to Firebase Remote Message message_ = toFirebaseRemoteMessage(message); - } else { - if (message.data != null && message.data['is_call'] == 'true') { - _incomingCall(message.data); - return; - } } - if (message_.data != null && message_.data['is_call'] == 'true') { - _incomingCall(message_.data); + if (message.data != null && message.data['is_call'] == 'true') { + _incomingCall(message.data); return; } h_push.Push.localNotification({h_push.HMSLocalNotificationAttr.TITLE: 'Background Message', h_push.HMSLocalNotificationAttr.MESSAGE: "By: BackgroundMessageHandler"});