UVCXR/ChunilENG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

종합 진행 현황판 UI 기능 개발

Browse Source
This commit is contained in:
정영민
2025-06-25 17:17:20 +09:00
parent 62ac6e142f
commit f8a21447e6
59 changed files with 16307 additions and 884 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Scripts/EventConnecter.cs
View File

@@ -47,6 +47,7 @@ namespace CHN
topCanvas.panel_toptoolbar.GetFloor = building.GetFloor;
topCanvas.panel_toptoolbar.onClickAlarms += popupCanvas.panel_completealramhistory.Open;
topCanvas.panel_toptoolbar.onClickScreenInitialization += SceneReLoad;
topCanvas.panel_toptoolbar.onClickTotalProgress += popupCanvas.panel_totalproduction.Open;
topCanvas.panel_toptoolbar.onClickWorkProgress += popupCanvas.panel_workprogressstatus.Open;
topCanvas.panel_toptoolbar.onClickProductionProgress += popupCanvas.panel_injectionproduction.Open;
topCanvas.panel_toptoolbar.onClickAssemblyProgress += popupCanvas.panel_assemblyproduction.Open;
@@ -113,14 +114,17 @@ namespace CHN
datamanager.onSimpleInfo += popupCanvas.SimpleView;
datamanager.onCompleteInfo += popupCanvas.DetailView;
datamanager.onKPIInfo += machineKPIManager.SetMachineKPI;
datamanager.onKPIInfo += popupCanvas.panel_totalproduction.SetMachineEffectiveness;
mqttManager.onNotloadData += popupCanvas.panel_completealramhistory.ActiveLoadingImage;
mqttManager.onMachineData += datamanager.MachineMatching;
mqttManager.onMachineData += completeTimeManager.SetCurrentData;
mqttManager.onMachineData += productionStatusManager.SetFloorProductionStatus;
mqttManager.onWorkshopData += productionStatusManager.SetWorkProgressStatus;
mqttManager.onWorkshopData += popupCanvas.panel_totalproduction.SetWorkProgressStatus;
productionStatusManager.onFirstFloorInfo += popupCanvas.panel_injectionproduction.SetProductionStatus;
productionStatusManager.onSecondFloorInfo += popupCanvas.panel_assemblyproduction.SetProductionStatus;
productionStatusManager.onTotalFloorInfo += popupCanvas.panel_totalproduction.SetTotalProductionStatus;
productionStatusManager.onWorkShopInfo += popupCanvas.panel_workprogressstatus.SetWorkProgressStatus;
completeTimeManager.onLoadData += popupCanvas.panel_completealramhistory.SetAlarmInfoItems;

2
Assets/Scripts/ProductionStatusManager.cs
View File

@@ -19,6 +19,7 @@ namespace CHN
public Action<List<CompleteInfo>> onFirstFloorInfo;
public Action<List<CompleteInfo>> onSecondFloorInfo;
public Action<List<CompleteInfo>, List<CompleteInfo>> onTotalFloorInfo;
public Action<List<WorkShopInfo>> onWorkShopInfo;
@@ -50,6 +51,7 @@ namespace CHN
onFirstFloorInfo?.Invoke(firstFloorInfoList);
onSecondFloorInfo?.Invoke(secondFloorInfoList);
onTotalFloorInfo?.Invoke(firstFloorInfoList, secondFloorInfoList);
}
public void SetFloorInfo(Floor floor, CompleteInfo completeInfo, Dictionary<string, CompleteInfo> floorInfo)
{

1
Assets/Scripts/UI/Canvas_Popup.cs
View File

@@ -23,6 +23,7 @@ namespace CHN
public Panel_ExitProgram panel_exitprogram;
public Panel_ToolBarAlarm panel_toolbaralarm;
public Panel_DetailDashBoard panel_detaildashboard;
public Panel_TotalProduction panel_totalproduction;
//public Panel_MachineDashBoard panel_machinedashboard;
public RectTransform dashboardPoint;

10
Assets/Scripts/UI/Panel_TopToolBar.cs
View File

@@ -10,6 +10,7 @@ namespace CHN
public class Panel_TopToolBar : PanelBase
{
public Button Button_Logo;
public Button Button_TotalProgress;
public Button Button_WorkProgress;
public Button Button_ProductionProgress;
public Button Button_AssemblyProgress;
@@ -18,6 +19,7 @@ namespace CHN
public Button Button_Exit;
public Action onClickScreenInitialization;
public Action onClickTotalProgress;
public Action onClickWorkProgress;
public Action onClickProductionProgress;
public Action onClickAssemblyProgress;
@@ -34,6 +36,7 @@ namespace CHN
public override void AfterAwake()
{
Button_Logo.onClick.AddListener(OnClickScreenInitialization);
Button_TotalProgress.onClick.AddListener(OnClickTotalProgress);
Button_WorkProgress.onClick.AddListener(OnClickWorkProgress);
Button_ProductionProgress.onClick.AddListener(OnClickProductionProgress);
Button_AssemblyProgress.onClick.AddListener(OnClickAssemblyProgress);
@@ -57,6 +60,13 @@ namespace CHN
onClickScreenInitialization?.Invoke();
}
private void OnClickTotalProgress()
{
if (isClickable)
return;
onClickTotalProgress?.Invoke();
}
private void OnClickWorkProgress()
{
if (isClickable)