diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 43cda3bc2..13e2aa973 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,11 +1,16 @@ + + + + + SessionStore.user.Authorization @@ -25,7 +23,10 @@ export class SocketConnectionMCRService { console.log("ReceiveMessage", message) }) - + connection.onreconnected((connectionId) => { + console.assert(connection.state === signalR.HubConnectionState.Connected); + console.log(`Reconnected with connectionId: ${connectionId}`); + }); connection.start() .then(() => { @@ -36,7 +37,8 @@ export class SocketConnectionMCRService { }); connection.onclose((error) => { - console.log("SignalR connection closed:", error); + connection.start() + console.log("SignalR connection closed:", error); }); } diff --git a/src/app/shared/API/middleware/interface.d.ts b/src/app/shared/API/middleware/interface.d.ts index 72824a7fc..7a7cd175b 100644 --- a/src/app/shared/API/middleware/interface.d.ts +++ b/src/app/shared/API/middleware/interface.d.ts @@ -155,7 +155,7 @@ interface CreateOrganizer { export interface IuploadFileLK { - path: string + data: string } // ================================================ PUT ============================================= diff --git a/src/app/shared/publication/new-publication/index.html b/src/app/shared/publication/new-publication/index.html new file mode 100644 index 000000000..fe9f22b60 --- /dev/null +++ b/src/app/shared/publication/new-publication/index.html @@ -0,0 +1,106 @@ + + + + + SignalR Lab + + + + + + + + +
+

SignalR Messages:

+ 

+        

+    

+        
    
+    
    
+    
+    
+    
+
+
diff --git a/src/app/shared/publication/new-publication/new-publication.page.html b/src/app/shared/publication/new-publication/new-publication.page.html
index b15540f64..47516404b 100644
--- a/src/app/shared/publication/new-publication/new-publication.page.html
+++ b/src/app/shared/publication/new-publication/new-publication.page.html
@@ -3,7 +3,7 @@
     
-    
    
+    
    
       {{ publicationTitle }} 
    
        Campos marcados com * são obrigatórios
     
    
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 23a33b91c..652b5ccfd 100644
--- a/src/app/shared/publication/new-publication/new-publication.page.ts
+++ b/src/app/shared/publication/new-publication/new-publication.page.ts
@@ -85,7 +85,7 @@ export class NewPublicationPage implements OnInit {
       this.filecontent = true;
     }
 
-    // this.SocketConnectionMCRService.connect()
+    this.SocketConnectionMCRService.connect()
   }
 
   ngOnInit() {
@@ -416,8 +416,6 @@ export class NewPublicationPage implements OnInit {
         }
 
 
-        // this.publicationFormMV.setDataToFrom(this.publication)
-        // this.publicationFormMV.uploadVideosFiles()
 
         this.publication.Files = this.publication.Files.map( e => ({
           FileBase64: e.FileBase64,
@@ -871,6 +869,27 @@ export class NewPublicationPage implements OnInit {
     this.seletedContent.splice(index, 1)
   }
 
+
+
+  uploadChunk() {
+    let time = new Date()
+
+    this.publication = {
+      DateIndex: time,
+      DocumentId: null,
+      ProcessId: this.folderId,
+      Title: this.pub.Title,
+      Message: this.pub.Message,
+      DatePublication: time,
+      OriginalFileName: this.capturedImageTitle || 'foto',
+      Files: this.seletedContent,
+    }
+
+
+    this.publicationFormMV.setDataToFrom(this.publication)
+    this.publicationFormMV.uploadVideosFiles()
+
+  }
 }
 
 // class UploadFileUseCase {
@@ -988,7 +1007,7 @@ class UploadFileUseCase {
       const blob = new Blob([chunk]);
       const blobFile = new File([blob], "test.mp4", { type: blob.type });
 
-      return await this.CMAPIService.FileContent({length, path, index, blobFile})
+      return await this.CMAPIService.FileContent({length, path: ChucksManager.path, index, blobFile})
     }
 
     if(!ChucksManager.hasPath()) {
@@ -998,11 +1017,12 @@ class UploadFileUseCase {
       const blob = new Blob([chuck]);
       const blobFile = new File([blob], "test.mp4", { type: blob.type });
 
-      const uploadRequest = await this.CMAPIService.FileContent({length, path, index: initIndex, blobFile})
+      const uploadRequest = await this.CMAPIService.FileContent({length, path:ChucksManager.path, index: initIndex, blobFile})
 
       if(uploadRequest.isOk()) {
 
-        path = uploadRequest.value.path
+        path = uploadRequest.value.data
+
         ChucksManager.setPath(path)
         ChucksManager.setResponse(initIndex, uploadRequest.value as any)
       } else {
diff --git a/src/app/shared/publication/new-publication/signalr-teste.html b/src/app/shared/publication/new-publication/signalr-teste.html
new file mode 100644
index 000000000..ead1569b8
--- /dev/null
+++ b/src/app/shared/publication/new-publication/signalr-teste.html
@@ -0,0 +1,41 @@
+
+
+
+    
+    
+    
+    SignalR CDN Example
+    
+    
+
+
+    
+
+    
+
+
diff --git a/src/app/shared/publication/new-publication/signalr.html b/src/app/shared/publication/new-publication/signalr.html
new file mode 100644
index 000000000..7fc5dc2cb
--- /dev/null
+++ b/src/app/shared/publication/new-publication/signalr.html
@@ -0,0 +1,41 @@
+
+
+
+    
+    
+    
+    SignalR CDN Example
+    
+    
+
+
+    
+
+    
+
+
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 726ebb13e..a9256d5a8 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -4,4 +4,4 @@ import { doneITProd } from './suport/doneIt'
 import { DevDev } from './suport/dev'
 
 
-export const environment: Environment = oaprProd;
+export const environment: Environment = DevDev;
diff --git a/src/environments/suport/dev.ts b/src/environments/suport/dev.ts
index e8d2ce580..e59e62ebc 100644
--- a/src/environments/suport/dev.ts
+++ b/src/environments/suport/dev.ts
@@ -88,4 +88,4 @@ export const DevDev: Environment = {
   VP: '',
   dispatchPR: 'Despachos Titular',
   storageProduction: false, */
-};
\ No newline at end of file
+};