Haroon6138
/
diplomatic-quarter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Excluded change

Browse Source
dev_v3.13.6_voipcall
Sultan khan 1 year ago
parent 0f863cd259
commit abcf82346e
7 changed files with 105 additions and 83 deletions
Show Stats Download Patch File Download Diff File

2
lib/config/config.dart
Unescape Escape View File

@ -19,7 +19,7 @@ var PACKAGES_SHOPPING_CART = '/api/shopping_cart_items';
var PACKAGES_ORDERS = '/api/orders';
var PACKAGES_ORDER_HISTORY = '/api/orders/items';
var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara';
// var BASE_URL = 'http://10.50.100.198:2018/';
// var BASE_URL = 'http://10.50.100.198:4422/';
var BASE_URL = 'https://uat.hmgwebservices.com/';
// var BASE_URL = 'https://hmgwebservices.com/';
// var BASE_URL = 'https://orash.cloudsolutions.com.sa/';

8
lib/models/Authentication/send_activation_request.dart
Unescape Escape View File

@ -28,7 +28,7 @@ class SendActivationRequest {
int responseID;
int status;
int familyRegionID;
bool isPatientExcluded;
SendActivationRequest(
{this.patientMobileNumber,
this.mobileNo,
@ -58,7 +58,9 @@ class SendActivationRequest {
this.healthId,
this.responseID,
this.status,
this.familyRegionID});
this.familyRegionID,
this.isPatientExcluded
});
SendActivationRequest.fromJson(Map<String, dynamic> json) {
patientMobileNumber = json['PatientMobileNumber'];
@ -90,6 +92,7 @@ class SendActivationRequest {
responseID = json['ReponseID'];
status = json['Status'];
familyRegionID = json['FamilyRegionID'];
isPatientExcluded = json['IsPatientExcluded'];
}
Map<String, dynamic> toJson() {
@ -123,6 +126,7 @@ class SendActivationRequest {
data['ResponseID'] = responseID;
data['Status'] = status;
data['FamilyRegionID'] = familyRegionID;
data['IsPatientExcluded'] = isPatientExcluded;
return data;
}
}

41
lib/pages/DrawerPages/family/add-family-member.dart
Unescape Escape View File

@ -161,7 +161,8 @@ class _AddMember extends State<AddMember> {
}
insertFamilyData(addMemberResult) {
sendActivationCode(addMemberResult);
sendActivationCode(addMemberResult, addMemberResult['ShareFamilyFileObj']['IsPatientExcluded']);
// var request = InsertSharePatientFileReq();
// request.responseID = addMemberResult['ShareFamilyFileObj']['ReponseID'];
// request.shareFamilyPatientName = addMemberResult['ShareFamilyFileObj']['SharedPatientName'];
@ -178,13 +179,21 @@ class _AddMember extends State<AddMember> {
// });
}
sendActivationCode(result) {
sendActivationCode(result, bool isExcluded) {
// var request = this.getCommonRequest();
loading(true);
patientShareResponseID = result['ShareFamilyFileObj']['ReponseID'];
familyFileProvider.sendActivationCode(mobileNo, countryCode, nationalIDorFile.text, patientShareResponseID).then((res) => {
patientShareRequestID = res['PatientShareRequestID'],
if (res != null && res['isSMSSent'] == true) {this.startSMSService(1, res)}
familyFileProvider.sendActivationCode(mobileNo, countryCode, nationalIDorFile.text, patientShareResponseID, isExcluded).then((res) {
patientShareRequestID = res['PatientShareRequestID'];
if (res != null && res['isSMSSent'] == true)
{
this.startSMSService(1, res);
}else
{
this.checkActivationCodeExcluded('0000', res);
}
});
}
@ -206,12 +215,19 @@ class _AddMember extends State<AddMember> {
).displayDialog(context);
}
checkActivationCodeExcluded(value, result){
familyFileProvider.checkActivationCode(result['LogInTokenID'], value, nationalIDorFile.text, mobileNo, patientShareRequestID, patientShareResponseID).then((result) {
SMSOTP.hideSMSBox(context);
handleFamilyRequests();
});
}
checkActivationCode(value, result) {
Navigator.pop(context);
GifLoaderDialogUtils.showMyDialog(context);
familyFileProvider.checkActivationCode(result['LogInTokenID'], value, nationalIDorFile.text, mobileNo, patientShareRequestID, patientShareResponseID).then((result) {
SMSOTP.hideSMSBox(context);
handleFamilyRequests(this.patientShareRequestID, 3);
handleFamilyRequests();
}).catchError((err) {
Future.delayed(Duration(seconds: 1), () {
AppToast.showErrorToast(message: err);
@ -220,13 +236,12 @@ class _AddMember extends State<AddMember> {
});
}
handleFamilyRequests(id, stauts) {
// familyFileProvider.acceptAndRejectRecievedRequests(id, stauts).then((result) => {
sharedPref.remove(FAMILY_FILE);
Navigator.of(context).pushNamed(
MY_FAMILIY,
);
// });
handleFamilyRequests() {
Navigator.pop(context);
sharedPref.remove(FAMILY_FILE);
Navigator.of(context).pushNamed(
MY_FAMILIY
);
}
loading(flag) {

8
lib/pages/DrawerPages/family/my-family.dart
Unescape Escape View File

@ -443,7 +443,11 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
Map<String, dynamic> request = {};
request['ID'] = this.userID;
request['IsActive'] = false;
this.familyFileProvider.deativateActivateMemberFile(request).then((value) => refreshFamily(context));
this.familyFileProvider.deativateActivateMemberFile(request).then((value) {
refreshFamily(context);
GifLoaderDialogUtils.hideDialog(context);
});
}
refreshFamily(context) async {
@ -541,6 +545,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
setState(() {
});
}
}
@ -561,6 +566,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
familySharedRecords = await familyFileProvider.getSharedRecordByStatus();
}
sentRecordsList =[];
familySharedRecordsList =[];
familySharedRecords.getAllSharedRecordsByStatusList.forEach((element) {
if (element.status == 3) {
familySharedRecordsList.add(element);

3
lib/services/family_files/family_files_provider.dart
Unescape Escape View File

@ -138,7 +138,7 @@ class FamilyFilesProvider with ChangeNotifier {
}
}
Future<dynamic> sendActivationCode(cellNumber, zipCode, patientIdentificationID, responseID) async {
Future<dynamic> sendActivationCode(cellNumber, zipCode, patientIdentificationID, responseID, bool isExcluded) async {
try {
dynamic localRes;
var request = SendActivationRequest();
@ -152,6 +152,7 @@ class FamilyFilesProvider with ChangeNotifier {
request.responseID = responseID;
request.status = 2;
request.familyRegionID = zipCode == '966' ? 1 : 2;
request.isPatientExcluded = isExcluded;
await new BaseAppClient().post(SEND_FAMILY_FILE_ACTIVATION, onSuccess: (dynamic response, int statusCode) {
localRes = response;
}, onFailure: (String error, int statusCode) {

114
lib/uitl/LocalNotification.dart
Unescape Escape View File

@ -31,24 +31,24 @@ class LocalNotification {
_initialize() async {
try {
var initializationSettingsAndroid = new AndroidInitializationSettings('app_icon');
var initializationSettingsIOS = DarwinInitializationSettings(onDidReceiveLocalNotification: null);
var initializationSettings = InitializationSettings(android: initializationSettingsAndroid, iOS: initializationSettingsIOS);
await flutterLocalNotificationsPlugin.initialize(
initializationSettings,
onDidReceiveNotificationResponse: (NotificationResponse notificationResponse) {
switch (notificationResponse.notificationResponseType) {
case NotificationResponseType.selectedNotification:
// selectNotificationStream.add(notificationResponse.payload);
break;
case NotificationResponseType.selectedNotificationAction:
// if (notificationResponse.actionId == navigationActionId) {
// selectNotificationStream.add(notificationResponse.payload);
// }
break;
}
},
onDidReceiveBackgroundNotificationResponse: notificationTapBackground,
);
// var initializationSettingsIOS = DarwinInitializationSettings(onDidReceiveLocalNotification: null);
// var initializationSettings = InitializationSettings(android: initializationSettingsAndroid, iOS: initializationSettingsIOS);
// await flutterLocalNotificationsPlugin.initialize(
// initializationSettings,
// onDidReceiveNotificationResponse: (NotificationResponse notificationResponse) {
// switch (notificationResponse.notificationResponseType) {
// case NotificationResponseType.selectedNotification:
// // selectNotificationStream.add(notificationResponse.payload);
// break;
// case NotificationResponseType.selectedNotificationAction:
// // if (notificationResponse.actionId == navigationActionId) {
// // selectNotificationStream.add(notificationResponse.payload);
// // }
// break;
// }
// },
// onDidReceiveBackgroundNotificationResponse: notificationTapBackground,
// );
} catch (ex) {}
// flutterLocalNotificationsPlugin.initialize(initializationSettings, onDidReceiveNotificationResponse: (NotificationResponse notificationResponse)
// {
@ -68,16 +68,16 @@ class LocalNotification {
// );
}
void notificationTapBackground(NotificationResponse notificationResponse) {
// ignore: avoid_print
print('notification(${notificationResponse.id}) action tapped: '
'${notificationResponse.actionId} with'
' payload: ${notificationResponse.payload}');
if (notificationResponse.input?.isNotEmpty ?? false) {
// ignore: avoid_print
print('notification action tapped with input: ${notificationResponse.input}');
}
}
// void notificationTapBackground(NotificationResponse notificationResponse) {
// // ignore: avoid_print
// print('notification(${notificationResponse.id}) action tapped: '
// '${notificationResponse.actionId} with'
// ' payload: ${notificationResponse.payload}');
// if (notificationResponse.input?.isNotEmpty ?? false) {
// // ignore: avoid_print
// print('notification action tapped with input: ${notificationResponse.input}');
// }
// }
var _random = new Random();
@ -96,15 +96,15 @@ class LocalNotification {
}
Future showNow({@required String title, @required String subtitle, String payload}) {
Future.delayed(Duration(seconds: 1)).then((result) async {
var androidPlatformChannelSpecifics = AndroidNotificationDetails('com.hmg.local_notification', 'HMG',
channelDescription: 'HMG', importance: Importance.max, priority: Priority.high, ticker: 'ticker', vibrationPattern: _vibrationPattern());
var iOSPlatformChannelSpecifics = DarwinNotificationDetails();
var platformChannelSpecifics = NotificationDetails(android: androidPlatformChannelSpecifics, iOS: iOSPlatformChannelSpecifics);
await flutterLocalNotificationsPlugin.show(_randomNumber(), title, subtitle, platformChannelSpecifics, payload: payload).catchError((err) {
print(err);
});
});
// Future.delayed(Duration(seconds: 1)).then((result) async {
// var androidPlatformChannelSpecifics = AndroidNotificationDetails('com.hmg.local_notification', 'HMG',
// channelDescription: 'HMG', importance: Importance.max, priority: Priority.high, ticker: 'ticker', vibrationPattern: _vibrationPattern());
// var iOSPlatformChannelSpecifics = DarwinNotificationDetails();
// var platformChannelSpecifics = NotificationDetails(android: androidPlatformChannelSpecifics, iOS: iOSPlatformChannelSpecifics);
// await flutterLocalNotificationsPlugin.show(_randomNumber(), title, subtitle, platformChannelSpecifics, payload: payload).catchError((err) {
// print(err);
// });
// });
}
Future scheduleNotification({@required DateTime scheduledNotificationDateTime, @required String title, @required String description}) async {
@ -115,31 +115,31 @@ class LocalNotification {
vibrationPattern[2] = 5000;
vibrationPattern[3] = 2000;
var androidPlatformChannelSpecifics = AndroidNotificationDetails('active-prescriptions', 'ActivePrescriptions',
channelDescription: 'ActivePrescriptionsDescription',
// icon: 'secondary_icon',
sound: RawResourceAndroidNotificationSound('slow_spring_board'),
///change it to be as ionic
// largeIcon: DrawableResourceAndroidBitmap('sample_large_icon'),///change it to be as ionic
vibrationPattern: vibrationPattern,
enableLights: true,
color: const Color.fromARGB(255, 255, 0, 0),
ledColor: const Color.fromARGB(255, 255, 0, 0),
ledOnMs: 1000,
ledOffMs: 500);
var iOSPlatformChannelSpecifics = DarwinNotificationDetails(sound: 'slow_spring_board.aiff');
// var androidPlatformChannelSpecifics = AndroidNotificationDetails('active-prescriptions', 'ActivePrescriptions',
// channelDescription: 'ActivePrescriptionsDescription',
// // icon: 'secondary_icon',
// sound: RawResourceAndroidNotificationSound('slow_spring_board'),
//
// ///change it to be as ionic
// // largeIcon: DrawableResourceAndroidBitmap('sample_large_icon'),///change it to be as ionic
// vibrationPattern: vibrationPattern,
// enableLights: true,
// color: const Color.fromARGB(255, 255, 0, 0),
// ledColor: const Color.fromARGB(255, 255, 0, 0),
// ledOnMs: 1000,
// ledOffMs: 500);
// var iOSPlatformChannelSpecifics = DarwinNotificationDetails(sound: 'slow_spring_board.aiff');
// /change it to be as ionic
var platformChannelSpecifics = NotificationDetails(android: androidPlatformChannelSpecifics, iOS: iOSPlatformChannelSpecifics);
await flutterLocalNotificationsPlugin.schedule(0, title, description, scheduledNotificationDateTime, platformChannelSpecifics);
// var platformChannelSpecifics = NotificationDetails(android: androidPlatformChannelSpecifics, iOS: iOSPlatformChannelSpecifics);
// await flutterLocalNotificationsPlugin.schedule(0, title, description, scheduledNotificationDateTime, platformChannelSpecifics);
}
///Repeat notification every day at approximately 10:00:00 am
Future showDailyAtTime() async {
var time = Time(10, 0, 0);
var androidPlatformChannelSpecifics = AndroidNotificationDetails('repeatDailyAtTime channel id', 'repeatDailyAtTime channel name', channelDescription: 'repeatDailyAtTime description');
var iOSPlatformChannelSpecifics = DarwinNotificationDetails();
// var androidPlatformChannelSpecifics = AndroidNotificationDetails('repeatDailyAtTime channel id', 'repeatDailyAtTime channel name', channelDescription: 'repeatDailyAtTime description');
// var iOSPlatformChannelSpecifics = DarwinNotificationDetails();
// var platformChannelSpecifics = NotificationDetails(
// androidPlatformChannelSpecifics, iOSPlatformChannelSpecifics);
// await flutterLocalNotificationsPlugin.showDailyAtTime(
@ -153,8 +153,8 @@ class LocalNotification {
///Repeat notification weekly on Monday at approximately 10:00:00 am
Future showWeeklyAtDayAndTime() async {
var time = Time(10, 0, 0);
var androidPlatformChannelSpecifics = AndroidNotificationDetails('show weekly channel id', 'show weekly channel name', channelDescription: 'show weekly description');
var iOSPlatformChannelSpecifics = DarwinNotificationDetails();
// var androidPlatformChannelSpecifics = AndroidNotificationDetails('show weekly channel id', 'show weekly channel name', channelDescription: 'show weekly description');
// var iOSPlatformChannelSpecifics = DarwinNotificationDetails();
// var platformChannelSpecifics = NotificationDetails(
// androidPlatformChannelSpecifics, iOSPlatformChannelSpecifics);
// await flutterLocalNotificationsPlugin.showWeeklyAtDayAndTime(

12
lib/uitl/push-notification-handler.dart
Unescape Escape View File

@ -303,10 +303,6 @@ class PushNotificationHandler {
onToken(token);
});
FirebaseMessaging.instance.getAPNSToken().then((value) {
print("Push APNS getToken: " + value);
});
FirebaseMessaging.onBackgroundMessage(backgroundMessageHandler);
}
@ -349,10 +345,10 @@ class PushNotificationHandler {
Future<void> isAndroidPermissionGranted() async {
if (Platform.isAndroid) {
final bool granted = await flutterLocalNotificationsPlugin.resolvePlatformSpecificImplementation<AndroidFlutterLocalNotificationsPlugin>()?.areNotificationsEnabled() ?? false;
if (!granted) {
await requestPermissions();
}
// final bool granted = await flutterLocalNotificationsPlugin.resolvePlatfxormSpecificImplementation<AndroidFlutterLocalNotificationsPlugin>()?.areNotificationsEnabled() ?? false;
// if (!granted) {
// await requestPermissions();
// }
}
}

Write Preview
Loading…
Cancel
Save