Merge pull request 'Data Repository 연결 안되어 있을 때 UI 안보이는 오류' (#216) from pgd/20250716_4 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/216
This commit was merged in pull request #216.
This commit is contained in:
@@ -1029,6 +1029,22 @@ PrefabInstance:
|
|||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: Panel_StudioTopbar
|
value: Panel_StudioTopbar
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1736443127178567416, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||||
|
propertyPath: m_AnchorMax.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1736443127178567416, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||||
|
propertyPath: m_AnchorMin.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1736443127178567416, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1736443127178567416, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1955157107292011281, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
- target: {fileID: 1955157107292011281, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 0
|
value: 0
|
||||||
@@ -1045,6 +1061,22 @@ PrefabInstance:
|
|||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2130947729137314072, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||||
|
propertyPath: m_AnchorMax.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2130947729137314072, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||||
|
propertyPath: m_AnchorMin.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2130947729137314072, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2130947729137314072, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2626255031181706874, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
- target: {fileID: 2626255031181706874, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 0
|
value: 0
|
||||||
@@ -1277,6 +1309,22 @@ PrefabInstance:
|
|||||||
propertyPath: m_SizeDelta.y
|
propertyPath: m_SizeDelta.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5175156938614111087, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||||
|
propertyPath: m_AnchorMax.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5175156938614111087, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||||
|
propertyPath: m_AnchorMin.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5175156938614111087, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5175156938614111087, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 5557641235373680755, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
- target: {fileID: 5557641235373680755, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 0
|
value: 0
|
||||||
@@ -1317,6 +1365,14 @@ PrefabInstance:
|
|||||||
propertyPath: m_SizeDelta.y
|
propertyPath: m_SizeDelta.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6105994354646297837, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||||
|
propertyPath: m_SizeDelta.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6105994354646297837, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||||
|
propertyPath: m_SizeDelta.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 6151036698135753193, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
- target: {fileID: 6151036698135753193, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||||
propertyPath: m_Pivot.x
|
propertyPath: m_Pivot.x
|
||||||
value: 0
|
value: 0
|
||||||
@@ -1465,6 +1521,22 @@ PrefabInstance:
|
|||||||
propertyPath: m_SizeDelta.y
|
propertyPath: m_SizeDelta.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7349301724305492737, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||||
|
propertyPath: m_AnchorMax.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7349301724305492737, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||||
|
propertyPath: m_AnchorMin.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7349301724305492737, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7349301724305492737, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 7617173237569620537, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
- target: {fileID: 7617173237569620537, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 0
|
value: 0
|
||||||
@@ -1517,6 +1589,22 @@ PrefabInstance:
|
|||||||
propertyPath: m_SizeDelta.y
|
propertyPath: m_SizeDelta.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8233937778985980108, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||||
|
propertyPath: m_AnchorMax.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8233937778985980108, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||||
|
propertyPath: m_AnchorMin.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8233937778985980108, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8233937778985980108, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 8236132945779869188, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
- target: {fileID: 8236132945779869188, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||||
propertyPath: m_SizeDelta.y
|
propertyPath: m_SizeDelta.y
|
||||||
value: 0
|
value: 0
|
||||||
@@ -2352,7 +2440,6 @@ RectTransform:
|
|||||||
- {fileID: 5084660882068320435}
|
- {fileID: 5084660882068320435}
|
||||||
- {fileID: 297039008}
|
- {fileID: 297039008}
|
||||||
- {fileID: 2627550138014681917}
|
- {fileID: 2627550138014681917}
|
||||||
- {fileID: 1439596647}
|
|
||||||
- {fileID: 1085911555}
|
- {fileID: 1085911555}
|
||||||
- {fileID: 1712022043}
|
- {fileID: 1712022043}
|
||||||
- {fileID: 1833658609}
|
- {fileID: 1833658609}
|
||||||
@@ -2411,7 +2498,6 @@ MonoBehaviour:
|
|||||||
panel_interferedobjectlist: {fileID: 0}
|
panel_interferedobjectlist: {fileID: 0}
|
||||||
panel_predefinedtype: {fileID: 0}
|
panel_predefinedtype: {fileID: 0}
|
||||||
panel_dynamicobjectinfo: {fileID: 0}
|
panel_dynamicobjectinfo: {fileID: 0}
|
||||||
panel_tooltip: {fileID: 0}
|
|
||||||
panel_propertyviewer: {fileID: 0}
|
panel_propertyviewer: {fileID: 0}
|
||||||
panel_apiconnectmodal: {fileID: 0}
|
panel_apiconnectmodal: {fileID: 0}
|
||||||
panel_datafiltersetting: {fileID: 0}
|
panel_datafiltersetting: {fileID: 0}
|
||||||
@@ -8088,7 +8174,7 @@ PrefabInstance:
|
|||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Modification:
|
m_Modification:
|
||||||
serializedVersion: 3
|
serializedVersion: 3
|
||||||
m_TransformParent: {fileID: 545811781}
|
m_TransformParent: {fileID: 1585135840841040204}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
- target: {fileID: 612661662354727518, guid: 89c287ba69e9fff49ba14affeaa83e9c, type: 3}
|
- target: {fileID: 612661662354727518, guid: 89c287ba69e9fff49ba14affeaa83e9c, type: 3}
|
||||||
propertyPath: m_Pivot.x
|
propertyPath: m_Pivot.x
|
||||||
@@ -8140,15 +8226,15 @@ PrefabInstance:
|
|||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 612661662354727518, guid: 89c287ba69e9fff49ba14affeaa83e9c, type: 3}
|
- target: {fileID: 612661662354727518, guid: 89c287ba69e9fff49ba14affeaa83e9c, type: 3}
|
||||||
propertyPath: m_LocalRotation.x
|
propertyPath: m_LocalRotation.x
|
||||||
value: 0
|
value: -0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 612661662354727518, guid: 89c287ba69e9fff49ba14affeaa83e9c, type: 3}
|
- target: {fileID: 612661662354727518, guid: 89c287ba69e9fff49ba14affeaa83e9c, type: 3}
|
||||||
propertyPath: m_LocalRotation.y
|
propertyPath: m_LocalRotation.y
|
||||||
value: 0
|
value: -0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 612661662354727518, guid: 89c287ba69e9fff49ba14affeaa83e9c, type: 3}
|
- target: {fileID: 612661662354727518, guid: 89c287ba69e9fff49ba14affeaa83e9c, type: 3}
|
||||||
propertyPath: m_LocalRotation.z
|
propertyPath: m_LocalRotation.z
|
||||||
value: 0
|
value: -0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 612661662354727518, guid: 89c287ba69e9fff49ba14affeaa83e9c, type: 3}
|
- target: {fileID: 612661662354727518, guid: 89c287ba69e9fff49ba14affeaa83e9c, type: 3}
|
||||||
propertyPath: m_AnchoredPosition.x
|
propertyPath: m_AnchoredPosition.x
|
||||||
@@ -10665,6 +10751,7 @@ RectTransform:
|
|||||||
- {fileID: 514470626}
|
- {fileID: 514470626}
|
||||||
- {fileID: 857466916}
|
- {fileID: 857466916}
|
||||||
- {fileID: 765392297}
|
- {fileID: 765392297}
|
||||||
|
- {fileID: 1439596647}
|
||||||
m_Father: {fileID: 1981809316}
|
m_Father: {fileID: 1981809316}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
@@ -12723,6 +12810,7 @@ MonoBehaviour:
|
|||||||
panel_studiotopbar: {fileID: 0}
|
panel_studiotopbar: {fileID: 0}
|
||||||
panel_scenetab: {fileID: 0}
|
panel_scenetab: {fileID: 0}
|
||||||
panel_toolbox: {fileID: 0}
|
panel_toolbox: {fileID: 0}
|
||||||
|
panel_tooltip: {fileID: 0}
|
||||||
--- !u!224 &8941705694726826284 stripped
|
--- !u!224 &8941705694726826284 stripped
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_CorrespondingSourceObject: {fileID: 6023788723247703297, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3}
|
m_CorrespondingSourceObject: {fileID: 6023788723247703297, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3}
|
||||||
|
|||||||
@@ -280,6 +280,9 @@ namespace Studio
|
|||||||
|
|
||||||
public APITotalBoardEntity GetAPIStatusBoarder()
|
public APITotalBoardEntity GetAPIStatusBoarder()
|
||||||
{
|
{
|
||||||
|
if(apiData.Count == 0)
|
||||||
|
return null;
|
||||||
|
|
||||||
var boardEntity = new APITotalBoardEntity();
|
var boardEntity = new APITotalBoardEntity();
|
||||||
boardEntity.TotalRequestPacketSize = totalRequestPacket;
|
boardEntity.TotalRequestPacketSize = totalRequestPacket;
|
||||||
boardEntity.AverageRequestPacketSize = totalRequestPacket / apiData.Count;
|
boardEntity.AverageRequestPacketSize = totalRequestPacket / apiData.Count;
|
||||||
|
|||||||
@@ -1,15 +1,11 @@
|
|||||||
using Best.HTTP.SecureProtocol.Org.BouncyCastle.Asn1.Pkcs;
|
using Studio.Setting.Connect;
|
||||||
using Studio;
|
|
||||||
using Studio.Setting.Connect;
|
|
||||||
using Studio.UI;
|
using Studio.UI;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using TMPro;
|
using TMPro;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using XRLib.UI;
|
|
||||||
using Newtonsoft.Json;
|
|
||||||
using Best.HTTP.JSON;
|
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
using System.Collections.Generic;
|
using XRLib.UI;
|
||||||
using System;
|
|
||||||
|
|
||||||
namespace Studio
|
namespace Studio
|
||||||
{
|
{
|
||||||
@@ -133,6 +129,14 @@ namespace Studio
|
|||||||
{
|
{
|
||||||
APITotalBoardEntity info = StudioService.instance.GetAPIStatusBoarder();
|
APITotalBoardEntity info = StudioService.instance.GetAPIStatusBoarder();
|
||||||
|
|
||||||
|
Panel_APIInfo.gameObject.SetActive(true);
|
||||||
|
Panel_APIDataInfo.gameObject.SetActive(false);
|
||||||
|
Panel_MQTTInfo.gameObject.SetActive(false);
|
||||||
|
Panel_MQTTDataInfo.gameObject.SetActive(false);
|
||||||
|
|
||||||
|
if (info == null)
|
||||||
|
return;
|
||||||
|
|
||||||
TotalRequestPacketSize.text = info.TotalRequestPacketSize.ToString();
|
TotalRequestPacketSize.text = info.TotalRequestPacketSize.ToString();
|
||||||
AverageRequestPacketSize.text = info.AverageRequestPacketSize.ToString();
|
AverageRequestPacketSize.text = info.AverageRequestPacketSize.ToString();
|
||||||
TotalResponsePacketSize.text = info.TotalResponsePacketSize.ToString();
|
TotalResponsePacketSize.text = info.TotalResponsePacketSize.ToString();
|
||||||
@@ -143,10 +147,6 @@ namespace Studio
|
|||||||
MaximumResponsePacketAPI.text = info.MaximumResponsePacketAPI;
|
MaximumResponsePacketAPI.text = info.MaximumResponsePacketAPI;
|
||||||
MaximumResponseTimeAPI.text = info.MaximumResponseTimeAPI;
|
MaximumResponseTimeAPI.text = info.MaximumResponseTimeAPI;
|
||||||
|
|
||||||
Panel_APIInfo.gameObject.SetActive(true);
|
|
||||||
Panel_APIDataInfo.gameObject.SetActive(false);
|
|
||||||
Panel_MQTTInfo.gameObject.SetActive(false);
|
|
||||||
Panel_MQTTDataInfo.gameObject.SetActive(false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ShowInformation_APIData<T>(StudioEntityWithState<T> baseDataValue)
|
public void ShowInformation_APIData<T>(StudioEntityWithState<T> baseDataValue)
|
||||||
|
|||||||
Reference in New Issue
Block a user