Skip to content

P
pantallas
Commit 87099041 authored by Rolando Neira's avatar Rolando Neira
Browse files
Options

Actualización de apis

parent 3d9deedd
Show whitespace changes
Inline Side-by-side
Showing with 107 additions and 57 deletions
PantallaNodo_V2.0/ApiNodo/routes/api-routes.js
View file @ 87099041
......@@ -102,7 +102,41 @@ router.get('/setvideos/:id', function (req, res) {
codigo: 200,
mensaje: 'Videos establecidos para el cliente: '+ pant.name
};
socket.emit('actualizar_api', {id: pant._id});
socket.emit('actualizar_videos', {id: pant._id});
res.send(respuesta);
}
}
});
});
/* Informar que se actualuzaron los videos */
router.get('/setobservatorios/:id', function (req, res) {
console.log(req.url);
Pantalla.findOne({_id: req.params.id}, function(error_buscar, pant){
if(error_buscar){
console.error(error_buscar);
respuesta = {
error: true,
codigo: 500,
mensaje: 'Error, es imposible buscar los datos.'
};
res.send(respuesta);
}else{
//Verificar si exiate la pantalla o no
if(!pant){
respuesta = {
error: true,
codigo: 300,
mensaje: 'La pantalla no existe.'
};
res.send(respuesta);
}else{
respuesta = {
error: false,
codigo: 200,
mensaje: 'Observatoios establecidos para el cliente: '+ pant.name
};
socket.emit('actualizar_obervatorios', {id: pant._id});
res.send(respuesta);
}
}
......
PantallaNodo_V2.0/PantallaNodo/Assets/codigos/Red/ConexionWebSocket.cs
View file @ 87099041
......@@ -51,12 +51,18 @@ public class ConexionWebSocket : SocketIOComponent
listaSocketConexion.Add(id, go);
});
On("actualizar_video", (E)=>{
On("actualizar_video_local", (E)=>{
string idPantallaActualizar = E.data["idPantallaActualizar"].ToString().EliminarQuotes();
if(idPantallaActualizar==DataManager.instancia.instanciaData.idPantalla){
GestorMenuInteractivo.instancia.ActualizarVideos();
}
});
On("actualizar_observatorio_local", (E)=>{
string idPantallaActualizar = E.data["idPantallaActualizar"].ToString().EliminarQuotes();
if(idPantallaActualizar==DataManager.instancia.instanciaData.idPantalla){
GestorMenuInteractivo.instancia.ActualizarObservatorios();
}
});
On("desconectar_pantalla", (E)=>{
string id = E.data["id"].ToString().EliminarQuotes();
GameObject go = listaSocketConexion[id];
......
PantallaNodo_V2.0/PantallaNodo/Assets/codigos/talo/GestorMenuInteractivo.cs
View file @ 87099041
......@@ -124,15 +124,6 @@ public class GestorMenuInteractivo : MonoBehaviour
}else{
Debug.Log ("Reproducir el video por defecto");
}
//Lleno el panel que contiene la lista de observatorios
foreach (JSONNode item in dataApi["observatorios"].AsArray)
{
......@@ -529,7 +520,14 @@ public class GestorMenuInteractivo : MonoBehaviour
public void ActualizarVideos(){
StartCoroutine(CargarVideos());
Debug.Log("Actualizar videos");
//StartCoroutine(CargarVideos());
}
public void ActualizarObservatorios(){
Debug.Log("Actualizar observatorios");
//StartCoroutine(CargarVideos());
}
......@@ -543,8 +541,23 @@ public class GestorMenuInteractivo : MonoBehaviour
else
{
Manager.instancia.dataApiPrincipal = www.downloadHandler.text;
if(contenedorListaObservatorios.transform.childCount > 0){
for (int f = contenedorListaObservatorios.transform.childCount; f > 0; f--)
{
Destroy(contenedorListaObservatorios.transform.GetChild(f-1).gameObject);
}
}
arryListVideos.RemoveRange(0,arryListVideos.Count);//Limpio el array
var dataApi = JSON.Parse(Manager.instancia.dataApiPrincipal);//Obtengo en un json los datos de la primera api
//Lleno el panel que contiene la lista de observatorios
foreach (JSONNode item in dataApi["observatorios"].AsArray)
{
GameObject btn = Instantiate(botonObservatorioPrefab);
btn.transform.GetChild(0).GetComponent<Text>().text = item["name_observatorio"];
StartCoroutine(CargarImagen(btn.transform.GetChild(1).GetComponent<Image>(), item["icon_observatorio"]));
btn.GetComponent<Button>().onClick.AddListener(() => visualizarContenidoObsevatorio("http://localhost:8080/datapantalla/clima.php"));
btn.transform.SetParent(contenedorListaObservatorios);
}
DateTime FechaTimeActual = Convert.ToDateTime(fechaActual); //Convierte el string(Fecha actual) a una fecha
int enteroHoraActua = int.Parse(System.DateTime.Now.ToString("HH:mm:ss").Split(':')[0]+System.DateTime.Now.ToString("HH:mm:ss").Split(':')[1]+System.DateTime.Now.ToString("HH:mm:ss").Split(':')[2]);//Conviero la hora actual en un numero entero
//Lleno una lista de videos que se deben reproducir, en un arrayList
......
PantallaNodo_V2.0/PantallaNodo/Library/CurrentLayout.dwlt
View file @ 87099041
......@@ -21,7 +21,7 @@ MonoBehaviour:
m_ShowMode: 4
m_Title:
m_RootView: {fileID: 2}
m_MinSize: {x: 950, y: 398}
m_MinSize: {x: 950, y: 548}
m_MaxSize: {x: 10000, y: 10000}
--- !u!114 &2
MonoBehaviour:
......@@ -45,7 +45,7 @@ MonoBehaviour:
y: 0
width: 1536
height: 781
m_MinSize: {x: 950, y: 398}
m_MinSize: {x: 950, y: 300}
m_MaxSize: {x: 10000, y: 10000}
--- !u!114 &3
MonoBehaviour:
......@@ -111,10 +111,10 @@ MonoBehaviour:
y: 30
width: 1536
height: 731
m_MinSize: {x: 685, y: 348}
m_MaxSize: {x: 16010, y: 8048}
m_MinSize: {x: 687, y: 498}
m_MaxSize: {x: 16012, y: 14048}
vertical: 0
controlID: 1898
controlID: 137
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -136,10 +136,10 @@ MonoBehaviour:
y: 0
width: 1256
height: 731
m_MinSize: {x: 408, y: 348}
m_MaxSize: {x: 12008, y: 8048}
m_MinSize: {x: 410, y: 498}
m_MaxSize: {x: 12010, y: 14048}
vertical: 1
controlID: 1899
controlID: 95
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -162,10 +162,10 @@ MonoBehaviour:
y: 0
width: 1256
height: 452
m_MinSize: {x: 408, y: 224}
m_MaxSize: {x: 12008, y: 4024}
m_MinSize: {x: 410, y: 224}
m_MaxSize: {x: 12010, y: 4024}
vertical: 0
controlID: 1900
controlID: 76
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -238,8 +238,8 @@ MonoBehaviour:
y: 0
width: 592
height: 452
m_MinSize: {x: 104, y: 124}
m_MaxSize: {x: 4004, y: 4024}
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 16}
m_Panes:
- {fileID: 16}
......@@ -265,9 +265,9 @@ MonoBehaviour:
y: 452
width: 1256
height: 279
m_MinSize: {x: 102, y: 124}
m_MaxSize: {x: 4002, y: 4024}
m_ActualView: {fileID: 19}
m_MinSize: {x: 232, y: 274}
m_MaxSize: {x: 10002, y: 10024}
m_ActualView: {fileID: 18}
m_Panes:
- {fileID: 18}
- {fileID: 19}
......@@ -275,8 +275,8 @@ MonoBehaviour:
- {fileID: 21}
- {fileID: 22}
- {fileID: 23}
m_Selected: 1
m_LastSelected: 0
m_Selected: 0
m_LastSelected: 1
--- !u!114 &12
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -296,8 +296,8 @@ MonoBehaviour:
y: 0
width: 280
height: 731
m_MinSize: {x: 277, y: 74}
m_MaxSize: {x: 4002, y: 4024}
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 24}
m_Panes:
- {fileID: 24}
......@@ -412,9 +412,9 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 9a310000
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: f2ebffff04eeffffbcf9ffffb0fbffff
m_ExpandedIDs: 90fbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -467,9 +467,9 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 9a310000
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: f2ebffff04eeffffbcf9ffffb0fbffff88630000be630000d0630000
m_ExpandedIDs: 90fbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -637,20 +637,20 @@ MonoBehaviour:
m_ShowAllHits: 0
m_SearchArea: 1
m_Folders:
- Assets/escenas
- Assets/codigos/talo
m_ViewMode: 1
m_StartGridSize: 16
m_LastFolders:
- Assets/escenas
- Assets/codigos/talo
m_LastFoldersGridSize: 16
m_LastProjectPath: C:\Users\ROLAS\Documents\ROLANDO\NODOLAB\GIT\pantallas\PantallaNodo_V2.0\PantallaNodo
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 5e4a0000
m_LastClickedID: 19038
m_ExpandedIDs: 00000000d42f000054310000823100003a3200003a330000043700006437000036390000f63a00001c3d00002e3e0000123f0000383f0000543f0000c040000058410000aa41000006430000484300006e4600009e4600001e4900005e4a0000045a0000065a0000085a00000a5a00000c5a00000e5a0000105a0000125a0000
m_SelectedIDs: 7e480000
m_LastClickedID: 18558
m_ExpandedIDs: 00000000843000000432000032320000ea320000ea330000b437000014380000e6390000a63b0000cc3d0000de3e0000c23f0000e83f00000440000070410000084200005a420000b6430000f84300001e4700004e470000ce4900000e4b0000aa540000ac540000ae540000b0540000b2540000b4540000b6540000b8540000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -678,7 +678,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000d42f000054310000823100003a3200003a330000043700006437000036390000f63a00001c3d00002e3e0000123f0000383f0000543f0000c040000058410000aa41000006430000484300006e4600009e4600001e4900005e4a0000045a0000065a0000085a00000a5a00000c5a00000e5a0000105a0000125a0000
m_ExpandedIDs: 00000000843000000432000032320000ea320000ea330000b437000014380000e6390000a63b0000cc3d0000de3e0000c23f0000e83f00000440000070410000084200005a420000b6430000f84300001e4700004e470000ce4900000e4b0000aa540000ac540000ae540000b0540000b2540000b4540000b6540000b8540000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -703,8 +703,8 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_ListAreaState:
m_SelectedInstanceIDs: 9a310000
m_LastClickedInstanceID: 12698
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 0
m_ExpandedInstanceIDs: c6230000243b000068380000925a0000903100009c400000b648000086fd000090490000024400003257000028720000384a00002e5700008e590000226b0000063b00003e8e0000a8d3feff023b0000b84b0000068a0000565b00007e4b0000ba4c0000445b0000083700003e2f0000e03f000080e0fbff720df5ff483700002e510000cc400000404000003a2f00001e610000bc40000070340000744c0000f0480000204600007664000086390000284100008c40000082340000e24e00007a4b0000c23d000070380000a25700005cb2fcff72380000fe42000092350000cc36000020490000f630000026360000a2bc0000c44f0000963500007a350000882a0000642a00000e2b0000f432000044ca0000cc2f000028370000982e00007a360000d82d0000ea3c0000a62e0000323f0000523f0000c61f0100d61e010044180000ee1d00005619000008170000f8320500f6320500701c0000024300003c3200000236000096440000283900002c3e0000e6410000663d00007c3b0000ec360000243600006e460000b4800000483401004c3401005c340100c23f0000e8480000363c0000a04100007c46000076350000d87500005a370000a0470000f4430000bc4300005a2f0000e83a0000763b0000444b0000743c000062370000a84700006263000068450000446e0000344c000050510000185d000032420000083800009e3c0000305a0000ec4d0000e83c0000424e000094a80000ea3b0000303e0000a24c000012800000a24e0000b24e0000984f0000f44800000000000086460000a436000056430000ca3d0000d23d0000e6450000be540000
m_RenameOverlay:
......
PantallaNodo_V2.0/PantallaNodo/Library/shadercompiler-UnityShaderCompiler.exe0.log
View file @ 87099041
Base path: C:/Program Files/Unity/Editor/Data
Cmd: initializeCompiler
Cmd: initializeCompiler
Cmd: initializeCompiler
Cmd: initializeCompiler
Cmd: initializeCompiler
Cmd: initializeCompiler
Cmd: initializeCompiler
Cmd: initializeCompiler
Cmd: initializeCompiler
Cmd: initializeCompiler
Cmd: initializeCompiler
Cmd: initializeCompiler
PantallaNodo_V2.0/ServerNodo/index.js
View file @ 87099041
......@@ -32,11 +32,18 @@ io.on("connection", function(socket){
}
}*/
//============================================NOTIFICANDO AL CLIENTE DE LA ACTUALIZACIÓN QUE A TENIDO LA API PRINCIPAL====================================================================================
socket.on('actualizar_api', function(data){
//============================================NOTIFICANDO AL CLIENTE SOBRE LA ACTUALIZACIÓN QUE AN TENIDO LOS VIDEOS====================================================================================
socket.on('actualizar_videos', function(data){
//console.log(data.id)
nuevaPantalla.idPantallaActualizar=data.id;
socket.broadcast.emit('actualizar_video', nuevaPantalla);
socket.broadcast.emit('actualizar_video_local', nuevaPantalla);
});
//============================================NOTIFICANDO AL CLIENTE SOBRE LA ACTUALIZACIÓN QUE AN TENIDO LOS OBSERVATORIOS====================================================================================
socket.on('actualizar_obervatorios', function(data){
//console.log(data.id)
nuevaPantalla.idPantallaActualizar=data.id;
socket.broadcast.emit('actualizar_observatorio_local', nuevaPantalla);
});
//============================================DESCONECTARSE DE LA RED DE PANTALLAS====================================================================================
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment