merge-requests/188/head
Aamir Muhammad 3 years ago
parent 9dd4456c51
commit 104c93f95a

@ -31,7 +31,7 @@ class ChatVoipCall {
await ChatVoipCall().listenerEvent(); await ChatVoipCall().listenerEvent();
ALM.Response autoLoginData; ALM.Response autoLoginData;
SingleUserChatModel callerData; SingleUserChatModel callerData;
// if(!background){} // if(!background){}
await initProviders(); await initProviders();
if (data!.data["user_token_response"] == null || data.data["user_token_response"].isEmpty) { if (data!.data["user_token_response"] == null || data.data["user_token_response"].isEmpty) {
autoLoginData = ALM.Response.fromJson(AppState().getchatUserDetails!.response!.toJson()); autoLoginData = ALM.Response.fromJson(AppState().getchatUserDetails!.response!.toJson());

@ -3,8 +3,8 @@ import 'package:mohem_flutter_app/ui/marathon/widgets/question_card.dart';
class ApiConsts { class ApiConsts {
//static String baseUrl = "http://10.200.204.20:2801/"; // Local server //static String baseUrl = "http://10.200.204.20:2801/"; // Local server
// static String baseUrl = "https://erptstapp.srca.org.sa"; // SRCA server // static String baseUrl = "https://erptstapp.srca.org.sa"; // SRCA server
static String baseUrl = "https://uat.hmgwebservices.com"; // UAT server //static String baseUrl = "https://uat.hmgwebservices.com"; // UAT server
// static String baseUrl = "https://hmgwebservices.com"; // Live server static String baseUrl = "https://hmgwebservices.com"; // Live server
static String baseUrlServices = baseUrl + "/Services/"; // server static String baseUrlServices = baseUrl + "/Services/"; // server
// static String baseUrlServices = "https://api.cssynapses.com/tangheem/"; // Live server // static String baseUrlServices = "https://api.cssynapses.com/tangheem/"; // Live server
static String utilitiesRest = baseUrlServices + "Utilities.svc/REST/"; static String utilitiesRest = baseUrlServices + "Utilities.svc/REST/";

@ -60,7 +60,7 @@ class AppNotifications {
if (initialMessage != null) _handleMessage(initialMessage); if (initialMessage != null) _handleMessage(initialMessage);
FirebaseMessaging.onMessage.listen((RemoteMessage message) { FirebaseMessaging.onMessage.listen((RemoteMessage message) {
if (message != null) _handleMessage(message); if (message != null) _handleMessage(message);
}); });
FirebaseMessaging.onMessageOpenedApp.listen(_handleOpenApp); FirebaseMessaging.onMessageOpenedApp.listen(_handleOpenApp);
@ -120,7 +120,7 @@ class AppNotifications {
Utils.saveStringFromPrefs("isAppOpendByChat", "true"); Utils.saveStringFromPrefs("isAppOpendByChat", "true");
Utils.saveStringFromPrefs("notificationData", message.data["user_chat_history_response"].toString()); Utils.saveStringFromPrefs("notificationData", message.data["user_chat_history_response"].toString());
} else if (message.data.isNotEmpty && message.data["messageType"] == 'call') { } else if (message.data.isNotEmpty && message.data["messageType"] == 'call') {
if( Platform.isAndroid){ if (Platform.isAndroid) {
ChatVoipCall().showCallkitIncoming(uuid: const Uuid().v4(), data: message); ChatVoipCall().showCallkitIncoming(uuid: const Uuid().v4(), data: message);
} }
} }
@ -132,6 +132,7 @@ class AppNotifications {
Utils.saveStringFromPrefs("notificationData", message.data["user_chat_history_response"].toString()); Utils.saveStringFromPrefs("notificationData", message.data["user_chat_history_response"].toString());
} }
} }
}
AndroidNotificationChannel channel = const AndroidNotificationChannel( AndroidNotificationChannel channel = const AndroidNotificationChannel(
"high_importance_channel", "high_importance_channel",
@ -145,7 +146,7 @@ Future<dynamic> backgroundMessageHandler(RemoteMessage message) async {
Utils.saveStringFromPrefs("isAppOpendByChat", "false"); Utils.saveStringFromPrefs("isAppOpendByChat", "false");
Utils.saveStringFromPrefs("notificationData", message.data["user_chat_history_response"].toString()); Utils.saveStringFromPrefs("notificationData", message.data["user_chat_history_response"].toString());
} else if (message.data.isNotEmpty && message.data["messageType"] == 'call') { } else if (message.data.isNotEmpty && message.data["messageType"] == 'call') {
if( Platform.isAndroid) { if (Platform.isAndroid) {
ChatVoipCall().showCallkitIncoming(uuid: const Uuid().v4(), data: message, background: true); ChatVoipCall().showCallkitIncoming(uuid: const Uuid().v4(), data: message, background: true);
} }
} }

@ -203,6 +203,7 @@ class ChatCallProvider with ChangeNotifier, DiagnosticableTreeMixin {
} }
if (_pc.connectionState == RTCPeerConnectionState.RTCPeerConnectionStateConnected) { if (_pc.connectionState == RTCPeerConnectionState.RTCPeerConnectionStateConnected) {
_pc.dispose(); _pc.dispose();
_pc.close();
} }
isCallStarted = false; isCallStarted = false;
isVideoCall = false; isVideoCall = false;
@ -225,6 +226,7 @@ class ChatCallProvider with ChangeNotifier, DiagnosticableTreeMixin {
} }
if (_pc.connectionState == RTCPeerConnectionState.RTCPeerConnectionStateConnected) { if (_pc.connectionState == RTCPeerConnectionState.RTCPeerConnectionStateConnected) {
_pc.dispose(); _pc.dispose();
_pc.close();
} }
isCallStarted = false; isCallStarted = false;
isVideoCall = false; isVideoCall = false;

Loading…
Cancel
Save