fix merge

2026-04-19 13:02:56 +00:00 · 2022-04-07 14:40:37 +01:00
parent e8ffcca028 fec4a97a0e
commit b8ee2fd413
30 changed files with 1554 additions and 603 deletions
@@ -239,9 +239,9 @@
          <ion-fab-button title="Nova Reunião" (click)="bookMeeting()" color="light">
            <ion-icon name="calendar"></ion-icon>
          </ion-fab-button>
-          <!-- <ion-fab-button title="Adicionar Documento" (click)="addFile()" color="light">
+          <ion-fab-button title="Adicionar Documento" (click)="addFile()" color="light">
            <ion-icon name="document"></ion-icon>
-          </ion-fab-button> -->
+          </ion-fab-button>
          <ion-fab-button title="Anexar Fotografia" (click)="addImage()" color="light">
            <ion-icon name="image"></ion-icon>
          </ion-fab-button>
@@ -1,5 +1,5 @@
 import { Component, OnChanges, OnInit, Input, SimpleChanges, ChangeDetectorRef, Output, EventEmitter, ViewChild, ElementRef, AfterViewChecked, AfterViewInit, OnDestroy } from '@angular/core';
-import { ActionSheetController, AnimationController, IonSlides, MenuController, ModalController, PopoverController } from '@ionic/angular';
+import { ActionSheetController, AnimationController, IonSlides, MenuController, ModalController, PopoverController, Platform } from '@ionic/angular';
 import { AlertService } from 'src/app/services/alert.service';
 import { AuthService } from 'src/app/services/auth.service';
 import { ChatService } from 'src/app/services/chat.service';
@@ -36,7 +36,10 @@ import { Camera, CameraResultType, CameraSource } from '@capacitor/camera';
 import { VoiceRecorder, VoiceRecorderPlugin, RecordingData, GenericResponse, CurrentRecordingStatus } from 'capacitor-voice-recorder';
 import { Filesystem, Directory, Encoding } from '@capacitor/filesystem';
 import { DomSanitizer } from '@angular/platform-browser';
-import { AlertController, Platform, NavParams } from '@ionic/angular';
+import { AlertController, NavParams } from '@ionic/angular';
+import { File } from '@awesome-cordova-plugins/file/ngx';
+import { FileOpener } from '@awesome-cordova-plugins/file-opener/ngx';
+

 /*
 import * as pdfjsLib from 'pdfjs-dist';
@@ -95,8 +98,8 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
  allowTyping = true;
  storedFileNames = [];
  lastAudioRecorded = '';
-  audioRecorded:any = "";
-  audioDownloaded:any = "";
+  audioRecorded: any = "";
+  audioDownloaded: any = "";
  durationDisplay = '';
  duration = 0;

@@ -124,7 +127,11 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
    private CameraService: CameraService,
    private toastService: ToastService,
    private sanitiser: DomSanitizer,
-    private alertController: AlertController
+    private alertController: AlertController,
+    private file: File,
+    private platform: Platform,
+    private fileOpener: FileOpener,
+

  ) {
    console.log('OnCONSTRUCTOR');
@@ -146,7 +153,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe

    this.showAvatar = false

-    setTimeout(()=>{
+    setTimeout(() => {
      this.scrollToBottomClicked()
      this.showAvatar = true
    }, 50)
@@ -156,7 +163,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
  }

  ngOnInit() {
-    this.loggedUser=this.loggedUserChat;
+    this.loggedUser = this.loggedUserChat;
    setTimeout(() => {
      this.getRoomInfo();
    }, 1000);
@@ -263,7 +270,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
    }, 1000)
  }

-  async getFile(fileName?:any){
+  async getFile(fileName?: any) {
    const audioFile = await Filesystem.readFile({
      path: fileName,
      directory: Directory.Data
@@ -281,14 +288,14 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe

      this.storage.get('recordData').then((recordData) => {
        console.log(recordData);
-        if(recordData?.value?.recordDataBase64.includes('data:audio')){
+        if (recordData?.value?.recordDataBase64.includes('data:audio')) {
          this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(recordData?.value?.recordDataBase64);
        }
-        else{
+        else {
          this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(`data:${recordData.value.mimeType};base64,${recordData?.value?.recordDataBase64}`);
        }
      });
-    } catch (error) {}
+    } catch (error) { }


  }
@@ -354,8 +361,8 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
        //console.log(recordData);
        const fileName = new Date().getTime() + ".mp3";
        //Save file
-        this.storage.set('fileName',fileName);
-        this.storage.set('recordData',result).then(() => {
+        this.storage.set('fileName', fileName);
+        this.storage.set('recordData', result).then(() => {
          console.log('Audio recorded saved');
        })
      }
@@ -463,17 +470,17 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
    var byteArrays = new Array(slicesCount);

    for (var sliceIndex = 0; sliceIndex < slicesCount; ++sliceIndex) {
-        var begin = sliceIndex * sliceSize;
-        var end = Math.min(begin + sliceSize, bytesLength);
+      var begin = sliceIndex * sliceSize;
+      var end = Math.min(begin + sliceSize, bytesLength);

-        var bytes = new Array(end - begin);
-        for (var offset = begin, i = 0; offset < end; ++i, ++offset) {
-            bytes[i] = byteCharacters[offset].charCodeAt(0);
-        }
-        byteArrays[sliceIndex] = new Uint8Array(bytes);
+      var bytes = new Array(end - begin);
+      for (var offset = begin, i = 0; offset < end; ++i, ++offset) {
+        bytes[i] = byteCharacters[offset].charCodeAt(0);
+      }
+      byteArrays[sliceIndex] = new Uint8Array(bytes);
    }
    return new Blob(byteArrays, { type: contentType });
-}
+  }

  async sendAudio(fileName) {
    const roomId = this.roomId
@@ -481,36 +488,36 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
    this.storage.get('recordData').then((recordData) => {
      console.log(recordData);
      audioFile = recordData;
-      if(recordData?.value?.recordDataBase64.includes('data:audio')){
+      if (recordData?.value?.recordDataBase64.includes('data:audio')) {
        this.audioRecorded = recordData?.value?.recordDataBase64;
      }
-      else{
+      else {
        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)
-    console.log(blob)
-    const formData = new FormData();
-    formData.append("blobFile", blob);
+      //Converting base64 to blob
+      const encodedData = btoa(this.audioRecorded);
+      const blob = this.base64toBlob(encodedData, recordData.value.mimeType)
+      console.log(blob)
+      const formData = new FormData();
+      formData.append("blobFile", blob);

-    this.wsChatMethodsService.getGroupRoom(roomId).send({
-      file: {
-        "type": "application/audio",
-        "msDuration":audioFile.value.msDuration,
-        "mimeType":audioFile.value.mimeType,
-      },
-      attachments: [{
-        "title": fileName ,
-        "title_link_download": true,
-        "type": "audio"
-      }],
-      temporaryData: formData
-    })
+      this.wsChatMethodsService.getGroupRoom(roomId).send({
+        file: {
+          "type": "application/audio",
+          "msDuration": audioFile.value.msDuration,
+          "mimeType": audioFile.value.mimeType,
+        },
+        attachments: [{
+          "title": fileName,
+          "title_link_download": true,
+          "type": "audio"
+        }],
+        temporaryData: formData
+      })

-  });
+    });
    this.deleteRecording();
  }

@@ -761,7 +768,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
    //const imageData =  await this.fileToBase64Service.convert(file)
    //console.log('ADDFILECHAT', imageData)

-    const response = await fetch('data:image/jpeg;base64,'+ file.base64String!);
+    const response = await fetch('data:image/jpeg;base64,' + file.base64String!);
    const blob = await response.blob();

    const formData = new FormData();
@@ -774,8 +781,8 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
      },
      temporaryData: formData,
      attachments: [{
-        "title": file.path ,
-        "image_url": 'data:image/jpeg;base64,' +file.base64String,
+        "title": file.path,
+        "image_url": 'data:image/jpeg;base64,' + file.base64String,
        "text": "description",
        "title_link_download": false,
      }]
@@ -789,7 +796,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
    const image = await this.CameraService.takePicture();
    await this.fileService.saveImage(image)
    const lastphoto: any = await this.fileService.loadFiles();
-    const { capturedImage, capturedImageTitle} = await this.fileService.loadFileData(lastphoto);
+    const { capturedImage, capturedImageTitle } = await this.fileService.loadFileData(lastphoto);

    const base64 = await fetch(capturedImage);
    const blob = await base64.blob();
@@ -802,7 +809,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
        "guid": ''
      },
      attachments: [{
-        "title": capturedImageTitle ,
+        "title": capturedImageTitle,
        "image_url": capturedImage,
        "text": "description",
        "title_link_download": false,
@@ -833,13 +840,13 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
      }
    });
    await modal.present();
-    modal.onDidDismiss().then(async res=>{
+    modal.onDidDismiss().then(async res => {
      const data = res.data;

-      if(data.selected) {
+      if (data.selected) {

        this.wsChatMethodsService.getGroupRoom(roomId).send({
-          file:{
+          file: {
            "name": res.data.selected.Assunto,
            "type": "application/webtrix",
            "ApplicationId": res.data.selected.ApplicationType,
@@ -865,7 +872,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
      }
    });
  }
-  async addFileToChatMobile(types: typeof FileType[] ) {
+  async addFileToChatMobile(types: typeof FileType[]) {
    const roomId = this.roomId

    const file = await Camera.getPhoto({
@@ -878,7 +885,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
    //const imageData =  await this.fileToBase64Service.convert(file)
    //console.log('ADDFILECHAT', imageData)

-    const response = await fetch('data:image/jpeg;base64,'+ file.base64String!);
+    const response = await fetch('data:image/jpeg;base64,' + file.base64String!);
    const blob = await response.blob();

    const formData = new FormData();
@@ -891,8 +898,8 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
      },
      temporaryData: formData,
      attachments: [{
-        "title": file.path ,
-        "image_url": 'data:image/jpeg;base64,' +file.base64String,
+        "title": file.path,
+        "image_url": 'data:image/jpeg;base64,' + file.base64String,
        "text": "description",
        "title_link_download": false,
      }]
@@ -901,52 +908,63 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
  }


-  async addFileToChat(types: typeof FileType[] ) {
+  async addFileToChat(types: typeof FileType[]) {

    const roomId = this.roomId

    const file: any = await this.fileService.getFileFromDevice(types);
    console.log('Add file', file)
-    /* const imageData =  await this.fileToBase64Service.convert(file).then((filee) => {
-      console.log('Add file', filee)
-    }) */
-    const blob = new Blob([file],{type: file.type})
-    console.log('Add file', blob)

-    const formData = new FormData();
-    formData.append("blobFile", blob);
+    if (file.type != "application/img" && file.type != "image/png" && file.type != "image/jpeg" && file.type != "image/gif") {

-    let pdfBase64;
-    this.blobToBase64(blob).then(res => {
-      console.log('Base64 pdf', res);
-      this.wsChatMethodsService.getGroupRoom(roomId).send({
+      const encodedData = btoa(JSON.stringify(await this.getBase64(file)));
+      const blob = this.base64toBlob(encodedData, file.type)
+      console.log('Add Blob file', blob)
+
+      const formData = new FormData();
+      formData.append("blobFile", blob);
+
+      this.wsChatMethodsService.getDmRoom(roomId).send({
        file: {
          "type": file.type,
          "guid": '',
        },
        attachments: [{
-          "title": file.name ,
-          "name": file.name ,
-          "image_url": res,
+          "title": file.name,
+          "name": file.name,
+          //"image_url": res,
          // "text": "description",
          "title_link_download": false,
        }],
        temporaryData: formData
      })
-    });
+
+    } else {
+      console.log('File type invalid')
+    }


  }

-  blobToBase64 = blob => {
-    const reader = new FileReader();
-    reader.readAsDataURL(blob);
+  getFileReader(): FileReader {
+    const fileReader = new FileReader();
+    const zoneOriginalInstance = (fileReader as any)["__zone_symbol__originalInstance"];
+    return zoneOriginalInstance || fileReader;
+  }
+
+  getBase64(file) {
+    var reader = this.getFileReader();
+    reader.readAsDataURL(file);
    return new Promise(resolve => {
-      reader.onloadend = () => {
-        resolve(reader.result);
+      reader.onload = function () {
+        resolve(reader.result)
+      };
+      reader.onerror = function (error) {
+        console.log('Error: ', error);
      };
    });
-  };
+
+  }

  bookMeeting() {
    let data = {
@@ -992,7 +1010,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
      }
    });
    await modal.present();
-    modal.onDidDismiss().then( async (res) => {
+    modal.onDidDismiss().then(async (res) => {
      console.log(res['data']);
      const roomId = this.roomId;

@@ -1034,23 +1052,95 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
    msg.downloadFileMsg()
  }

+  downloadFileFromBrowser(fileName: string, data: any): void {
+    const linkSource = data;
+    const downloadLink = document.createElement("a");
+    downloadLink.href = linkSource;
+    downloadLink.download = fileName;
+    downloadLink.click();
+  }
+
+  b64toBlob(b64Data, contentType) {
+    contentType = contentType || '';
+    var sliceSize = 512;
+    b64Data = b64Data.replace(/^[^,]+,/, '');
+    b64Data = b64Data.replace(/\s/g, '');
+    var byteCharacters = window.atob(b64Data);
+    var byteArrays = [];
+
+    for (var offset = 0; offset < byteCharacters.length; offset += sliceSize) {
+      var slice = byteCharacters.slice(offset, offset + sliceSize);
+
+      var byteNumbers = new Array(slice.length);
+      for (var i = 0; i < slice.length; i++) {
+        byteNumbers[i] = slice.charCodeAt(i);
+      }
+
+      var byteArray = new Uint8Array(byteNumbers);
+
+      byteArrays.push(byteArray);
+    }
+
+    var blob = new Blob(byteArrays, { type: contentType });
+    return blob;
+  }
+
+  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
+    }
+    console.log(pdfString)
+    console.log(pathFile)
+    console.log(contentFile)
+    this.file
+      .writeFile(pathFile, fileName, contentFile, { replace: true })
+      .then(success => {
+        this.fileOpener
+          .open(pathFile + fileName, type)
+          .then(() => console.log('File is opened'))
+          .catch(e => console.log('Error opening file', e));
+      })
+      .catch(e => console.log('Error writing file', e))
+  }
+
  async openPreview(msg) {

-    if (!msg.attachments[0].image_url || msg.attachments[0].image_url === null || msg.attachments[0].image_url  === '' ) {
-      this.downloadFileMsg(msg)
-
+    if (msg.file.type === "application/webtrix") {
+      this.viewDocument(msg.file, msg.attachments.image_url)
    } else {
-      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
+
+      if (!msg.attachments[0].image_url || msg.attachments[0].image_url === null || msg.attachments[0].image_url === '') {
+        this.downloadFileMsg(msg)
+
+      } else {
+
+        var str = msg.attachments[0].image_url;
+        str = str.substring(1, ((str.length) - 1));
+
+        if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
+          this.downloadFileFromBrowser(msg.attachments[0].name, str)
+        } else if (this.platform.is('tablet')) {
+          this.openFile(str, msg.attachments[0].name, msg.file.type);
        }
-      });
-      modal.present();
+
+        /* const modal = await this.modalController.create({
+          component: ViewMediaPage,
+          cssClass: 'modal modal-desktop',
+          componentProps: {
+            image: str,
+            type: msg.file.type,
+            username: msg.u.name,
+            _updatedAt: msg._updatedAt
+          }
+        });
+        modal.present(); */
+      }
    }

  }
@@ -1059,7 +1149,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
    console.log(msg);
    if (!msg.attachments[0].title_link || msg.attachments[0].title_link === null || msg.attachments[0].title_link === '') {
      this.downloadFileMsg(msg)
-    } else {}
+    } else { }
  }

 }