From 6cd660184a01dab6fa2582d3b2c754df3dabab1d Mon Sep 17 00:00:00 2001 From: Zohaib Iqbal Kambrani <> Date: Thu, 16 Jun 2022 14:33:00 +0300 Subject: [PATCH] no message --- lib/pages/landing/landing_page.dart | 6 +++--- lib/pages/livecare/incoming_call.dart | 2 +- lib/pages/login/confirm-login.dart | 2 -- lib/pages/videocall-webrtc-rnd/utils/turn.dart | 4 ++-- lib/pages/videocall-webrtc-rnd/webrtc/signaling.dart | 5 ++--- lib/pages/videocall-webrtc-rnd/webrtc/start_video_call.dart | 1 + 6 files changed, 9 insertions(+), 11 deletions(-) diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart index 2389e92c..00315e79 100644 --- a/lib/pages/landing/landing_page.dart +++ b/lib/pages/landing/landing_page.dart @@ -420,8 +420,8 @@ class _LandingPageState extends State with WidgetsBindingObserver { } login() async { - // dummyCall(); - // return; + dummyCall(); + return; var data = await sharedPref.getObject(IMEI_USER_DATA); sharedPref.remove(REGISTER_DATA_FOR_LOGIIN); @@ -478,7 +478,7 @@ class _LandingPageState extends State with WidgetsBindingObserver { "videoUrl": "video", "picture": "video", "is_call": "true", - "server": "192.168.8.104", + "server": "https://livecareturn.hmg.com", }; IncomingCallData incomingCallData = IncomingCallData.fromJson(json); diff --git a/lib/pages/livecare/incoming_call.dart b/lib/pages/livecare/incoming_call.dart index 1e5947e5..28caf546 100644 --- a/lib/pages/livecare/incoming_call.dart +++ b/lib/pages/livecare/incoming_call.dart @@ -238,7 +238,7 @@ class _IncomingCallState extends State with SingleTickerProviderSt final caller = widget.incomingCallData.callerID; final receiver = widget.incomingCallData.receiverID; final host = widget.incomingCallData.server; - // return StartVideoCall(caller: caller, receiver: receiver, iAmCaller: false, host: host,); + return StartVideoCall(caller: caller, receiver: receiver, iAmCaller: false, host: host,); // return VideoCallWebPage(receiverId: widget.incomingCallData.receiverID, callerId: widget.incomingCallData.callerID); // Web WebRTC VideoCall diff --git a/lib/pages/login/confirm-login.dart b/lib/pages/login/confirm-login.dart index bde675ad..887efb5c 100644 --- a/lib/pages/login/confirm-login.dart +++ b/lib/pages/login/confirm-login.dart @@ -609,7 +609,6 @@ class _ConfirmLogin extends State { } else { - projectViewModel.analytics.loginRegistration.login_successful(method: login_method), sharedPref.remove(FAMILY_FILE), result.list.isFamily = false, userData = result.list, @@ -728,7 +727,6 @@ class _ConfirmLogin extends State { isMoreOption = true; }); } else { - projectViewModel.analytics.loginRegistration.verify_otp_method(method: _flag, forRegistration: widget.fromRegistration); authenticateUser(_flag, isActive: _loginIndex); } }, diff --git a/lib/pages/videocall-webrtc-rnd/utils/turn.dart b/lib/pages/videocall-webrtc-rnd/utils/turn.dart index 0d4a00f9..f91fef80 100644 --- a/lib/pages/videocall-webrtc-rnd/utils/turn.dart +++ b/lib/pages/videocall-webrtc-rnd/utils/turn.dart @@ -2,14 +2,14 @@ import 'dart:convert'; import 'dart:async'; import 'dart:io'; -Future getTurnCredential(String host, int port) async { +Future getTurnCredential(String host) async { HttpClient client = HttpClient(context: SecurityContext()); client.badCertificateCallback = (X509Certificate cert, String host, int port) { print('getTurnCredential: Allow self-signed certificate => $host:$port. '); return true; }; - var url = 'https://$host:$port/api/turn?service=turn&username=flutter-webrtc'; + var url = '$host/api/turn?service=turn&username=flutter-webrtc'; var request = await client.getUrl(Uri.parse(url)); var response = await request.close(); var responseBody = await response.transform(Utf8Decoder()).join(); diff --git a/lib/pages/videocall-webrtc-rnd/webrtc/signaling.dart b/lib/pages/videocall-webrtc-rnd/webrtc/signaling.dart index d6e0a071..438b42de 100644 --- a/lib/pages/videocall-webrtc-rnd/webrtc/signaling.dart +++ b/lib/pages/videocall-webrtc-rnd/webrtc/signaling.dart @@ -51,7 +51,6 @@ class SocketUser{ class Signaling { var _host; - var _port = 8086; var _turnCredential; SimpleWebSocket _socket; @@ -248,11 +247,11 @@ class Signaling { } Future connect() async { - _socket = SimpleWebSocket('https://$_host:$_port/ws'); + _socket = SimpleWebSocket('$_host/ws'); if (_turnCredential == null) { try { - _turnCredential = await getTurnCredential(_host, _port); + _turnCredential = await getTurnCredential(_host); /* { "username": "1584195784:mbzrxpgjys", diff --git a/lib/pages/videocall-webrtc-rnd/webrtc/start_video_call.dart b/lib/pages/videocall-webrtc-rnd/webrtc/start_video_call.dart index ea3bbcb0..b1d89f66 100644 --- a/lib/pages/videocall-webrtc-rnd/webrtc/start_video_call.dart +++ b/lib/pages/videocall-webrtc-rnd/webrtc/start_video_call.dart @@ -3,6 +3,7 @@ import 'dart:async'; import 'package:diplomaticquarterapp/pages/conference/conference_button_bar.dart'; import 'package:diplomaticquarterapp/pages/conference/web_rtc/widgets/cam_view_widget.dart'; import 'package:diplomaticquarterapp/pages/videocall-webrtc-rnd/utils/device_info.dart'; +import 'package:firebase_messaging/firebase_messaging.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'dart:core';