From 7152b0d57bee13d19be15fbc3fa720424c67ca0e Mon Sep 17 00:00:00 2001 From: "Aamir.Muhammad" Date: Thu, 19 Jan 2023 11:24:51 +0300 Subject: [PATCH] Chat Fix --- lib/api/chat/chat_api_client.dart | 4 ++-- lib/app_state/app_state.dart | 2 +- lib/classes/notifications.dart | 22 ++++++++++------------ lib/ui/chat/chat_detailed_screen.dart | 1 - pubspec.yaml | 4 ++-- 5 files changed, 15 insertions(+), 18 deletions(-) diff --git a/lib/api/chat/chat_api_client.dart b/lib/api/chat/chat_api_client.dart index efd7af9..b525efd 100644 --- a/lib/api/chat/chat_api_client.dart +++ b/lib/api/chat/chat_api_client.dart @@ -38,8 +38,8 @@ class ChatApiClient { print({ "employeeNumber": AppState().memberInformationList!.eMPLOYEENUMBER.toString(), "password": "FxIu26rWIKoF8n6mpbOmAjDLphzFGmpG", - "isMobile": true, - "deviceToken": AppState().deviceNotificationToken + // "isMobile": true, + // "deviceToken": AppState().deviceNotificationToken }); if (!kReleaseMode) { logger.i("login-res: " + response.body); diff --git a/lib/app_state/app_state.dart b/lib/app_state/app_state.dart index 8d09d2d..4a2bd7e 100644 --- a/lib/app_state/app_state.dart +++ b/lib/app_state/app_state.dart @@ -70,7 +70,7 @@ class AppState { bool get getIsDemoMarathon => _isDemoMarathon; - final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 31, versionID: 3.8, mobileType: Platform.isAndroid ? "android" : "ios"); + final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 31, versionID: 3.9, mobileType: Platform.isAndroid ? "android" : "ios"); void setPostParamsInitConfig() { isAuthenticated = false; diff --git a/lib/classes/notifications.dart b/lib/classes/notifications.dart index 26bb70d..649b757 100644 --- a/lib/classes/notifications.dart +++ b/lib/classes/notifications.dart @@ -1,13 +1,11 @@ import 'dart:convert'; import 'dart:io'; - import 'package:firebase_messaging/firebase_messaging.dart'; -import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:mohem_flutter_app/app_state/app_state.dart'; import 'package:mohem_flutter_app/main.dart'; import 'package:permission_handler/permission_handler.dart'; -final FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin(); +//final FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin(); class AppNotifications { @@ -19,21 +17,21 @@ class AppNotifications { Future requestPermissions() async { if (Platform.isIOS) { - await flutterLocalNotificationsPlugin.resolvePlatformSpecificImplementation()?.requestPermissions(alert: true, badge: true, sound: true); + // await flutterLocalNotificationsPlugin.resolvePlatformSpecificImplementation()?.requestPermissions(alert: true, badge: true, sound: true); } else if (Platform.isAndroid) { - AndroidFlutterLocalNotificationsPlugin? androidImplementation = flutterLocalNotificationsPlugin.resolvePlatformSpecificImplementation(); - bool? granted = await androidImplementation?.requestPermission(); - if (granted == false) { - print("-------------------- Permission Granted ------------------------"); - print(granted); - await Permission.notification.request(); - } + // AndroidFlutterLocalNotificationsPlugin? androidImplementation = flutterLocalNotificationsPlugin.resolvePlatformSpecificImplementation(); + // bool? granted = await androidImplementation?.requestPermission(); + // if (granted == false) { + // print("-------------------- Permission Granted ------------------------"); + // print(granted); + // await Permission.notification.request(); + // } } } Future isAndroidPermGranted() async { if (Platform.isAndroid) { - bool granted = await flutterLocalNotificationsPlugin.resolvePlatformSpecificImplementation()?.areNotificationsEnabled() ?? false; + // bool granted = await flutterLocalNotificationsPlugin.resolvePlatformSpecificImplementation()?.areNotificationsEnabled() ?? false; } } diff --git a/lib/ui/chat/chat_detailed_screen.dart b/lib/ui/chat/chat_detailed_screen.dart index 1bbae82..da547cf 100644 --- a/lib/ui/chat/chat_detailed_screen.dart +++ b/lib/ui/chat/chat_detailed_screen.dart @@ -277,7 +277,6 @@ class _ChatDetailScreenState extends State { ), onChanged: (String val) { m.inputBoxDirection(val); - m.userTypingInvoke(currentUser: AppState().chatDetails!.response!.id!, reciptUser: params!.chatUser!.id!); }, ).expanded, diff --git a/pubspec.yaml b/pubspec.yaml index 6f277f5..c343421 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -92,7 +92,7 @@ dependencies: swipe_to: ^1.0.2 flutter_webrtc: ^0.9.16 camera: ^0.10.0+4 - flutter_local_notifications: any + #flutter_local_notifications: any #Chat Voice Message Recoding & Play audio_waveforms: ^0.1.5+1 @@ -108,7 +108,7 @@ dependencies: dependency_overrides: - firebase_core_platform_interface: 4.5.1 + #firebase_core_platform_interface: 4.5.1 dev_dependencies: