Merge remote-tracking branch 'origin/development_v2.5' into development_v2.5

# Conflicts:
#	lib/uitl/push-notification-handler.dart
sikander_video_call_improvements
Sikander Saleem 4 years ago
commit 7490d238e4

@ -234,12 +234,12 @@ class _IncomingCallState extends State<IncomingCall> 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);
},
),
);

@ -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);
}
}
}

@ -698,6 +698,7 @@ class DoctorsListService extends BaseService {
"ProjectID": projectID,
"ServiceID": serviceID,
"AcceptedBy": docID,
"IsFlutter": true,
"DeviceToken": deviceToken,
"Latitude": lat,
"Longitude": long,

@ -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<dynamic> 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"});

Loading…
Cancel
Save