livecare changes

lib/pages/livecare/incoming_call.dart

@@ -3,7 +3,6 @@ import 'dart:ui';
 import 'package:camera/camera.dart';
 import 'package:diplomaticquarterapp/models/LiveCare/IncomingCallData.dart';
 import 'package:diplomaticquarterapp/models/LiveCare/room_model.dart';
-import 'package:diplomaticquarterapp/pages/conference/web_rtc/call_home_page.dart';
 import 'package:diplomaticquarterapp/pages/conference/web_rtc/call_home_page_.dart';
 import 'package:diplomaticquarterapp/pages/conference/widgets/platform_exception_alert_dialog.dart';
 import 'package:diplomaticquarterapp/pages/landing/landing_page.dart';
@@ -34,7 +33,6 @@ class _IncomingCallState extends State<IncomingCall> with SingleTickerProviderSt
   bool isCameraReady = false;
   Signaling signaling = Signaling()..init();
 
-
   @override
   void initState() {
     _animationController = AnimationController(vsync: this, duration: Duration(milliseconds: 500));
@@ -231,16 +229,17 @@ class _IncomingCallState extends State<IncomingCall> with SingleTickerProviderSt
 
   Future<void> _submit() async {
     try {
+      // backToHome();
       final roomModel = RoomModel(name: widget.incomingCallData.name, token: widget.incomingCallData.sessionId, identity: widget.incomingCallData.identity);
       await _controller.dispose();
       await Navigator.of(context).pushReplacement(
         MaterialPageRoute(
           fullscreenDialog: true,
           builder: (BuildContext context) {
-            if(openCallInWeb)
+            if (openCallInWeb)
               return VideoCallWebPage(receiverId: widget.incomingCallData.receiverID, callerId: widget.incomingCallData.callerID);
-
-            return CallHomePage(receiverId: widget.incomingCallData.receiverID, callerId: widget.incomingCallData.callerID);
+            else
+              return CallHomePage(receiverId: widget.incomingCallData.receiverID, callerId: widget.incomingCallData.callerID);
           },
         ),
       );

lib/pages/livecare/video-call-web-page.dart

@@ -13,7 +13,7 @@ class VideoCallWebPage extends StatelessWidget{
   final String receiverId;
   final String callerId;
   VideoCallWebPage({@required this.receiverId, @required this.callerId}){
-    request = URLRequest(url: Uri.parse("https://vcallapi.hmg.com/index.html?username=$receiverId"));
+    request = URLRequest(url: Uri.parse("https://vcallapi.hmg.com/Mobileindex.html?username=$receiverId&doctorid=$callerId"));
   }
 
   InAppWebViewGroupOptions options = InAppWebViewGroupOptions(
@@ -64,7 +64,7 @@ class VideoCallWebPage extends StatelessWidget{
               onLoadStart: onLoadStart,
               onLoadError: onError,
               onConsoleMessage: onConsoleMessage,
-              shouldOverrideUrlLoading: shouldRedirect ,
+              // shouldOverrideUrlLoading: shouldRedirect ,
             ),
           ),
         ],
@@ -93,11 +93,18 @@ class VideoCallWebPage extends StatelessWidget{
   }
 
   onLoadStart(InAppWebViewController controller, Uri url) {
+    print(url);
+    if(url.toString().toLowerCase().contains("endcallpage")){
+      Navigator.pop(webViewKey.currentContext);
+    }
   }
 
   Future<NavigationActionPolicy> shouldRedirect(InAppWebViewController controller, NavigationAction navigationAction) async {
     var uri = navigationAction.request.url;
-    if(uri.queryParameters['exit'] == "yes"){
+    // if(uri.queryParameters['exit'] == "yes"){
+    //   Navigator.pop(webViewKey.currentContext);
+    // }
+    if(uri.toString().toLowerCase().contains("endcallpage")){
       Navigator.pop(webViewKey.currentContext);
     }