From 81b75fe9e321799d0a70c370a1cfebccbceaa7f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=98=81=EB=AF=BC?= <117150306+jym04@users.noreply.github.com> Date: Wed, 2 Apr 2025 17:47:08 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9E=91=EC=97=85=20=EC=A1=B0=EA=B1=B4/?= =?UTF-8?q?=EC=8B=9C=EA=B0=84=20=EB=B6=84=EC=84=9D=20UI,=20=EC=A7=84?= =?UTF-8?q?=ED=96=89=20=ED=98=84=ED=99=A9=ED=8C=90=20UI=20=ED=99=9C?= =?UTF-8?q?=EC=84=B1=ED=99=94=20=EA=B8=B0=EB=8A=A5=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/EventConnecter.cs | 12 ++++++++++++ Assets/Scripts/UI/Panel_AssemblyProduction.cs | 9 ++++++--- Assets/Scripts/UI/Panel_InjectionProduction.cs | 9 ++++++--- Assets/Scripts/UI/Panel_WorkConditionAnalysis.cs | 4 ++-- Assets/Scripts/UI/Panel_WorkProgressStatus.cs | 8 +++++--- Assets/WorkSpace/Personal/JYM/HTTPRequester.cs | 9 ++++----- CompleteTimeAlarmInfo.json | 4 ++-- 7 files changed, 37 insertions(+), 18 deletions(-) diff --git a/Assets/Scripts/EventConnecter.cs b/Assets/Scripts/EventConnecter.cs index 51ecfc49..f102963e 100644 --- a/Assets/Scripts/EventConnecter.cs +++ b/Assets/Scripts/EventConnecter.cs @@ -86,6 +86,18 @@ namespace CHN popupCanvas.panel_worktimeanalysis.onSearchData += httpManager.SearchWorkTime; popupCanvas.panel_worktimeanalysis.onClose += popupCanvas.panel_dashboard.dashBoardCheckListBox.OnCloseDashbordItem; + popupCanvas.panel_assemblyproduction.onOpen += popupCanvas.panel_injectionproduction.Close; + popupCanvas.panel_assemblyproduction.onOpen += popupCanvas.panel_workprogressstatus.Close; + popupCanvas.panel_assemblyproduction.onOpen += popupCanvas.panel_workconditionanalysis.OnClickCloseButton; + + popupCanvas.panel_injectionproduction.onOpen += popupCanvas.panel_assemblyproduction.Close; + popupCanvas.panel_injectionproduction.onOpen += popupCanvas.panel_workprogressstatus.Close; + popupCanvas.panel_injectionproduction.onOpen += popupCanvas.panel_workconditionanalysis.OnClickCloseButton; + + popupCanvas.panel_workprogressstatus.onOpen += popupCanvas.panel_assemblyproduction.Close; + popupCanvas.panel_workprogressstatus.onOpen += popupCanvas.panel_injectionproduction.Close; + popupCanvas.panel_workprogressstatus.onOpen += popupCanvas.panel_workconditionanalysis.OnClickCloseButton; + libraryManager.onUpdateMachineFilters += popupCanvas.panel_library.UpdateFileterList; libraryManager.onLibraryFilterigComplete += popupCanvas.panel_library.AddLibrarayButtons; diff --git a/Assets/Scripts/UI/Panel_AssemblyProduction.cs b/Assets/Scripts/UI/Panel_AssemblyProduction.cs index d46f5e51..0b5c3a37 100644 --- a/Assets/Scripts/UI/Panel_AssemblyProduction.cs +++ b/Assets/Scripts/UI/Panel_AssemblyProduction.cs @@ -22,6 +22,7 @@ public class Panel_AssemblyProduction : PanelBase public float changeDataTime; public float fadeTime; + public Action onOpen; public override void AfterAwake() { prf_statusContent = Resources.Load("Prefabs/UI/UI_StatusContent"); @@ -35,18 +36,20 @@ public class Panel_AssemblyProduction : PanelBase } public void Open() { - effect.ActivePanel(gameObject); + onOpen?.Invoke(); + + effect.gameObject.SetActive(true); gameObject.SetActive(true); gameObject.transform.SetAsLastSibling(); + StopAllCoroutines(); StartCoroutine(ScaleUp()); - StartCoroutine(ChageStatusContent()); } public void Close() { - effect.DeactivePanel(gameObject); + effect.gameObject.SetActive(false); gameObject.SetActive(false); gameObject.transform.localScale = Vector3.zero; ResetStatusContentOrder(); diff --git a/Assets/Scripts/UI/Panel_InjectionProduction.cs b/Assets/Scripts/UI/Panel_InjectionProduction.cs index 523b1e82..ba7baa0b 100644 --- a/Assets/Scripts/UI/Panel_InjectionProduction.cs +++ b/Assets/Scripts/UI/Panel_InjectionProduction.cs @@ -22,6 +22,7 @@ public class Panel_InjectionProduction : PanelBase public float changeDataTime; public float fadeTime; + public Action onOpen; public override void AfterAwake() { prf_statusContent = Resources.Load("Prefabs/UI/UI_StatusContent"); @@ -36,10 +37,12 @@ public class Panel_InjectionProduction : PanelBase } public void Open() { - effect.ActivePanel(gameObject); + onOpen?.Invoke(); + + effect.gameObject.SetActive(true); gameObject.SetActive(true); gameObject.transform.SetAsLastSibling(); - + StopAllCoroutines(); StartCoroutine(ScaleUp()); @@ -47,7 +50,7 @@ public class Panel_InjectionProduction : PanelBase } public void Close() { - effect.DeactivePanel(gameObject); + effect.gameObject.SetActive(false); gameObject.SetActive(false); gameObject.transform.localScale = Vector3.zero; ResetStatusContentOrder(); diff --git a/Assets/Scripts/UI/Panel_WorkConditionAnalysis.cs b/Assets/Scripts/UI/Panel_WorkConditionAnalysis.cs index 058ab555..3d66d76a 100644 --- a/Assets/Scripts/UI/Panel_WorkConditionAnalysis.cs +++ b/Assets/Scripts/UI/Panel_WorkConditionAnalysis.cs @@ -78,7 +78,7 @@ namespace CHN } public void Open() { - effect.ActivePanel(gameObject); + effect.transform.gameObject.SetActive(true); gameObject.SetActive(true); gameObject.transform.SetAsLastSibling(); @@ -87,7 +87,7 @@ namespace CHN } public void Close() { - effect.DeactivePanel(gameObject); + effect.transform.gameObject.SetActive(false); gameObject.SetActive(false); gameObject.transform.localScale = Vector3.zero; } diff --git a/Assets/Scripts/UI/Panel_WorkProgressStatus.cs b/Assets/Scripts/UI/Panel_WorkProgressStatus.cs index 681cd31f..1fa5e896 100644 --- a/Assets/Scripts/UI/Panel_WorkProgressStatus.cs +++ b/Assets/Scripts/UI/Panel_WorkProgressStatus.cs @@ -18,7 +18,7 @@ public class Panel_WorkProgressStatus : PanelBase public TextMeshProUGUI CurrentTime; public float fadeTime; - + public Action onOpen; public override void AfterAwake() { prf_workStatusItem = Resources.Load("Prefabs/UI/UI_WorkStatusItem"); @@ -32,7 +32,9 @@ public class Panel_WorkProgressStatus : PanelBase } public void Open() { - effect.ActivePanel(gameObject); + onOpen?.Invoke(); + + effect.gameObject.SetActive(true); gameObject.SetActive(true); gameObject.transform.SetAsLastSibling(); @@ -41,7 +43,7 @@ public class Panel_WorkProgressStatus : PanelBase } public void Close() { - effect.DeactivePanel(gameObject); + effect.gameObject.SetActive(false); gameObject.SetActive(false); gameObject.transform.localScale = Vector3.zero; } diff --git a/Assets/WorkSpace/Personal/JYM/HTTPRequester.cs b/Assets/WorkSpace/Personal/JYM/HTTPRequester.cs index 284bcf81..074bbe00 100644 --- a/Assets/WorkSpace/Personal/JYM/HTTPRequester.cs +++ b/Assets/WorkSpace/Personal/JYM/HTTPRequester.cs @@ -87,7 +87,6 @@ namespace CHN string kpiAPI = "/api/usp_ppmr020/list/facilityKpi"; public string testAPIKey = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MywiZW1haWwiOiJ1dmMiLCJncm91cElkIjoyLCJncm91cENvZGUiOiJjaHVuaWxlbmciLCJyb2xlIjoiVGVuYW50QWRtaW4iLCJuYW1lIjoi7Jyg67mE7JSoIiwibGljZW5zZSI6ImJ1c2luZXNzIiwicGhvbmUiOiIiLCJpYXQiOjE3NDA1MzY0NzUsImV4cCI6NDg5NDEzNjQ3NX0.hr4D0bOA4K09Vhp12itiJgd-nVDQ3VZO8D7MVP5Ltw0"; - public string testHttpServer = "http://106.247.236.204:8863"; public string facilityAPI = "/api/workConditionAnalysis/facilityCode"; public string workItemCodeAPI = "/api/workConditionAnalysis/workOrderAndItemCode"; public string workingConditionsAPI = "/api/workConditionAnalysis/analyze"; @@ -156,7 +155,7 @@ namespace CHN this.startDate = startDate; this.endDate = endDate; - var path = testHttpServer + facilityAPI; + var path = httpServer + facilityAPI; var query = $"?startDate={startDate}&endDate={endDate}"; string url = path + query; @@ -192,7 +191,7 @@ namespace CHN } IEnumerator GetWorkItemCode(string panelName, string facilityCode) { - var path = testHttpServer + workItemCodeAPI; + var path = httpServer + workItemCodeAPI; var query = $"?startDate={startDate}&endDate={endDate}&workcd={facilityCode}"; string url = path + query; @@ -233,7 +232,7 @@ namespace CHN WO = WO }; - var path = testHttpServer + workingConditionsAPI; + var path = httpServer + workingConditionsAPI; var json = JsonUtility.ToJson(WorkConditionRequest); @@ -270,7 +269,7 @@ namespace CHN WO = WO }; - var path = testHttpServer + workingTimeAPI; + var path = httpServer + workingTimeAPI; var json = JsonUtility.ToJson(WorkConditionRequest); diff --git a/CompleteTimeAlarmInfo.json b/CompleteTimeAlarmInfo.json index 1940bfdd..96450d64 100644 --- a/CompleteTimeAlarmInfo.json +++ b/CompleteTimeAlarmInfo.json @@ -852,7 +852,7 @@ "worknm": "X76 GORE CAP", "workseq": "1", "status": "1", - "statusnm": "가동중", + "statusnm": "비가동", "itemcd": "24050078-GMA", "itemdesc": "CAP ASM - TRANS FLUID FIL (W/VENT)", "pjtcd": "X76", @@ -1395,7 +1395,7 @@ "sttm": "0757", "totm": "", "goaltime": "147", - "ptotm": "2025-04-02 18:09:43", + "ptotm": "2025-04-02 19:33:50", "psttm": "2025-04-02 07:57:28" }, "isCheck": false