From 257aaed5e2bd5a6478031cf9dc6cff0b3124a3ce Mon Sep 17 00:00:00 2001 From: Equilibrium ITO Date: Mon, 1 Apr 2024 15:59:08 +0100 Subject: [PATCH 1/2] cropp bug solved --- .../new-publication/new-publication.page.ts | 28 ++++--------------- .../new-publication/new-publication.page.ts | 2 +- 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts index 0cb908bc5..57ee012cc 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -787,18 +787,8 @@ export class NewPublicationPage implements OnInit { try { console.log('shared base', content.data) - - const newAttachment = new PublicationAttachmentEntity( - { - base64: this.removeTextBeforeSlash(content.data, ','), - extension: FileExtension, - FileType: this.checkFileType.checkFileType(FileExtension) as any, - OriginalFileName: 'shared' - } - ) - - - this.PublicationFromMvService.form.Files.push(newAttachment) + this.capturedImage = 'data:image/jpeg;base64,' + this.removeTextBeforeSlash(content.data, ','); + this.showCroppModal() } catch (error) { console.log('error shared filesystem', error) } @@ -824,7 +814,7 @@ export class NewPublicationPage implements OnInit { const newAttachment = new PublicationAttachmentEntity( { - base64: 'data:video/mp4;base64,' + this.removeTextBeforeSlash(content.data, ','), + base64: content.data, extension: 'mp4', FileType: this.checkFileType.checkFileType('mp4') as any, OriginalFileName: 'shared' @@ -864,16 +854,8 @@ export class NewPublicationPage implements OnInit { Filesystem.readFile({ path: resultUrl }).then(async (content) => { try { if (this.checkFileType.checkFileType(FileExtension) == 'image') { - let newAttachment = new PublicationAttachmentEntity( - { - base64: 'data:image/jpeg;base64,' + this.removeTextBeforeSlash(content.data, ','), - extension: FileExtension, - FileType: this.checkFileType.checkFileType(FileExtension) as any, - OriginalFileName: 'shared' - } - ) - - this.PublicationFromMvService.form.Files.push(newAttachment) + this.capturedImage = 'data:image/jpeg;base64,' + this.removeTextBeforeSlash(content.data, ','); + this.showCroppModal() } else if (this.checkFileType.checkFileType(FileExtension) == 'video') { diff --git a/src/app/shared/publication/new-publication/new-publication.page.ts b/src/app/shared/publication/new-publication/new-publication.page.ts index 95363685d..7b11b0168 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.ts +++ b/src/app/shared/publication/new-publication/new-publication.page.ts @@ -240,7 +240,7 @@ export class NewPublicationPage implements OnInit { this.convertBlobToBase64(blobFile.blob).then((value: string) => { this.filesSizeSum = this.filesSizeSum + blobFile.size - this.capturedImage = this.removeTextBeforeSlash(value, ','), + this.capturedImage = 'data:image/jpeg;base64,' + this.removeTextBeforeSlash(value, ','), this.showCroppModal(); this.filecontent = true; From 4e886855ad5c47861a9bf92938331bd8a238fdf6 Mon Sep 17 00:00:00 2001 From: Equilibrium ITO Date: Tue, 2 Apr 2024 11:11:55 +0100 Subject: [PATCH 2/2] close modal when time bomb group come to a end --- src/app/services/chat/chat-system.service.ts | 6 ++++-- src/app/services/chat/room.service.ts | 14 ++++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/app/services/chat/chat-system.service.ts b/src/app/services/chat/chat-system.service.ts index f7b2089d0..594c5e7c4 100644 --- a/src/app/services/chat/chat-system.service.ts +++ b/src/app/services/chat/chat-system.service.ts @@ -6,7 +6,7 @@ import { SessionStore } from 'src/app/store/session.service'; import { capitalizeTxt } from 'src/plugin/text'; import { Update as room } from 'src/app/models/chatMethod'; import { Storage } from '@ionic/storage'; -import { Platform } from '@ionic/angular'; +import { ModalController, NavController, Platform } from '@ionic/angular'; import { SqliteService } from 'src/app/services/sqlite.service'; import { ChatService } from 'src/app/services/chat.service'; import { NativeNotificationService } from 'src/app/services/native-notification.service'; @@ -68,6 +68,8 @@ export class ChatSystemService { private NetworkServiceService: NetworkServiceService, private ViewedMessageService: ViewedMessageService, private notificationService: NotificationsService, + private modalController: ModalController, + private navController: NavController ) { @@ -482,7 +484,7 @@ export class ChatSystemService { if (setData.name != 'Rocket Cat' && setData.name != 'general' && chat == false) { // create room if (!this.roomExist(roomId)) { - let room: RoomService = new RoomService(this.RochetChatConnectorService, new MessageService(this.NfService, this.RochetChatConnectorService, this.ChatMethodsService, this.AESEncrypt, this.AttachmentsService, this.NetworkServiceService, this, this.notificationService), this.storage, this.platform, this.sqlservice, this.NativeNotificationService, this.sortService, this.ChatService, this.NfService, this.ChatMethodsService, this.AESEncrypt, this.AttachmentsService, this.NetworkServiceService, this, this.ViewedMessageService, this.notificationService) + let room: RoomService = new RoomService(this.RochetChatConnectorService, new MessageService(this.NfService, this.RochetChatConnectorService, this.ChatMethodsService, this.AESEncrypt, this.AttachmentsService, this.NetworkServiceService, this, this.notificationService), this.storage, this.platform, this.sqlservice, this.NativeNotificationService, this.sortService, this.ChatService, this.NfService, this.ChatMethodsService, this.AESEncrypt, this.AttachmentsService, this.NetworkServiceService, this, this.ViewedMessageService, this.notificationService,this.modalController,this.navController) room.setData(setData) room.receiveMessage() room.getAllUsers = this.getUsers diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts index 5c002e9a3..711e05fc5 100644 --- a/src/app/services/chat/room.service.ts +++ b/src/app/services/chat/room.service.ts @@ -4,7 +4,7 @@ import { MessageService, MessageServiceDateLabel } from 'src/app/services/chat/m import { showDateDuration } from 'src/plugin/showDateDuration'; import { chatHistory } from 'src/app/models/chatMethod'; import { Storage } from '@ionic/storage'; -import { Platform } from '@ionic/angular'; +import { ModalController, NavController, Platform } from '@ionic/angular'; import { SqliteService } from 'src/app/services/sqlite.service'; import { NativeNotificationService } from 'src/app/services/native-notification.service'; import { SessionStore } from 'src/app/store/session.service'; @@ -101,7 +101,9 @@ export class RoomService { private NetworkServiceService: NetworkServiceService, private ChatSystemService: ChatSystemService, private ViewedMessageService: ViewedMessageService, - private notificationService: NotificationsService + private notificationService: NotificationsService, + private modalController: ModalController, + private navController: NavController ) { /* this.NativeNotificationService.askForPermission() */ @@ -219,8 +221,8 @@ export class RoomService { if (difference < 0) { this.deleteRoom(); - if(this.chatOpen) { - + if(this.chatOpen && window.location.pathname.includes('chat')) { + this.closeModal() } } else { @@ -1290,4 +1292,8 @@ export class RoomService { this.members = members this.membersExcludeMe = users } + + async closeModal() { + await this.modalController.dismiss(); + } }