feat(video_calls, welcome_screen): ios mic fix, welcome scrin layoute fix

This commit is contained in:
misha
2026-09-28 11:20:52 +03:00
parent ae4f9d2e9b
commit 2dce28b196
17 changed files with 3303 additions and 1537 deletions

View File

@@ -40,11 +40,18 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
void Function(bool isOnline)? _presenceOnlineListener;
var uuid = const Uuid();
ChatRoomCubit({required this.chatRepository, required this.wsManager, required this.cardsRepository}) : super(const ChatRoomState.loading());
ChatRoomCubit({
required this.chatRepository,
required this.wsManager,
required this.cardsRepository,
}) : super(const ChatRoomState.loading());
void setTimer() {
_timer?.cancel();
_timer = Timer.periodic(const Duration(seconds: 5), (_) => updateChosenPlanState());
_timer = Timer.periodic(
const Duration(seconds: 5),
(_) => updateChosenPlanState(),
);
}
void cancelTimer() {
@@ -58,13 +65,19 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
_emitLoaded((current) => current.copyWith(isLoading: isLoading));
try {
final chatMessages = await chatRepository.getChatMessages(uuid, currentPage + 1);
final chatMessages = await chatRepository.getChatMessages(
uuid,
currentPage + 1,
);
isLoading = false;
_emitLoaded(
(current) => current.copyWith(
isLoading: isLoading,
chatMessages: [...current.chatMessages, ...chatMessages.messagesList],
chatMessages: [
...current.chatMessages,
...chatMessages.messagesList,
],
),
);
@@ -98,7 +111,11 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
/// `GET /api/consultation/resolve/order_id_to_conversation/{orderId}`.
///
/// Возвращает conversation uuid, которым инициализировали чат (для reload без повторного resolve).
Future<String?> initChat(String? uuid, {String? orderId, bool sendInitialMessage = false}) async {
Future<String?> initChat(
String? uuid, {
String? orderId,
bool sendInitialMessage = false,
}) async {
try {
emit(const ChatRoomState.loading());
@@ -106,7 +123,9 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
int? resolvedChosenPlanId;
if (orderId != null && orderId.isNotEmpty) {
final resolved = await chatRepository.resolveOrderIdToConversation(orderId: orderId);
final resolved = await chatRepository.resolveOrderIdToConversation(
orderId: orderId,
);
resolvedUuid = resolved.conversationUuid;
resolvedChosenPlanId = resolved.chosenPlanId;
}
@@ -117,6 +136,7 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
currentPage = 1;
isLoading = false;
_activeChatUuid = resolvedUuid;
final chatRoom = await chatRepository.getChatRoom(resolvedUuid);
ChosenPlanModel? chosenPlan;
@@ -124,7 +144,10 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
if (planId != null) {
chosenPlan = await chatRepository.getChosenPlan(id: planId);
}
final chatMessages = await chatRepository.getChatMessages(resolvedUuid, currentPage);
final chatMessages = await chatRepository.getChatMessages(
resolvedUuid,
currentPage,
);
lastPage = chatMessages.meta.lastPage;
await _subscribeToChatChannel(uuid: resolvedUuid, chatId: chatRoom.id);
_listenToReconnect();
@@ -177,7 +200,9 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
final page = await chatRepository.getChatMessages(uuid, 1);
lastPage = page.meta.lastPage;
_emitLoaded((current) {
final byId = {for (final message in current.chatMessages) message.id: message};
final byId = {
for (final message in current.chatMessages) message.id: message,
};
for (final message in page.messagesList) {
byId.putIfAbsent(message.id, () => message);
}
@@ -190,6 +215,50 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
}
}
/// Перезагружает сообщения, комнату и состояние плана без экрана загрузки.
Future<void> refreshChat() async {
final uuid = _activeChatUuid;
if (uuid == null || uuid.isEmpty) {
return;
}
final currentState = state;
if (currentState is! ChatRoomStateLoaded) {
return;
}
try {
currentPage = 1;
isLoading = false;
final chatRoom = await chatRepository.getChatRoom(uuid);
ChosenPlanModel? chosenPlan;
final planId =
chatRoom.chosenPlanId ?? currentState.chatRoom.chosenPlanId;
if (planId != null) {
chosenPlan = await chatRepository.getChosenPlan(id: planId);
}
final chatMessages = await chatRepository.getChatMessages(
uuid,
currentPage,
);
lastPage = chatMessages.meta.lastPage;
_emitLoaded(
(latest) => latest.copyWith(
chatRoom: chatRoom.copyWith(chosenPlan: chosenPlan),
chatMessages: chatMessages.messagesList,
isLoading: false,
),
);
if (chosenPlan?.consultantId == chatRoom.users.sender.id) {
await checkCards();
}
} catch (e, st) {
await reportFrom(e, st, this);
}
}
Future<void> updateChosenPlanState() async {
try {
final currentState = state;
@@ -213,9 +282,16 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
final planId = (state as ChatRoomStateLoaded).chatRoom.chosenPlanId;
if (planId == null) return false;
final stringDate = date.format('yyyy-MM-dd');
await chatRepository.choseStartPlanDate(id: planId, date: {'start_date': stringDate});
await chatRepository.choseStartPlanDate(
id: planId,
date: {'start_date': stringDate},
);
final chosenPlan = await chatRepository.getChosenPlan(id: planId);
emit((state as ChatRoomStateLoaded).copyWith.chatRoom(chosenPlan: chosenPlan));
emit(
(state as ChatRoomStateLoaded).copyWith.chatRoom(
chosenPlan: chosenPlan,
),
);
return true;
} catch (e, st) {
await reportFrom(e, st, this);
@@ -224,7 +300,10 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
}
}
Future<void> cancelChosenPlan({required String chatId, required int planId}) async {
Future<void> cancelChosenPlan({
required String chatId,
required int planId,
}) async {
try {
await chatRepository.cancelChosenPlan(id: planId);
emit((state as ChatRoomStateLoaded).copyWith.chatRoom(chosenPlan: null));
@@ -234,7 +313,9 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
}
}
bool _emitLoaded(ChatRoomStateLoaded Function(ChatRoomStateLoaded current) update) {
bool _emitLoaded(
ChatRoomStateLoaded Function(ChatRoomStateLoaded current) update,
) {
if (isClosed) {
return false;
}
@@ -246,7 +327,10 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
return true;
}
Future<void> _subscribeToChatChannel({required String uuid, required String chatId}) async {
Future<void> _subscribeToChatChannel({
required String uuid,
required String chatId,
}) async {
// Активный чат запоминаем до проверки клиента: он нужен и для догрузки
// пропущенного после реконнекта (S5), даже если сокет появится позже.
_activeChatUuid = uuid;
@@ -266,18 +350,26 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
);
typingSubscription = wsManager.clientTypingStream?.listen((event) {
_emitLoaded((current) => current.copyWith(isTyping: true, isLoading: isLoading));
_emitLoaded(
(current) => current.copyWith(isTyping: true, isLoading: isLoading),
);
EasyDebounce.debounce(
'client-typing',
const Duration(seconds: 3),
() => _emitLoaded((current) => current.copyWith(isTyping: false, isLoading: isLoading)),
() => _emitLoaded(
(current) => current.copyWith(isTyping: false, isLoading: isLoading),
),
);
});
}
void _onDirectChatEvent(ChannelReadEvent event) {
try {
if (addIncomingMessage(ChatMessageModel.fromJson(jsonDecode(event.data) as Map<String, dynamic>))) {
if (addIncomingMessage(
ChatMessageModel.fromJson(
jsonDecode(event.data) as Map<String, dynamic>,
),
)) {
unawaited(_playIncomingSound());
}
} catch (e, st) {
@@ -305,7 +397,6 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
if (currentState is! ChatRoomStateLoaded) {
return false;
}
final currentUserId = wsManager.userId;
final isOwn = currentUserId != null && message.authorId == currentUserId;
@@ -321,7 +412,11 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
}
final added = _emitLoaded((current) {
if (current.chatMessages.any((existing) => message.id != 0 && existing.id == message.id)) {
if (current.chatMessages.any(
(existing) =>
(message.id != 0 && existing.id == message.id) ||
(message.uuid != null && existing.uuid == message.uuid),
)) {
return current;
}
return current.copyWith(
@@ -352,12 +447,15 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
await wsManager.initPresenceDirectChatChannel(chatId);
_presenceOnlineListener = (isOnline) {
unawaited(_handleCounterpartOnlineChanged(
counterpartField: counterpart.id == currentState.chatRoom.users.receiver.id
? _ChatCounterpartField.receiver
: _ChatCounterpartField.sender,
isOnline: isOnline,
));
unawaited(
_handleCounterpartOnlineChanged(
counterpartField:
counterpart.id == currentState.chatRoom.users.receiver.id
? _ChatCounterpartField.receiver
: _ChatCounterpartField.sender,
isOnline: isOnline,
),
);
};
wsManager.addPresenceDirectChatListener(
counterpartUserId: counterpart.id,
@@ -376,7 +474,8 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
? currentState.chatRoom.users.receiver
: currentState.chatRoom.users.sender;
if (counterpart.isOnline == isOnline && (isOnline || counterpart.lastSeenText.isNotEmpty)) {
if (counterpart.isOnline == isOnline &&
(isOnline || counterpart.lastSeenText.isNotEmpty)) {
return;
}
@@ -453,10 +552,16 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
);
}
Future<bool> sendMessage({String? data, List<File>? files, required String userSlug}) async {
Future<bool> sendMessage({
String? data,
List<File>? files,
required String userSlug,
}) async {
try {
final messageUuid = uuid.v4();
final compressedFiles = files != null ? await ImageCompressUtility.compressFilesList(List<File>.from(files)) : null;
final compressedFiles = files != null
? await ImageCompressUtility.compressFilesList(List<File>.from(files))
: null;
try {
unawaited(AudioPlayer().play(AssetSource('audio/send_message.wav')));
} catch (_) {}
@@ -482,8 +587,15 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
);
try {
final serverMessage = await chatRepository.sendMessage(data: data, files: compressedFiles, slug: userSlug);
_replaceOptimisticMessage(messageUuid: messageUuid, serverMessage: serverMessage);
final serverMessage = await chatRepository.sendMessage(
data: data,
files: compressedFiles,
slug: userSlug,
);
_replaceOptimisticMessage(
messageUuid: messageUuid,
serverMessage: serverMessage,
);
} catch (e, st) {
await reportFrom(e, st, this);
_emitLoaded(
@@ -516,7 +628,11 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
_emitLoaded(
(current) => current.copyWith(
chatMessages: current.chatMessages
.map((message) => idSet.contains(message.id) ? message.copyWith(isRead: true) : message)
.map(
(message) => idSet.contains(message.id)
? message.copyWith(isRead: true)
: message,
)
.toList(),
),
);
@@ -538,17 +654,26 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
messageState: MessageState.sent,
isCurrentUserAuthor: true,
);
final withoutDuplicate = current.chatMessages.where((message) => message.id != serverMessage.id || message.uuid == messageUuid);
final hasOptimistic = withoutDuplicate.any((message) => message.uuid == messageUuid);
final withoutDuplicate = current.chatMessages.where(
(message) =>
message.id != serverMessage.id || message.uuid == messageUuid,
);
final hasOptimistic = withoutDuplicate.any(
(message) => message.uuid == messageUuid,
);
if (!hasOptimistic) {
return current.copyWith(chatMessages: [sentMessage, ...withoutDuplicate]);
return current.copyWith(
chatMessages: [sentMessage, ...withoutDuplicate],
);
}
return current.copyWith(
chatMessages: withoutDuplicate.map((elem) {
if (elem.uuid == messageUuid) {
return sentMessage.copyWith(
isRead: elem.isRead,
roomId: elem.roomId?.isNotEmpty == true ? elem.roomId : serverMessage.roomId,
roomId: elem.roomId?.isNotEmpty == true
? elem.roomId
: serverMessage.roomId,
);
}
return elem;
@@ -561,7 +686,10 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
try {
final planId = (state as ChatRoomStateLoaded).chatRoom.chosenPlan?.id;
if (planId == null) return null;
final paymentModel = await chatRepository.getPaymentLink(id: planId, paymentProvider: 'alfa-bank');
final paymentModel = await chatRepository.getPaymentLink(
id: planId,
paymentProvider: 'alfa-bank',
);
return paymentModel.paymentUrl;
} catch (e, st) {
await reportFrom(e, st, this);
@@ -618,18 +746,31 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
void deleteMessage(String uuid) {
final currentState = state;
if (currentState is ChatRoomStateLoaded) {
emit(currentState.copyWith(chatMessages: currentState.chatMessages.where((message) => message.uuid != uuid).toList()));
emit(
currentState.copyWith(
chatMessages: currentState.chatMessages
.where((message) => message.uuid != uuid)
.toList(),
),
);
}
}
Future<void> resendMessage({required String uuid, required String userSlug}) async {
Future<void> resendMessage({
required String uuid,
required String userSlug,
}) async {
final currentState = state;
if (currentState is ChatRoomStateLoaded) {
final message = currentState.chatMessages.firstWhereOrNull((message) => message.uuid == uuid);
final message = currentState.chatMessages.firstWhereOrNull(
(message) => message.uuid == uuid,
);
if (message != null) {
try {
try {
unawaited(AudioPlayer().play(AssetSource('audio/send_message.wav')));
unawaited(
AudioPlayer().play(AssetSource('audio/send_message.wav')),
);
} catch (_) {}
List<File>? filesToResend;
@@ -661,8 +802,15 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
);
try {
final serverMessage = await chatRepository.sendMessage(data: message.data, files: filesToResend, slug: userSlug);
_replaceOptimisticMessage(messageUuid: uuid, serverMessage: serverMessage);
final serverMessage = await chatRepository.sendMessage(
data: message.data,
files: filesToResend,
slug: userSlug,
);
_replaceOptimisticMessage(
messageUuid: uuid,
serverMessage: serverMessage,
);
} catch (e, st) {
await reportFrom(e, st, this);
_emitLoaded(