sjm/250523_2 #90

Merged
UVCXR merged 18 commits from sjm/250523_2 into main 2025-05-24 09:33:22 +09:00
6 changed files with 1782 additions and 41 deletions
Showing only changes of commit 0918ac3542 - Show all commits

View File

@@ -92,10 +92,10 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 24
m_fontSize: 26.05
m_fontSizeBase: 24
m_fontWeight: 400
m_enableAutoSizing: 0
m_enableAutoSizing: 1
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0

View File

@@ -22,6 +22,7 @@ namespace Studio
public Action<string, Dictionary<string, Dictionary<string, string>>> OnTopicList;
public StudioRepoistory()
{
Debug.Log($"11MQTT Domain{Constants.MQTTDomain} , MQTTPORT{Constants.MQTTPort}");
MQTTCreateConnect();
Application.quitting += OnDestroy;
}

View File

@@ -90,7 +90,7 @@ namespace Studio
UpdateTopicData(type, idKey.Key, idKey.Value);
}
onMQTTDataLoaded?.Invoke(type, entities, elapsedTime);
onMQTTDataLoaded?.Invoke(type, entities, elapsedTime); // 나중에 클래스 밖으로 이동 필요
}
private async Task UpdateTopicData(string type, string id, Dictionary<string, string> entity)
@@ -175,7 +175,7 @@ namespace Studio
Debug.Log($"APIState : Error , Message :{data.Message}");
}
onAPIDataLoaded?.Invoke(url, data);
onAPIDataLoaded?.Invoke(url, data); // 나중에 클래스 밖으로 이동 필요
}
private void CheckAPIBoarder(string data, int reqSize, string url, long time)

View File

@@ -49,8 +49,8 @@ namespace XED.UI
label.panel_Repository = this;
}
StudioService.Instance.onAPIDataLoaded += UpdateAPIDataButton;
StudioService.Instance.onMQTTDataLoaded += UpdateMQTTDataButton;
StudioService.Instance.onAPIDataLoaded += UpdateAPIDataButton;
StudioService.Instance.onMQTTDataLoaded += UpdateMQTTDataButton;
apiDataButtonPrefab = Resources.Load<UI_BaseDataButton>("Prefabs/UI/Button/UI_BaseDataButton");
mqttDataButtonPrefab = Resources.Load<UI_MQTTDataButton>("Prefabs/UI/Button/UI_MQTTDataButton");

View File

@@ -10,7 +10,7 @@ namespace XED
{
// Start is called once before the first execution of Update after the MonoBehaviour is created
private int aa;
void Start()
void Awake()
{
Constants.MQTTDomain = "220.90.135.190";
Constants.APIDomain = "220.90.135.190";

File diff suppressed because it is too large Load Diff