Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into end_call_fixes

merge-requests/737/head
Elham Rababah 5 years ago
commit 0e513ecca8

@ -9,12 +9,19 @@
additional functionality it is fine to subclass or reimplement additional functionality it is fine to subclass or reimplement
FlutterApplication and put your custom class here. FlutterApplication and put your custom class here.
--> -->
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.CALL_PHONE" /> <uses-permission android:name="android.permission.CALL_PHONE" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<uses-feature android:name="android.hardware.camera" />
<uses-feature android:name="android.hardware.camera.autofocus" />
<application <application
android:name="io.flutter.app.FlutterApplication" android:name="io.flutter.app.FlutterApplication"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"

@ -190,11 +190,7 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
private void hiddenButtons() { private void hiddenButtons() {
mVolHandler = new Handler(); mVolHandler = new Handler();
mVolRunnable = new Runnable() { mVolRunnable = () -> controlPanel.setVisibility(View.GONE);
public void run() {
controlPanel.setVisibility(View.GONE);
}
};
mVolHandler.postDelayed(mVolRunnable, 5 * 1000); mVolHandler.postDelayed(mVolRunnable, 5 * 1000);
} }
@ -269,8 +265,8 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
public void onError(Session session, OpentokError opentokError) { public void onError(Session session, OpentokError opentokError) {
Log.d(TAG, "onError: Error (" + opentokError.getMessage() + ") in session " + session.getSessionId()); Log.d(TAG, "onError: Error (" + opentokError.getMessage() + ") in session " + session.getSessionId());
Toast.makeText(this, "Session error. See the logcat please.", Toast.LENGTH_LONG).show(); // Toast.makeText(this, "Session error. See the logcat please.", Toast.LENGTH_LONG).show();
finish(); //finish();
} }
@Override @Override
@ -282,6 +278,8 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
} }
isConnected = true; isConnected = true;
subscribeToStream(stream); subscribeToStream(stream);
if(mConnectedHandler!=null && mConnectedRunnable!=null)
mConnectedHandler.removeCallbacks(mConnectedRunnable);
videoCallPresenter.callChangeCallStatus(new ChangeCallStatusRequestModel(3,sessionStatusModel.getDoctorId(), sessionStatusModel.getGeneralid(),token,sessionStatusModel.getVCID())); videoCallPresenter.callChangeCallStatus(new ChangeCallStatusRequestModel(3,sessionStatusModel.getDoctorId(), sessionStatusModel.getGeneralid(),token,sessionStatusModel.getVCID()));
} }
@ -315,8 +313,8 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
public void onError(PublisherKit publisherKit, OpentokError opentokError) { public void onError(PublisherKit publisherKit, OpentokError opentokError) {
Log.d(TAG, "onError: Error (" + opentokError.getMessage() + ") in publisher"); Log.d(TAG, "onError: Error (" + opentokError.getMessage() + ") in publisher");
Toast.makeText(this, "Session error. See the logcat please.", Toast.LENGTH_LONG).show(); // Toast.makeText(this, "onError: Error (" + opentokError.getMessage() + ") in publisher", Toast.LENGTH_LONG).show();
finish(); // finish();
} }
@Override @Override
@ -427,6 +425,10 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
returnIntent.putExtra("sessionStatusNotRespond", sessionStatusModel); returnIntent.putExtra("sessionStatusNotRespond", sessionStatusModel);
setResult(Activity.RESULT_OK, returnIntent); setResult(Activity.RESULT_OK, returnIntent);
finish(); finish();
} else if( sessionStatusModel.getSessionStatus() == 4 ){
isConnected = true;
if(mConnectedHandler!=null && mConnectedRunnable!=null)
mConnectedHandler.removeCallbacks(mConnectedRunnable);
} }
} }

@ -58,7 +58,7 @@ class _AddReplayOnReferralPatientState
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
BottomSheetTitle(title: 'Replay'), BottomSheetTitle(title: 'Reply'),
SizedBox( SizedBox(
height: 10.0, height: 10.0,
), ),
@ -70,7 +70,7 @@ class _AddReplayOnReferralPatientState
Stack( Stack(
children: [ children: [
AppTextFieldCustom( AppTextFieldCustom(
hintText: 'Replay your responses here', hintText: 'Reply your responses here',
controller: replayOnReferralController, controller: replayOnReferralController,
maxLines: 35, maxLines: 35,
minLines: 25, minLines: 25,
@ -128,7 +128,7 @@ class _AddReplayOnReferralPatientState
Container( Container(
margin: EdgeInsets.all(5), margin: EdgeInsets.all(5),
child: AppButton( child: AppButton(
title: 'Submit Replay', title: 'Submit Reply',
color: Color(0xff359846), color: Color(0xff359846),
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
onPressed: () async { onPressed: () async {
@ -147,12 +147,12 @@ class _AddReplayOnReferralPatientState
} else { } else {
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
DrAppToastMsg.showSuccesToast( DrAppToastMsg.showSuccesToast(
"Your Replay Added Successfully"); "Your Reply Added Successfully");
Navigator.of(context).pop(); Navigator.of(context).pop();
Navigator.of(context).pop(); Navigator.of(context).pop();
} }
} else { } else {
Helpers.showErrorToast("You can't add empty replay"); Helpers.showErrorToast("You can't add empty reply");
setState(() { setState(() {
isSubmitted = false; isSubmitted = false;
}); });

Loading…
Cancel
Save