diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index bf0d3766..0ac76ea8 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -40,6 +40,9 @@
+
+
+
60dp
54dp
- 52dp
+ 48dp
24dp
@@ -33,9 +33,15 @@
4dp
- 8sp
+ 8dp
16dp
24dp
+ 36dp
+ 60dp
+ 80dp
+ 40dp
+
+
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index e13b5b14..dae5749f 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -1,10 +1,12 @@
+
+
@@ -25,12 +27,17 @@
- true
- - true
+ - true
+ - true
+ - false
- @null
- match_parent
- match_parent
+
+ - @android:style/Animation.Dialog
+
diff --git a/lib/core/service/VideoCallService.dart b/lib/core/service/VideoCallService.dart
index a685c697..dcc31b71 100644
--- a/lib/core/service/VideoCallService.dart
+++ b/lib/core/service/VideoCallService.dart
@@ -22,20 +22,19 @@ class VideoCallService extends BaseService {
LiveCarePatientServices _liveCarePatientServices =
locator();
- openVideo(
- StartCallRes startModel,
- PatiantInformtion patientModel,
- bool isRecording,
- VoidCallback onCallConnected,
- VoidCallback onCallDisconnected) async {
+ openVideo(StartCallRes startModel, PatiantInformtion patientModel,
+ bool isRecording,VoidCallback onCallConnected, VoidCallback onCallDisconnected) async {
this.startCallRes = startModel;
this.patient = patientModel;
DoctorProfileModel doctorProfile =
await getDoctorProfile(isGetProfile: true);
await VideoChannel.openVideoCallScreen(
- kToken: startCallRes.openTokenID,//"T1==cGFydG5lcl9pZD00NzI0Nzk1NCZzaWc9NGIyZDljOTY3YjFiNWU1YzUzNzFmMjIyNjJmNmEzY2Y5NzZjOTdlYzpzZXNzaW9uX2lkPTFfTVg0ME56STBOemsxTkg1LU1UWXlNekEyTlRRMU9EVXhObjVrVFRoMFlVdFJXaXRYTWpadFZGZHFhSGxZVGpOdE1UVi1mZyZjcmVhdGVfdGltZT0xNjIzMDY1NDk1Jm5vbmNlPTAuMjM2Mjk0NTIwMTkyOTA4OTcmcm9sZT1wdWJsaXNoZXImZXhwaXJlX3RpbWU9MTYyNTY1NzQ5NCZpbml0aWFsX2xheW91dF9jbGFzc19saXN0PQ==",
- kSessionId: startCallRes.openSessionID,// "1_MX40NzI0Nzk1NH5-MTYyMzA2NTQ1ODUxNn5kTTh0YUtRWitXMjZtVFdqaHlYTjNtMTV-fg",
- kApiKey: '46209962' ,// '47247954'
+ kToken: startCallRes.openTokenID,
+ kSessionId: startCallRes.openSessionID,
+ kApiKey:'46209962',
+ // kToken: "T1==cGFydG5lcl9pZD00NzI0Nzk1NCZzaWc9NGIyZDljOTY3YjFiNWU1YzUzNzFmMjIyNjJmNmEzY2Y5NzZjOTdlYzpzZXNzaW9uX2lkPTFfTVg0ME56STBOemsxTkg1LU1UWXlNekEyTlRRMU9EVXhObjVrVFRoMFlVdFJXaXRYTWpadFZGZHFhSGxZVGpOdE1UVi1mZyZjcmVhdGVfdGltZT0xNjIzMDY1NDk1Jm5vbmNlPTAuMjM2Mjk0NTIwMTkyOTA4OTcmcm9sZT1wdWJsaXNoZXImZXhwaXJlX3RpbWU9MTYyNTY1NzQ5NCZpbml0aWFsX2xheW91dF9jbGFzc19saXN0PQ==",
+ // kSessionId: "1_MX40NzI0Nzk1NH5-MTYyMzA2NTQ1ODUxNn5kTTh0YUtRWitXMjZtVFdqaHlYTjNtMTV-fg",
+ // kApiKey:'47247954',
vcId: patient.vcId,
isRecording: isRecording,
patientName: patient.fullName ??
diff --git a/lib/core/viewModel/authentication_view_model.dart b/lib/core/viewModel/authentication_view_model.dart
index 9da1933a..cae415da 100644
--- a/lib/core/viewModel/authentication_view_model.dart
+++ b/lib/core/viewModel/authentication_view_model.dart
@@ -255,7 +255,7 @@ class AuthenticationViewModel extends BaseViewModel {
/// add token to shared preferences in case of send activation code is success
setDataAfterSendActivationSuccess(SendActivationCodeForDoctorAppResponseModel sendActivationCodeForDoctorAppResponseModel) {
print("VerificationCode : " + sendActivationCodeForDoctorAppResponseModel.verificationCode);
- // DrAppToastMsg.showSuccesToast("VerificationCode : " + sendActivationCodeForDoctorAppResponseModel.verificationCode);
+ // DrAppToastMsg.showSuccesToast("_VerificationCode_ : " + sendActivationCodeForDoctorAppResponseModel.verificationCode);
sharedPref.setString(VIDA_AUTH_TOKEN_ID,
sendActivationCodeForDoctorAppResponseModel.vidaAuthTokenID);
sharedPref.setString(VIDA_REFRESH_TOKEN_ID,
diff --git a/lib/screens/live_care/live_care_patient_screen.dart b/lib/screens/live_care/live_care_patient_screen.dart
index d98e1701..12c8caff 100644
--- a/lib/screens/live_care/live_care_patient_screen.dart
+++ b/lib/screens/live_care/live_care_patient_screen.dart
@@ -2,19 +2,23 @@ import 'dart:async';
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/service/VideoCallService.dart';
import 'package:doctor_app_flutter/core/viewModel/LiveCarePatientViewModel.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart';
+import 'package:doctor_app_flutter/util/NotificationPermissionUtils.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/patient_card/PatientCard.dart';
import 'package:doctor_app_flutter/widgets/shared/app_loader_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
+import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/errors/error_message.dart';
import 'package:doctor_app_flutter/widgets/shared/text_fields/app_text_form_field.dart';
import 'package:flutter/material.dart';
+import '../../locator.dart';
import '../../routes.dart';
class LiveCarePatientScreen extends StatefulWidget {
@@ -169,9 +173,31 @@ class _LiveCarePatientScreenState extends State {
child: AppLoaderWidget(
containerColor: Colors.transparent,
)),
+ // AppButton(
+ // fontWeight: FontWeight.w700,
+ // color:Colors.green[600],
+ // title: TranslationBase.of(context).initiateCall,
+ // disabled: model.state == ViewState.BusyLocal,
+ // onPressed: () async {
+ // AppPermissionsUtils.requestVideoCallPermission(context: context,onTapGrant: (){
+ // locator().openVideo(model.startCallRes, PatiantInformtion(
+ // vcId: 454353,
+ // fullName: "test mosa"
+ // ), callConnected, callDisconnected);
+ // });
+ //
+ // },
+ // ),
],
),
),
);
}
+
+ callConnected(){
+
+ }
+
+ callDisconnected(){
+ }
}
diff --git a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
index 1674e5e8..d8410da1 100644
--- a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
+++ b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
@@ -301,6 +301,17 @@ class _PatientProfileScreenState extends State with Single
: TranslationBase.of(context).initiateCall,
disabled: isCallStarted || model.state == ViewState.BusyLocal,
onPressed: () async {
+ // AppPermissionsUtils
+ // .requestVideoCallPermission(
+ // context: context,
+ // onTapGrant: () {
+ // locator()
+ // .openVideo(
+ // model.startCallRes,
+ // patient,
+ // false, callConnected, // model.startCallRes.isRecording
+ // callDisconnected);
+ // });
if (isCallFinished) {
Navigator.push(
context,
@@ -338,7 +349,8 @@ class _PatientProfileScreenState extends State with Single
.openVideo(
model.startCallRes,
patient,
- model.startCallRes.isRecording, callConnected,
+ /*model.startCallRes != null ? model.startCallRes.isRecording : */ true
+ , callConnected,
callDisconnected);
});
}