merge with develop

2026-04-19 04:57:52 +00:00 · 2022-07-08 09:17:02 +01:00
parent 923a20849a 917174af7c
commit b1b28d97e5
11 changed files with 293 additions and 257 deletions
@@ -1055,7 +1055,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
    return blob;
  }

-  openFile(pdfString, filename) {
+  openFile(pdfString, filename, type) {
    const blob = this.b64toBlob(pdfString, 'application/pdf')
    let pathFile = ''
    const fileName = filename
@@ -1106,7 +1106,6 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {

        if (this.platform.is('desktop') || this.platform.is('mobileweb')) {

-          console.log(msg)
          if (msg.file.type == "application/img") {
            const modal = await this.modalController.create({
              component: ViewMediaPage,
@@ -1120,11 +1119,25 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
            });
            modal.present();
          } else {
-            this.downloadFileFromBrowser("file", str)
+            this.downloadFileFromBrowser(msg.attachments[0].name, str)
          }

        } else {
-          this.openFile(str, msg.attachments[0].name);
+          if (msg.file.type == "application/img") {
+            const modal = await this.modalController.create({
+              component: ViewMediaPage,
+              cssClass: 'modal modal-desktop',
+              componentProps: {
+                image: msg.attachments[0].image_url,
+                type: msg.file.type,
+                username: msg.u.name,
+                _updatedAt: msg._updatedAt
+              }
+            });
+            modal.present();
+          } else {
+            this.openFile(str, msg.attachments[0].name, msg.file.type);
+          }
        }
      }
    }
@@ -19,7 +19,7 @@ import { ChatUserStorage } from 'src/app/store/chat/chat-user.service';
 import { environment } from 'src/environments/environment';
 import { ThemeService } from 'src/app/services/theme.service'

-import { VoiceRecorder, RecordingData, GenericResponse} from 'capacitor-voice-recorder';
+import { VoiceRecorder, RecordingData, GenericResponse } from 'capacitor-voice-recorder';
 import { Haptics, ImpactStyle } from '@capacitor/haptics';
 import { SqliteService } from 'src/app/services/sqlite.service';
 import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
@@ -37,7 +37,9 @@ import { Camera, CameraResultType, CameraSource } from '@capacitor/camera';
 import { DomSanitizer } from '@angular/platform-browser';
 import { SessionStore } from 'src/app/store/session.service';
 import { HttpErrorResponse } from '@angular/common/http';
+import { File } from '@awesome-cordova-plugins/file/ngx';
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
+import { FileOpener } from '@awesome-cordova-plugins/file-opener/ngx';


 const IMAGE_DIR = 'stored-images';
@@ -101,7 +103,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
  downloadProgess: number;
  downloadLoader: boolean;

-  audioPermissionStatus: 'granted'| 'denied' | 'prompt' | null = null
+  audioPermissionStatus: 'granted' | 'denied' | 'prompt' | null = null
  sessionStore = SessionStore

  constructor(
@@ -133,10 +135,12 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
    private sanitiser: DomSanitizer,
    private alertController: AlertController,
    // private document: DocumentViewer
+    private file: File,
+    private fileOpener: FileOpener,
  ) {
    this.loggedUser = authService.ValidatedUserChat['data'];
    this.roomId = this.navParams.get('roomId');
-    
+

    window.onresize = (event) => {
      if (window.innerWidth > 701) {
@@ -144,7 +148,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
      }
    }

-    
+

    this.wsChatMethodsService.getDmRoom(this.roomId).loadHistory({})
    this.wsChatMethodsService.getDmRoom(this.roomId).scrollDown = this.scrollToBottomClicked
@@ -161,9 +165,9 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
    this.wsChatMethodsService.getAllRooms();
    this.chatService.refreshtoken();
    this.wsChatMethodsService.getUserOfRoom(this.roomId).then((value) => {
-      
+
    })
-    
+
    this.getChatMembers();
  }
  
@@ -213,11 +217,11 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {

    try {
      this.storage.get('recordData').then((recordData) => {
-        
+
        if (recordData?.value?.recordDataBase64.includes('data:audio')) {
          this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(recordData?.value?.recordDataBase64);
        }
-        else if(recordData?.value?.mimeType && recordData?.value?.recordDataBase64) {
+        else if (recordData?.value?.mimeType && recordData?.value?.recordDataBase64) {
          this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(`data:${recordData.value.mimeType};base64,${recordData?.value?.recordDataBase64}`);
        }
      });
@@ -228,22 +232,22 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {

  async startRecording() {
    VoiceRecorder.requestAudioRecordingPermission();
-    if(await VoiceRecorder.canDeviceVoiceRecord().then((result: GenericResponse) =>{return result.value})){
-      if(await VoiceRecorder.requestAudioRecordingPermission().then((result: GenericResponse) => {return result.value})){
+    if (await VoiceRecorder.canDeviceVoiceRecord().then((result: GenericResponse) => { return result.value })) {
+      if (await VoiceRecorder.requestAudioRecordingPermission().then((result: GenericResponse) => { return result.value })) {
        //if(await this.hasAudioRecordingPermission()){
-          if (this.recording) {
-            return;
-          }
-          this.recording = true;
-          VoiceRecorder.startRecording();
-          this.calculateDuration();
+        if (this.recording) {
+          return;
+        }
+        this.recording = true;
+        VoiceRecorder.startRecording();
+        this.calculateDuration();
        //}
      }
-      else{
+      else {
        this.toastService._badRequest('Para gravar uma mensagem de voz, permita o acesso do Gabinete Digital ao seu microfone.');
      }
    }
-    else{
+    else {
      this.toastService._badRequest('Este dispositivo não tem capacidade para gravação de áudio!');
    }
  }
@@ -251,13 +255,13 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
  stopRecording() {
    this.deleteRecording();
    this.allowTyping = false;
-    
+
    if (!this.recording) {
      return;
    }
    this.recording = false;
    VoiceRecorder.stopRecording().then(async (result: RecordingData) => {
-      
+
      this.recording = false;
      if (result.value && result.value.recordDataBase64) {
        const recordData = result.value.recordDataBase64;
@@ -266,7 +270,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
        //Save file
        this.storage.set('fileName', fileName);
        this.storage.set('recordData', result).then(() => {
-          
+
        })
      }
    })
@@ -351,7 +355,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
    });
    await modal.present();
    modal.onDidDismiss().then((res) => {
-      
+
    });
  }

@@ -415,16 +419,16 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
      if (recordData?.value?.recordDataBase64.includes('data:audio')) {
        this.audioRecorded = recordData?.value?.recordDataBase64;
      }
-      else if(recordData?.value?.mimeType && recordData?.value?.recordDataBase64) {
+      else if (recordData?.value?.mimeType && recordData?.value?.recordDataBase64) {
        this.audioRecorded = `data:${recordData.value.mimeType};base64,${recordData?.value?.recordDataBase64}`;
      }

-      
+

      //Converting base64 to blob
      const encodedData = btoa(this.audioRecorded);
      const blob = this.base64toBlob(encodedData, recordData.value.mimeType)
-      
+
      const formData = new FormData();
      formData.append("blobFile", blob);

@@ -447,7 +451,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
  }

  viewDocument(file: any, url?: string) {
-    
+
    if (file.type == "application/webtrix") {
      this.openViewDocumentModal(file);
    }
@@ -598,7 +602,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
        IsRequired: "true",
      }
    });
-    
+
    this.popoverController.dismiss();
    if (window.innerWidth <= 1024) {
      const modal = await this.modalController.create({
@@ -632,7 +636,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
    const blob = await base64.blob();
    const formData = new FormData();
    formData.append("blobFile", blob);
-    
+

    this.wsChatMethodsService.getDmRoom(roomId).send({
      file: {
@@ -712,7 +716,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
      resultType: CameraResultType.Base64,
      source: CameraSource.Photos
    });
-    
+
    //const imageData =  await this.fileToBase64Service.convert(file)
    //

@@ -749,17 +753,17 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {

    const file: any = await this.fileService.getFileFromDevice(types);

-    
+

    if (file.type != "application/img" && file.type != "image/png" && file.type != "image/jpeg" && file.type != "image/gif") {

      const encodedData = btoa(JSON.stringify(await this.getBase64(file)));
      const blob = this.base64toBlob(encodedData, file.type)
-      
+

      const formData = new FormData();
      formData.append('blobFile', blob);
-      
+

      this.wsChatMethodsService.getDmRoom(roomId).send({
        file: {
@@ -775,7 +779,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
        temporaryData: formData
      });
    } else {
-      
+
    }


@@ -790,7 +794,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
        resolve(reader.result)
      };
      reader.onerror = function (error) {
-        
+
      };
    });

@@ -798,7 +802,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {

  async openChatOptions(ev?: any) {
    const roomId = this.roomId
-    
+

    const popover = await this.popoverController.create({
      component: ChatOptionsPopoverPage,
@@ -813,7 +817,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
    });
    await popover.present();
    popover.onDidDismiss().then(async (res) => {
-      
+
      if (res['data'] == 'meeting') {
        this.bookMeeting();
      }
@@ -840,11 +844,11 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
    if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
    } else {
      this.sqlservice.getAllChatMSG(roomId).then((msg: any) => {
-        
+
        let chatmsgArray = [];
        let array = []
        msg.forEach(element => {
-          
+

          let msgChat = {
            _id: element.Id,
@@ -864,7 +868,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
        });


-        
+
      })
    }
  }
@@ -946,27 +950,27 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
  }

  openFile(pdfString, filename, type) {
-    // const blob = this.b64toBlob(pdfString, type)
-    // let pathFile = ''
-    // const fileName = filename
-    // const contentFile = blob
-    // if (this.platform.is('ios')) {
-    //   pathFile = this.file.documentsDirectory
-    // } else {
-    //   pathFile = this.file.externalRootDirectory
-    // }
-    // 
-    // 
-    // 
-    // this.file
-    //   .writeFile(pathFile, fileName, contentFile, { replace: true })
-    //   .then(success => {
-    //     this.fileOpener
-    //       .open(pathFile + fileName, type)
-    //       .then(() => 
-    //       .catch(e => 
-    //   })
-    //   .catch(e => 
+    const blob = this.b64toBlob(pdfString, type)
+    let pathFile = ''
+    const fileName = filename
+    const contentFile = blob
+    if (this.platform.is('ios')) {
+      pathFile = this.file.documentsDirectory
+    } else {
+      pathFile = this.file.externalRootDirectory
+    }
+    
+    
+    
+    this.file
+      .writeFile(pathFile, fileName, contentFile, { replace: true })
+      .then(success => {
+        this.fileOpener
+          .open(pathFile + fileName, type)
+          .then(() => console.log())
+          .catch(e => console.error(e))
+      })
+      .catch(e => console.error(e))
  }

  downloadFileFromBrowser(fileName: string, data: any): void {
@@ -979,9 +983,9 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {


  async openPreview(msg) {
-    

-    if(msg.file.type === "application/webtrix") {
+
+    if (msg.file.type === "application/webtrix") {
      this.viewDocument(msg.file, msg.attachments.image_url)
    } else {

@@ -995,7 +999,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {

        if (this.platform.is('desktop') || this.platform.is('mobileweb')) {

-          console.log(msg)
          if (msg.file.type == "application/img") {
            const modal = await this.modalController.create({
              component: ViewMediaPage,
@@ -1009,7 +1012,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
            });
            modal.present();
          } else {
-            this.downloadFileFromBrowser("file", str)
+            this.downloadFileFromBrowser(msg.attachments[0].name, str)
          }

        } else {
@@ -1028,7 +1031,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
          } else {
            this.openFile(str, msg.attachments[0].name, msg.file.type);
          }
-         
        }

      }
@@ -1037,7 +1039,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
  }

  async audioPreview(msg) {
-    
+
    if (!msg.attachments[0].title_link || msg.attachments[0].title_link === null || msg.attachments[0].title_link === '') {
      this.downloadFileMsg(msg)
    } else { }