diff --git a/Certs/ApplePushCert.p12 b/Certs/ApplePushCert.p12
new file mode 100644
index 00000000..3a1d15c8
Binary files /dev/null and b/Certs/ApplePushCert.p12 differ
diff --git a/Certs/ApplePushServices.certSigningRequest b/Certs/ApplePushServices.certSigningRequest
new file mode 100644
index 00000000..7d509a0a
--- /dev/null
+++ b/Certs/ApplePushServices.certSigningRequest
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICkDCCAXgCAQAwSzEjMCEGCSqGSIb3DQEJARYUaGFyb29uNjEzOEBnbWFpbC5j
+b20xFzAVBgNVBAMMDk1vaGFtZWQgTWVrYXd5MQswCQYDVQQGEwJBRTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAJnHqsyE7WfiVcE1Lpa4t4OVO6qlll2q
+1djs0XG06R/dlDtIqv4940/XLj+hU93mzAcVvFW4DSIEdD3InM3+T6oMTjPu6meU
+69h9ryaVkluQRrT/tdGI1EKO4MWGMe4MDIt7DqMhMfAcxTwekwdxdKaCEhaw3qnA
+l/64AelY6URW1pHHJMA0VV7j+pE3jVNai+muMXPrhQ1VrOrV8FftpY3bEeRJR2Cl
+T0tv0LhEMu4SfLnVWCzGQQC82hilDw3rH3ZDs8DFxF9agNVdwKlYamarh1dQXwRq
+Yx2+sjY1/51r9L4VS+GAh9ECxz0e+43NpzfZ/N+mTeDYKDepaBwPQ6kCAwEAAaAA
+MA0GCSqGSIb3DQEBCwUAA4IBAQB89OyLfywKT7ftmpEqCmgsmaJexb580q9w8wOk
+1JhJkNV5ec+p1dnge2NZeJ4LGII/5wmPj1vANNW0GZdmJDgnC+2gg9toq1QLCAsF
+rW7/LMpgAoEH+P5bhrHV9RRv6BQi0ZmN0apBHjp/pqZfm2Cl5jQPEWjUEf2tIF4l
+LSKdok6IPO9n4Fgyk0XdUNSEhgVhsLtZkGiXnkI1YovKDnupTFYPXMLp103bc9zP
+xDxwscvOysNDijlzZAkJPg2z8NrJIRDrKvLRHzxQwZ/1LHVB/51bp/1iyks3vOjh
+qw5XVsrtGAjCjU9md7q3XkPSyKzhK9UqPdOxdvl1OY0KKIIY
+-----END CERTIFICATE REQUEST-----
diff --git a/Certs/Pass.rtf b/Certs/Pass.rtf
new file mode 100644
index 00000000..2fe18706
--- /dev/null
+++ b/Certs/Pass.rtf
@@ -0,0 +1,8 @@
+{\rtf1\ansi\ansicpg1252\cocoartf2513
+\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+{\*\expandedcolortbl;;}
+\paperw11900\paperh16840\margl1440\margr1440\vieww10800\viewh8400\viewkind0
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
+
+\f0\fs24 \cf0 Hmg54321}
\ No newline at end of file
diff --git a/Certs/aps.cer b/Certs/aps.cer
new file mode 100644
index 00000000..fb46df86
Binary files /dev/null and b/Certs/aps.cer differ
diff --git a/GoogleService-Info.plist b/GoogleService-Info.plist
new file mode 100644
index 00000000..0c093a2a
--- /dev/null
+++ b/GoogleService-Info.plist
@@ -0,0 +1,36 @@
+
+
+
+
+ CLIENT_ID
+ 864393916058-ekeb4s8tgfo58dutv0l54399t7ivr06r.apps.googleusercontent.com
+ REVERSED_CLIENT_ID
+ com.googleusercontent.apps.864393916058-ekeb4s8tgfo58dutv0l54399t7ivr06r
+ API_KEY
+ AIzaSyA_6ayGCk4fly7o7eTVBrj9kuHBYHMAOfs
+ GCM_SENDER_ID
+ 864393916058
+ PLIST_VERSION
+ 1
+ BUNDLE_ID
+ com.cloud.diplomaticquarterapp
+ PROJECT_ID
+ diplomaticquarter-d2385
+ STORAGE_BUCKET
+ diplomaticquarter-d2385.appspot.com
+ IS_ADS_ENABLED
+
+ IS_ANALYTICS_ENABLED
+
+ IS_APPINVITE_ENABLED
+
+ IS_GCM_ENABLED
+
+ IS_SIGNIN_ENABLED
+
+ GOOGLE_APP_ID
+ 1:864393916058:ios:13f787bbfe6051f8b97923
+ DATABASE_URL
+ https://diplomaticquarter-d2385.firebaseio.com
+
+
\ No newline at end of file
diff --git a/assets/sounds/ring_30Sec.caf b/assets/sounds/ring_30Sec.caf
new file mode 100644
index 00000000..b5bb4b88
Binary files /dev/null and b/assets/sounds/ring_30Sec.caf differ
diff --git a/assets/sounds/ring_30Sec.mp3 b/assets/sounds/ring_30Sec.mp3
new file mode 100644
index 00000000..f647cca8
Binary files /dev/null and b/assets/sounds/ring_30Sec.mp3 differ
diff --git a/assets/sounds/ring_60Sec.mp3 b/assets/sounds/ring_60Sec.mp3
new file mode 100644
index 00000000..ac32394e
Binary files /dev/null and b/assets/sounds/ring_60Sec.mp3 differ
diff --git a/ios/GoogleService-Info.plist b/ios/GoogleService-Info.plist
new file mode 100644
index 00000000..0c093a2a
--- /dev/null
+++ b/ios/GoogleService-Info.plist
@@ -0,0 +1,36 @@
+
+
+
+
+ CLIENT_ID
+ 864393916058-ekeb4s8tgfo58dutv0l54399t7ivr06r.apps.googleusercontent.com
+ REVERSED_CLIENT_ID
+ com.googleusercontent.apps.864393916058-ekeb4s8tgfo58dutv0l54399t7ivr06r
+ API_KEY
+ AIzaSyA_6ayGCk4fly7o7eTVBrj9kuHBYHMAOfs
+ GCM_SENDER_ID
+ 864393916058
+ PLIST_VERSION
+ 1
+ BUNDLE_ID
+ com.cloud.diplomaticquarterapp
+ PROJECT_ID
+ diplomaticquarter-d2385
+ STORAGE_BUCKET
+ diplomaticquarter-d2385.appspot.com
+ IS_ADS_ENABLED
+
+ IS_ANALYTICS_ENABLED
+
+ IS_APPINVITE_ENABLED
+
+ IS_GCM_ENABLED
+
+ IS_SIGNIN_ENABLED
+
+ GOOGLE_APP_ID
+ 1:864393916058:ios:13f787bbfe6051f8b97923
+ DATABASE_URL
+ https://diplomaticquarter-d2385.firebaseio.com
+
+
\ No newline at end of file
diff --git a/ios/Runner/GoogleService-Info.plist b/ios/Runner/GoogleService-Info.plist
new file mode 100644
index 00000000..0c093a2a
--- /dev/null
+++ b/ios/Runner/GoogleService-Info.plist
@@ -0,0 +1,36 @@
+
+
+
+
+ CLIENT_ID
+ 864393916058-ekeb4s8tgfo58dutv0l54399t7ivr06r.apps.googleusercontent.com
+ REVERSED_CLIENT_ID
+ com.googleusercontent.apps.864393916058-ekeb4s8tgfo58dutv0l54399t7ivr06r
+ API_KEY
+ AIzaSyA_6ayGCk4fly7o7eTVBrj9kuHBYHMAOfs
+ GCM_SENDER_ID
+ 864393916058
+ PLIST_VERSION
+ 1
+ BUNDLE_ID
+ com.cloud.diplomaticquarterapp
+ PROJECT_ID
+ diplomaticquarter-d2385
+ STORAGE_BUCKET
+ diplomaticquarter-d2385.appspot.com
+ IS_ADS_ENABLED
+
+ IS_ANALYTICS_ENABLED
+
+ IS_APPINVITE_ENABLED
+
+ IS_GCM_ENABLED
+
+ IS_SIGNIN_ENABLED
+
+ GOOGLE_APP_ID
+ 1:864393916058:ios:13f787bbfe6051f8b97923
+ DATABASE_URL
+ https://diplomaticquarter-d2385.firebaseio.com
+
+
\ No newline at end of file
diff --git a/ios/Runner/Runner.entitlements b/ios/Runner/Runner.entitlements
new file mode 100644
index 00000000..0c67376e
--- /dev/null
+++ b/ios/Runner/Runner.entitlements
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart
index ee4c1e54..80c65128 100644
--- a/lib/pages/landing/landing_page.dart
+++ b/lib/pages/landing/landing_page.dart
@@ -113,32 +113,70 @@ class _LandingPageState extends State with WidgetsBindingObserver {
_firebaseMessaging.configure(
onMessage: (Map message) async {
print("onMessage: $message");
+ print(message);
+ print(message['name']);
+ print(message['appointmentdate']);
- if (message['data'].containsKey("is_call")) {
- var route = ModalRoute.of(context);
+ if (Platform.isIOS) {
+ if (message['is_call'] == "true") {
+ var route = ModalRoute.of(context);
- if (route != null) {
- print(route.settings.name);
+ if (route != null) {
+ print(route.settings.name);
+ }
+
+ Map myMap =
+ new Map.from(message);
+ print(myMap);
+ LandingPage.isOpenCallPage = true;
+ LandingPage.incomingCallData = IncomingCallData.fromJson(myMap);
+ if (!isPageNavigated) {
+ isPageNavigated = true;
+ Navigator.push(
+ context,
+ MaterialPageRoute(
+ builder: (context) => IncomingCall(
+ incomingCallData: LandingPage.incomingCallData)))
+ .then((value) {
+ isPageNavigated = false;
+ });
+ }
+ } else {
+ print("Is Call Not Found iOS");
}
+ } else {
+ print("Is Call Not Found iOS");
+ }
- Map myMap =
- new Map.from(message['data']);
- print(myMap);
- LandingPage.isOpenCallPage = true;
- LandingPage.incomingCallData = IncomingCallData.fromJson(myMap);
- if (!isPageNavigated) {
- isPageNavigated = true;
- Navigator.push(
- context,
- MaterialPageRoute(
- builder: (context) => IncomingCall(
- incomingCallData: LandingPage.incomingCallData)))
- .then((value) {
- isPageNavigated = false;
- });
+ if (Platform.isAndroid) {
+ if (message['data'].containsKey("is_call")) {
+ var route = ModalRoute.of(context);
+
+ if (route != null) {
+ print(route.settings.name);
+ }
+
+ Map myMap =
+ new Map.from(message['data']);
+ print(myMap);
+ LandingPage.isOpenCallPage = true;
+ LandingPage.incomingCallData = IncomingCallData.fromJson(myMap);
+ if (!isPageNavigated) {
+ isPageNavigated = true;
+ Navigator.push(
+ context,
+ MaterialPageRoute(
+ builder: (context) => IncomingCall(
+ incomingCallData: LandingPage.incomingCallData)))
+ .then((value) {
+ isPageNavigated = false;
+ });
+ }
+ } else {
+ print("Is Call Not Found Android");
}
} else {
- print("Is Call Not Found");
+ print("Is Call Not Found Android");
}
},
onBackgroundMessage: Platform.isIOS ? null : myBackgroundMessageHandler,
diff --git a/lib/pages/livecare/incoming_call.dart b/lib/pages/livecare/incoming_call.dart
index ef6c3ac3..de80b4ae 100644
--- a/lib/pages/livecare/incoming_call.dart
+++ b/lib/pages/livecare/incoming_call.dart
@@ -230,7 +230,7 @@ class _IncomingCallState extends State
void backToHome() {
player.stop();
- disposeAudioResources();
+// disposeAudioResources();
Navigator.of(context).pop();
}