sjm/250523_2 #90

Merged
UVCXR merged 18 commits from sjm/250523_2 into main 2025-05-24 09:33:22 +09:00
3 changed files with 32 additions and 5 deletions
Showing only changes of commit b56dd00ee8 - Show all commits

View File

@@ -6,6 +6,7 @@ using System.Threading.Tasks;
using UnityEngine;
using Studio;
using Studio.Core;
using Studio.Conifg;
namespace Studio
{
@@ -67,14 +68,39 @@ namespace Studio
repository.OnTopicList += OnTopicList;
// repository.OnDetectedError += OnDetectedError;
}
private void Awake()
{
Constants.MQTTDomain = "220.90.135.190";
Constants.APIDomain = "220.90.135.190";
Constants.APIPort = 23000;
Constants.MQTTPort = 8088;
ConnectMQTT();
}
public void ConnectMQTT()
{
/*
if (isMQTTConnected)
return;
this.repository = new StudioRepoistory();
listenerIdMap = new Dictionary<string, Dictionary<string, EventHandler<StudioServiceTypeEventArgs>>>();
repository.OnTopicList += OnTopicList;
repository.MQTTConnect();
isMQTTConnected = true;
*/
this.repository = new StudioRepoistory();
// ✅ 명시적으로 필요한 Dictionary들 초기화
listenerIdMap = new Dictionary<string, Dictionary<string, EventHandler<StudioServiceTypeEventArgs>>>();
lastUpdateTime = new Dictionary<string, DateTime>();
updateTime = new Dictionary<string, float>();
apiData = new Dictionary<string, StudioEntityWithState<object>>();
mqttData = new Dictionary<string, (Dictionary<string, Dictionary<string, string>>, TimeSpan)>();
repository.OnTopicList += OnTopicList;
repository.MQTTConnect();
isMQTTConnected = true;

View File

@@ -70,7 +70,6 @@ namespace Studio
studioService.onAPIDataLoaded += UpdateAPIDataButton;
studioService.onMQTTDataLoaded += UpdateMQTTDataButton;
/*
foreach (string key in studioService.apiData.Keys)
{
UpdateAPIDataButton(key, studioService.apiData[key]);
@@ -80,7 +79,7 @@ namespace Studio
{
UpdateMQTTDataButton(key, studioService.mqttData[key].Item1, studioService.mqttData[key].Item2);
}
*/
/*
if (apiConnected)
{
@@ -111,8 +110,8 @@ namespace Studio
private void OnDisable()
{
//StudioService.Instance.onAPIDataLoaded -= UpdateAPIDataButton;
//StudioService.Instance.onMQTTDataLoaded -= UpdateMQTTDataButton;
StudioService.instance.onAPIDataLoaded -= UpdateAPIDataButton;
StudioService.instance.onMQTTDataLoaded -= UpdateMQTTDataButton;
}
void UpdateAPIDataButton(string name, StudioEntityWithState<object> value)

View File

@@ -12,10 +12,12 @@ namespace Studio
private int aa;
void Awake()
{
/*
Constants.MQTTDomain = "220.90.135.190";
Constants.APIDomain = "220.90.135.190";
Constants.APIPort = 23000;
Constants.MQTTPort = 8088;
*/
StudioService.instance.ConnectMQTT();
}