Integrando comunicación entre sockets

PantallaNodo_V2.0/ApiNodo/routes/api-routes.js

@@ -10,7 +10,7 @@ var io = require('socket.io-client');
 //===================================Fin Variables del websocket================================================================================
 
 //======================================Socket===============================================================================================
-var socket = io.connect('http://10.131.0.30:5000', {reconnect: true});
+var socket = io.connect('http://localhost:5000', {reconnect: true});
 socket.on('connect', function (socket) {
     console.log('Conexión exitosa al socket de pantallas!');
 });

PantallaNodo_V2.0/PantallaNodo/Assets/codigos/Red/ConexionWebSocket.cs

@@ -11,7 +11,7 @@ public class ConexionWebSocket : SocketIOComponent
     [Header ("Pantallas de la Red")]
     [SerializeField]
     private Transform listaPantantallas; //Contine todos los clientes que se encuentran conctados en la red
-    private Pantalla pantalla;
+    
     
     [SerializeField]
     public static string idPantalla {get; private set;} //Id de la pantalla cliente
@@ -32,8 +32,6 @@ public class ConexionWebSocket : SocketIOComponent
     }
 
     private void InicializarComponentes(){
-        pantalla = new Pantalla();
-        pantalla.id=DataManager.instancia.instanciaData.idPantalla;
         listaSocketConexion = new Dictionary<string, GameObject>();
     }
 
@@ -41,15 +39,11 @@ public class ConexionWebSocket : SocketIOComponent
         On("open", (E)=>{
             Debug.Log("Se conecto exitosamente");
         });
-        Emit("id_cliente_conectado", new JSONObject(JsonUtility.ToJson(pantalla)));
-
-
-        
-
         On("asignar_id", (E)=>{
             idPantalla = E.data["id"].ToString().EliminarQuotes();
             Debug. Log ("El id del cliete es: " + idPantalla);
         });
+
         On("agregar_pantalla", (E)=>{
             string id = E.data["id"].ToString().EliminarQuotes();
             GameObject go = new GameObject(id);
@@ -58,7 +52,10 @@ public class ConexionWebSocket : SocketIOComponent
 
         });
         On("actualizar_video", (E)=>{
-            GestorMenuInteractivo.instancia.ActualizarVideos();
+            string idPantallaActualizar = E.data["idPantallaActualizar"].ToString().EliminarQuotes();
+            if(idPantallaActualizar==DataManager.instancia.instanciaData.idPantalla){
+                GestorMenuInteractivo.instancia.ActualizarVideos();
+            }
         });
         On("desconectar_pantalla", (E)=>{
             string id = E.data["id"].ToString().EliminarQuotes();
@@ -67,10 +64,4 @@ public class ConexionWebSocket : SocketIOComponent
             listaSocketConexion.Remove(id);
         });        
     }
-}
-
-
-[System.Serializable]
-public class Pantalla{
-    public string id;
 }
\ No newline at end of file

PantallaNodo_V2.0/PantallaNodo/Assets/codigos/talo/GestorMenuInteractivo.cs

@@ -34,7 +34,6 @@ public class GestorMenuInteractivo : MonoBehaviour
 	private string visualizarContenidoObsevatorioApiAux = "";
 	private string visualizarContenidoObsevatorioTituloObsrvatorioAux = "";
 
-	private bool actualizarVideo = false;
 
     private bool activarPuertaTrasera=true;
     private float timer = 0.0f;
@@ -101,11 +100,6 @@ public class GestorMenuInteractivo : MonoBehaviour
                 contarTime=false;
 		    }
 	    }
-
-		if (actualizarVideo){
-			Debug.Log("Se deben actualizar los videos");
-			actualizarVideo=false;
-		}
     }
 
 	//Metodo para el evento click del botón Observatorios
@@ -246,7 +240,7 @@ public class GestorMenuInteractivo : MonoBehaviour
 
 
 	public void ActualizarVideos(){
-		actualizarVideo = true;
+		Debug.Log("Se deben actualizar los videos");
 	}
 
 

PantallaNodo_V2.0/PantallaNodo/Assets/escenas/sceneinteractiva.unity

@@ -5484,7 +5484,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1fc7bbb6a9af28048849292c267c4a01, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  url: ws://10.131.0.30:5000/socket.io/?EIO=4&transport=websocket
+  url: ws://127.0.0.1:5000/socket.io/?EIO=4&transport=websocket
   autoConnect: 1
   reconnectDelay: 5
   ackExpirationTime: 1800

PantallaNodo_V2.0/PantallaNodo/Library/CurrentLayout.dwlt

@@ -21,7 +21,7 @@ MonoBehaviour:
   m_ShowMode: 4
   m_Title: 
   m_RootView: {fileID: 2}
-  m_MinSize: {x: 950, y: 300}
+  m_MinSize: {x: 950, y: 374}
   m_MaxSize: {x: 10000, y: 10000}
 --- !u!114 &2
 MonoBehaviour:
@@ -111,10 +111,10 @@ MonoBehaviour:
     y: 30
     width: 1536
     height: 731
-  m_MinSize: {x: 787, y: 498}
-  m_MaxSize: {x: 16012, y: 14048}
+  m_MinSize: {x: 781, y: 324}
+  m_MaxSize: {x: 16006, y: 8048}
   vertical: 0
-  controlID: 139
+  controlID: 137
 --- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -136,10 +136,10 @@ MonoBehaviour:
     y: 0
     width: 1145
     height: 731
-  m_MinSize: {x: 510, y: 498}
-  m_MaxSize: {x: 12010, y: 14048}
+  m_MinSize: {x: 504, y: 324}
+  m_MaxSize: {x: 12004, y: 8048}
   vertical: 1
-  controlID: 74
+  controlID: 94
 --- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -162,8 +162,8 @@ MonoBehaviour:
     y: 0
     width: 1145
     height: 452
-  m_MinSize: {x: 510, y: 224}
-  m_MaxSize: {x: 12010, y: 4024}
+  m_MinSize: {x: 504, y: 200}
+  m_MaxSize: {x: 12004, y: 4024}
   vertical: 0
   controlID: 75
 --- !u!114 &8
@@ -209,7 +209,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 328
     y: 0
-    width: 364
+    width: 263
     height: 452
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
@@ -233,9 +233,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 692
+    x: 591
     y: 0
-    width: 453
+    width: 554
     height: 452
   m_MinSize: {x: 104, y: 124}
   m_MaxSize: {x: 4004, y: 4024}
@@ -264,9 +264,9 @@ MonoBehaviour:
     y: 452
     width: 1145
     height: 279
-  m_MinSize: {x: 232, y: 274}
-  m_MaxSize: {x: 10002, y: 10024}
-  m_ActualView: {fileID: 17}
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 18}
   m_Panes:
   - {fileID: 17}
   - {fileID: 18}
@@ -274,8 +274,8 @@ MonoBehaviour:
   - {fileID: 20}
   - {fileID: 21}
   - {fileID: 22}
-  m_Selected: 0
-  m_LastSelected: 1
+  m_Selected: 1
+  m_LastSelected: 0
 --- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -357,9 +357,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 12570000
-      m_LastClickedID: 22290
-      m_ExpandedIDs: 44f9ffff98faffffb2fbffff
+      m_SelectedIDs: a8310000
+      m_LastClickedID: 0
+      m_ExpandedIDs: b8f5ffff40f7ffff8af7ffff10f8ffff94fbffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -406,7 +406,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 328
     y: 73.6
-    width: 360
+    width: 259
     height: 432
   m_PersistentViewDataDictionary: {fileID: 0}
   m_MaximizeOnPlay: 0
@@ -440,25 +440,25 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 17
-      width: 360
+      width: 259
       height: 415
     m_Scale: {x: 0.27018228, y: 0.27018228}
-    m_Translation: {x: 180, y: 207.5}
+    m_Translation: {x: 129.5, y: 207.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -666.2169
+      x: -479.30603
       y: -768
-      width: 1332.4338
+      width: 958.61206
       height: 1536
     m_MinimalGUI: 1
   m_defaultScale: 0.27018228
   m_TargetTexture: {fileID: 0}
   m_CurrentColorSpace: 0
-  m_LastWindowPixelSize: {x: 450, y: 540}
+  m_LastWindowPixelSize: {x: 323.75, y: 540}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000100000100
@@ -484,9 +484,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 692
+    x: 591.2
     y: 73.6
-    width: 449
+    width: 550
     height: 432
   m_PersistentViewDataDictionary: {fileID: 0}
   m_WindowGUID: c387872c2041eab4aaccd64c53906429
@@ -581,20 +581,20 @@ MonoBehaviour:
     m_ShowAllHits: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/codigos/database
+    - Assets/escenas
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/codigos/database
+  - Assets/escenas
   m_LastFoldersGridSize: 16
   m_LastProjectPath: C:\Users\ROLAS\Documents\NODOLAB\GIT\pantallas\PantallaNodo_V2.0\PantallaNodo
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 2}
-    m_SelectedIDs: 00440000
-    m_LastClickedID: 17408
-    m_ExpandedIDs: 00000000742f000062360000ae360000bc360000f03600007e3800003c3a00004a3d00001e3e0000623e0000c03f0000a4400000f84100003642000018440000e44700001c490000f84b0000b0520000b2520000b4520000b6520000b8520000
+    m_SelectedIDs: 94490000
+    m_LastClickedID: 18836
+    m_ExpandedIDs: 00000000ec2f0000da360000263700003437000068370000f6380000b43a0000c23d0000963e0000da3e0000384000001c41000070420000ae420000904400005c48000094490000704c0000f4520000f6520000f8520000fa520000fc520000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -622,7 +622,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000742f000062360000ae360000bc360000f03600007e3800003c3a0000543c00004a3d00001e3e0000c03f0000a4400000f8410000364200007043000018440000e44700001c490000f84b0000b0520000b2520000b4520000b6520000b8520000
+    m_ExpandedIDs: 00000000ec2f0000da360000263700003437000068370000f6380000b43a0000c23d0000963e0000da3e0000384000001c41000070420000ae420000904400005c48000094490000704c0000f4520000f6520000f8520000fa520000fc520000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -647,24 +647,24 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: 
-    m_LastClickedInstanceID: 0
+    m_SelectedInstanceIDs: a8310000
+    m_LastClickedInstanceID: 12712
     m_HadKeyboardFocusLastEvent: 1
     m_ExpandedInstanceIDs: c6230000243b000068380000925a0000903100009c400000b648000086fd000090490000024400003257000028720000384a00002e5700008e590000226b0000063b00003e8e0000a8d3feff023b0000b84b0000068a0000565b00007e4b0000ba4c0000445b0000d04b0000083700003e2f0000e03f000080e0fbff720df5ff483700002e510000cc400000404000006c7100003a2f00001e610000bc40000070340000744c0000f0480000204600007664000086390000284100008c40000082340000e24e00007a4b0000c23d000070380000a25700005cb2fcff72380000fe42000092350000cc36000020490000f630000026360000a2bc0000c44f0000963500007a350000882a0000642a00000e2b0000f432000044ca0000cc2f000028370000982e00007a360000d82d0000ea3c0000a62e0000323f0000523f0000c61f0100d61e010044180000ee1d00005619000008170000f8320500f6320500701c0000024300003c3200000236000096440000283900002c3e0000e6410000663d00007c3b0000ec360000243600006e460000b4800000483401004c3401005c340100c23f0000e8480000363c0000a04100007c46000076350000d87500005a370000a0470000f4430000bc4300005a2f0000e83a0000763b0000444b0000743c000062370000a84700006263000068450000446e0000344c000050510000185d000032420000083800009e3c0000305a000000000000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: sceneinteractiva
+      m_OriginalName: sceneinteractiva
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 17624
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
       m_ClientGUIView: {fileID: 11}
     m_CreateAssetUtility:
@@ -698,10 +698,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 7.2000003
-    y: 523.2
-    width: 1133
-    height: 254
+    x: 0
+    y: 525.60004
+    width: 1143
+    height: 259
   m_PersistentViewDataDictionary: {fileID: 0}
 --- !u!114 &19
 MonoBehaviour:

PantallaNodo_V2.0/PantallaNodo/Library/ScriptAssemblies/BuiltinAssemblies.stamp

+08d6b11ee47c7200.08d6b11ee6decc00
\ No newline at end of file

PantallaNodo_V2.0/PantallaNodo/Library/shadercompiler-UnityShaderCompiler.exe0.log

@@ -2,3 +2,5 @@ Base path: C:/Program Files/Unity/Editor/Data
 Cmd: initializeCompiler
 Cmd: initializeCompiler
 Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler

PantallaNodo_V2.0/ServerNodo/Clases/Pantalla.js

@@ -5,7 +5,6 @@ class Pantalla {
         this.id = "Pantalla_" + shortID.generate();
         this.user ='';
         this.idPantallaActualizar ='';
-        this.estadoActualizar =0;
     }
 
     SetUser(user){

PantallaNodo_V2.0/ServerNodo/index.js

@@ -20,15 +20,9 @@ io.on("connection", function(socket){
     let idPantalla = nuevaPantalla.id; // Alamaceno el id que a generado el shortid de la instancia creada anteriormente
     listaPantallas[idPantalla] = nuevaPantalla; //Agrego la instancia creada en un array de tipo pantallas (La key es el id de la instancia Pantalla creadaa recientemente y el valor es la isntancia como tal)
     listaSockets[idPantalla] = socket; // Almaceno el socket que se acaba de conectar en un array de tipo socket (La key es el id de la instancia Pantalla creadaa recientemente y el valor es el socket de conexión de la pantalla que se acaba de conectar recientemente)
-    socket.on('id_cliente_conectado', function(data){
-        console.log(data);
-    });
-    
-
-
-
     //============================================NOTIFICANDO A LOS CLIENTES DE LA EXISTENCIA DE UNA NUEVA CONEXIÓN====================================================================================
     socket.emit('asignar_id', {id: idPantalla});//Avisar al cliente que esta es su id que le asigno el servidor
+    
     socket.emit('agregar_pantalla', nuevaPantalla);//Avisarle al cliente que se a creado su instancia y se encuentra ya agegada en la red de clientes
     /*socket.broadcast.emit('agregar_pantalla', nuevaPantalla); //Informarle a todas las pantallas que se a conectado un nuevo cliente
     //Informarle al cliente que se acaba de conectar; la existencia de cada una de las pantallas conectadas previamente
@@ -40,10 +34,9 @@ io.on("connection", function(socket){
 
     //============================================NOTIFICANDO AL CLIENTE DE LA ACTUALIZACIÓN QUE A TENIDO LA API PRINCIPAL====================================================================================
     socket.on('actualizar_api', function(data){
-        console.log(data.id)
+        //console.log(data.id)
         nuevaPantalla.idPantallaActualizar=data.id;
-        nuevaPantalla.estadoActualizar=1;
-        socket.emit('actualizar_api', nuevaPantalla);
+        socket.broadcast.emit('actualizar_video', nuevaPantalla);
     });
 
     //============================================DESCONECTARSE DE LA RED DE PANTALLAS====================================================================================