diff --git a/android/app/src/main/java/com/example/doctor_app_flutter/ui/VideoCallActivity.java b/android/app/src/main/java/com/example/doctor_app_flutter/ui/VideoCallActivity.java index adc32d38..2e7c32a7 100644 --- a/android/app/src/main/java/com/example/doctor_app_flutter/ui/VideoCallActivity.java +++ b/android/app/src/main/java/com/example/doctor_app_flutter/ui/VideoCallActivity.java @@ -183,7 +183,7 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi videoCallPresenter.callClintConnected(sessionStatusModel); } }; - mConnectedHandler.postDelayed(mConnectedRunnable, 7 * 1000); + mConnectedHandler.postDelayed(mConnectedRunnable, 30 * 1000); } diff --git a/lib/screens/dashboard_screen.dart b/lib/screens/dashboard_screen.dart index 5ce0973d..fe41913b 100644 --- a/lib/screens/dashboard_screen.dart +++ b/lib/screens/dashboard_screen.dart @@ -105,20 +105,9 @@ class _DashboardScreenState extends State { children: [ InkWell( onTap: () async { - await VideoChannel.openVideoCallScreen( - kToken: 'T1==cGFydG5lcl9pZD00NjgwMzIyNCZzaWc9NWRhNmExMzU4ZDViZGU3OTA5NDY4ODRhNzI4ZGUxZTRmMjZmNzcwMjpzZXNzaW9uX2lkPTFfTVg0ME5qZ3dNekl5Tkg1LU1UVTVNelk0TXpZek9EWXdNMzV1Y0V4V1lWUlZTbTVIY3k5dVdHWm1NMWxPYTNjelpIVi1mZyZjcmVhdGVfdGltZT0xNTkzNjgzNjYyJm5vbmNlPTAuODAxMzMzMzUxMDQwNzE5NSZyb2xlPXB1Ymxpc2hlciZleHBpcmVfdGltZT0xNTk2Mjc1NjYyJmluaXRpYWxfbGF5b3V0X2NsYXNzX2xpc3Q9', - kSessionId: '1_MX40NjgwMzIyNH5-MTU5MzY4MzYzODYwM35ucExWYVRVSm5Hcy9uWGZmM1lOa3czZHV-fg', - kApiKey: '46803224', - onFailure: (String error) {}, - onCallEnd: () {}, - callNotRespond: (SessionStatusModel sessionStatusModel) { - var asd =""; - }); - - -// showCupertinoPicker( -// context: context, -// actionList: authProvider.doctorsClinicList); + showCupertinoPicker( + context: context, + actionList: authProvider.doctorsClinicList); }, child: Container( margin: diff --git a/lib/screens/live_care/video_call.dart b/lib/screens/live_care/video_call.dart index 02abdc5b..4d7d4170 100644 --- a/lib/screens/live_care/video_call.dart +++ b/lib/screens/live_care/video_call.dart @@ -1,5 +1,6 @@ import 'dart:async'; +import 'package:doctor_app_flutter/models/livecare/session_status_model.dart'; import 'package:doctor_app_flutter/providers/livecare_provider.dart'; import 'package:doctor_app_flutter/util/VideoChannel.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; @@ -37,15 +38,28 @@ class _VideoCallPageState extends State { _isInit = false; } - void connectOpenTok(tokenData) { + void connectOpenTok(tokenData) async { _tokenData = tokenData; /* opentok functionalites need to be written */ - - VideoChannel.openVideoCallScreen( - kApiKey: '46209962', - kSessionId: _tokenData["OpenSessionID"], - kToken: _tokenData["OpenTokenID"], - ); + await VideoChannel.openVideoCallScreen( + kToken: + 'T1==cGFydG5lcl9pZD00NjgwMzIyNCZzaWc9NWRhNmExMzU4ZDViZGU3OTA5NDY4ODRhNzI4ZGUxZTRmMjZmNzcwMjpzZXNzaW9uX2lkPTFfTVg0ME5qZ3dNekl5Tkg1LU1UVTVNelk0TXpZek9EWXdNMzV1Y0V4V1lWUlZTbTVIY3k5dVdHWm1NMWxPYTNjelpIVi1mZyZjcmVhdGVfdGltZT0xNTkzNjgzNjYyJm5vbmNlPTAuODAxMzMzMzUxMDQwNzE5NSZyb2xlPXB1Ymxpc2hlciZleHBpcmVfdGltZT0xNTk2Mjc1NjYyJmluaXRpYWxfbGF5b3V0X2NsYXNzX2xpc3Q9', + kSessionId: + '1_MX40NjgwMzIyNH5-MTU5MzY4MzYzODYwM35ucExWYVRVSm5Hcy9uWGZmM1lOa3czZHV-fg', + kApiKey: '46803224', + vcId: 3245, + tokenID: "hfkjshdf347r8743", + generalId: "Cs2020@2016\$2958", + doctorId: 1485, + onFailure: (String error) { + //TODO handling Failure + }, + onCallEnd: () { + //TODO handling onCallEnd + }, + onCallNotRespond: (SessionStatusModel sessionStatusModel) { + //TODO handling onCalcallNotRespondlEnd + }); } String getTimerTime(int start) { diff --git a/lib/util/VideoChannel.dart b/lib/util/VideoChannel.dart index 9f4195af..bf255b54 100644 --- a/lib/util/VideoChannel.dart +++ b/lib/util/VideoChannel.dart @@ -10,7 +10,7 @@ class VideoChannel{ /// channel name static const _channel = const MethodChannel("Dr.cloudSolution/videoCall"); static openVideoCallScreen( - {kApiKey, kSessionId, kToken, callDuration, warningDuration, Function() onCallEnd , Function(SessionStatusModel sessionStatusModel) callNotRespond ,Function(String error) onFailure}) async { + {kApiKey, kSessionId, kToken, callDuration, warningDuration,int vcId,String tokenID,String generalId,int doctorId, Function() onCallEnd , Function(SessionStatusModel sessionStatusModel) onCallNotRespond ,Function(String error) onFailure}) async { var result; try { result = await _channel.invokeMethod( @@ -21,22 +21,21 @@ class VideoChannel{ "kToken": kToken, "appLang": "en", "baseUrl": BASE_URL, - "VC_ID": 3245, - "TokenID": "hfkjshdf347r8743", - "generalId": 'Cs2020@2016\$2958', - "DoctorId": 1485 , + "VC_ID": vcId, + "TokenID": tokenID, + "generalId": generalId, + "DoctorId": doctorId , }, ); if(result['callResponse'] == 'CallEnd') { onCallEnd(); } else { - SessionStatusModel sessionStatusModel = SessionStatusModel.fromJson(Platform.isIOS ?result['sessionStatus'] :json.decode(result['sessionStatus'])); - callNotRespond(sessionStatusModel); + onCallNotRespond(sessionStatusModel); } - } on PlatformException catch (e) { + } catch (e) { onFailure(e.toString()); }