From 1bab65b422fdb438b5247718d38ef10e8f28e653 Mon Sep 17 00:00:00 2001 From: gaoguozheng Date: Tue, 12 Sep 2023 15:22:33 +0800 Subject: [PATCH] 9.12 --- GQ_TongXin/Assets/Prefabs/Canvas.prefab | 319 ++++++++++++++++++ GQ_TongXin/Assets/Scenes/SampleSceneG.unity | 18 +- GQ_TongXin/Assets/StreamingAssets/dz.txt | 2 +- GQ_TongXin/Assets/script/JSON/CombineJSON.cs | 36 +- GQ_TongXin/Assets/script/接口/修改/AddPort.cs | 11 +- .../Assets/script/接口/修改/RedactPort.cs | 8 + GQ_TongXin/Assets/script/接口/查询/ByCode.cs | 59 ++-- GQ_TongXin/Assets/script/画线/CreateLine.cs | 2 +- 8 files changed, 417 insertions(+), 38 deletions(-) create mode 100644 GQ_TongXin/Assets/Prefabs/Canvas.prefab diff --git a/GQ_TongXin/Assets/Prefabs/Canvas.prefab b/GQ_TongXin/Assets/Prefabs/Canvas.prefab new file mode 100644 index 000000000..d95fab092 --- /dev/null +++ b/GQ_TongXin/Assets/Prefabs/Canvas.prefab @@ -0,0 +1,319 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3873190962203769814 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4906533028930251426} + - component: {fileID: 817841625040630313} + - component: {fileID: 1113212476492564847} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4906533028930251426 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3873190962203769814} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2701242679413265223} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 155, y: 0} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &817841625040630313 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3873190962203769814} + m_CullTransparentMesh: 1 +--- !u!114 &1113212476492564847 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3873190962203769814} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: f945cd23a57e99b46ac65684d5bb3be8, type: 3} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u4E94\u5E84\u6751" +--- !u!1 &5442966668446824722 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2701242679413265223} + - component: {fileID: 4030487760320666693} + - component: {fileID: 4119110342810889729} + - component: {fileID: 3106046464731664095} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2701242679413265223 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5442966668446824722} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7053851074762554488} + - {fileID: 4906533028930251426} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!223 &4030487760320666693 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5442966668446824722} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 25 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &4119110342810889729 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5442966668446824722} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!114 &3106046464731664095 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5442966668446824722} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!1 &8348295832585692104 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7053851074762554488} + - component: {fileID: 5916626144171165449} + - component: {fileID: 3151067419721590636} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7053851074762554488 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8348295832585692104} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2701242679413265223} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -276, y: 0} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5916626144171165449 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8348295832585692104} + m_CullTransparentMesh: 1 +--- !u!114 &3151067419721590636 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8348295832585692104} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u4E94\u5E84\u6751" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2} + m_sharedMaterial: {fileID: 5035289879998008610, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190335 + m_fontColor: {r: 1, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 14 + m_fontSizeBase: 14 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG.unity b/GQ_TongXin/Assets/Scenes/SampleSceneG.unity index 3364bf9a1..0fa89df65 100644 --- a/GQ_TongXin/Assets/Scenes/SampleSceneG.unity +++ b/GQ_TongXin/Assets/Scenes/SampleSceneG.unity @@ -124940,6 +124940,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9a32c63f709470c47b3e3f91d22b2cbd, type: 3} m_Name: m_EditorClassIdentifier: + myroot: + code: + message: + data: [] + serverTime: --- !u!1 &1168945951 GameObject: m_ObjectHideFlags: 0 @@ -152528,11 +152533,11 @@ RectTransform: m_Father: {fileID: 4362348816139420719} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 662, y: -72} - m_SizeDelta: {x: 424, y: 306} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -53.94, y: 0} + m_SizeDelta: {x: 848, y: 612} + m_Pivot: {x: 1, y: 0.5} --- !u!114 &1453142316 MonoBehaviour: m_ObjectHideFlags: 0 @@ -192039,8 +192044,9 @@ MonoBehaviour: xlz_cx: xlz_xz: xlz_sc: + xllx_sc: arguments: - token: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2OTQzOTY1ODYsInVzZXJuYW1lIjoiMTgzMTIzNDU2NzgifQ.WuHqy9XUGEROFUAKsQbzywLVH_sa6JuCcn5_oO1PRCo + token: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2OTQ1ODc2NzksInVzZXJuYW1lIjoiMTgzMTIzNDU2NzgifQ.ITV2ujBdknDrUN5nj_q6AI9XH-jhg9w3j05T0x3XN70 heatThresholdValueMax: 38 heatThresholdValueMin: 26 humidityThresholdValueMax: 90 diff --git a/GQ_TongXin/Assets/StreamingAssets/dz.txt b/GQ_TongXin/Assets/StreamingAssets/dz.txt index 38f39cbb8..8130fcc58 100644 --- a/GQ_TongXin/Assets/StreamingAssets/dz.txt +++ b/GQ_TongXin/Assets/StreamingAssets/dz.txt @@ -1 +1 @@ -http://127.0.0.1:8081/ \ No newline at end of file +http://192.168.137.166:8081/ \ No newline at end of file diff --git a/GQ_TongXin/Assets/script/JSON/CombineJSON.cs b/GQ_TongXin/Assets/script/JSON/CombineJSON.cs index 7c37ea615..eda8c3c01 100644 --- a/GQ_TongXin/Assets/script/JSON/CombineJSON.cs +++ b/GQ_TongXin/Assets/script/JSON/CombineJSON.cs @@ -16,6 +16,7 @@ public static class CombineJSON //public static List jsons = new List(); public static Dictionary jsonsDic = new Dictionary(); + #region 直连 /// /// 获取所有设备API /// @@ -134,6 +135,8 @@ public static class CombineJSON } } } + #endregion + #region 协程调用接口 @@ -240,12 +243,43 @@ public static class CombineJSON } else { - callback.Invoke(null); Debug.Log("请求GET接口失败: " + request.error); + callback.Invoke(null); } } } + public static IEnumerator GetJson_GET(string apiUrl, string token, Action callback) + { + using (UnityWebRequest request = UnityWebRequest.Get(apiUrl)) + { + request.SetRequestHeader("X-Token", token); + + yield return request.SendWebRequest(); + + if (request.result == UnityWebRequest.Result.Success) + { + string responseBody = request.downloadHandler.text; + if (request.downloadHandler != null) + { + string responseText = request.downloadHandler.text; + callback?.Invoke(responseText); + } + else + { + Debug.Log("request.downloadHandler为空"); + callback.Invoke(null); + } + } + else + { + Debug.Log("请求POST接口失败: " + request.error); + callback.Invoke(null); + } + } + } + + public static IEnumerator GetJson_POST(string apiUrl, string token, int looptime, Action callback) { while (true) diff --git a/GQ_TongXin/Assets/script/接口/修改/AddPort.cs b/GQ_TongXin/Assets/script/接口/修改/AddPort.cs index a3d27acb8..fcea41f9c 100644 --- a/GQ_TongXin/Assets/script/接口/修改/AddPort.cs +++ b/GQ_TongXin/Assets/script/接口/修改/AddPort.cs @@ -30,7 +30,9 @@ public class AddPort : MonoBehaviour /// 名称 /// public InputField portName; - + /// + /// 类型 + /// public Dropdown portType; //public Dropdown deviceId; @@ -185,6 +187,13 @@ public class AddPort : MonoBehaviour //deviceId.AddOptions(deviceId_ops); conDevice.AddOptions(deviceId_ops); + List portType_list = new List(); + foreach (var item in PatternChoose.Inst.xianlan.lineCode_dic.Keys) + { + portType_list.Add(item); + } + portType.AddOptions(portType_list); + portType.captionText.text = ""; } private void Start() diff --git a/GQ_TongXin/Assets/script/接口/修改/RedactPort.cs b/GQ_TongXin/Assets/script/接口/修改/RedactPort.cs index 014500eb6..ffb01bd4b 100644 --- a/GQ_TongXin/Assets/script/接口/修改/RedactPort.cs +++ b/GQ_TongXin/Assets/script/接口/修改/RedactPort.cs @@ -357,6 +357,14 @@ public class RedactPort : MonoBehaviour cableGroupName.options.Add(optionData); } cableGroupName.captionText.text = null; + + List portType_list = new List(); + foreach (var item in PatternChoose.Inst.xianlan.lineCode_dic.Keys) + { + portType_list.Add(item); + } + portType.AddOptions(portType_list); + portType.captionText.text = ""; } diff --git a/GQ_TongXin/Assets/script/接口/查询/ByCode.cs b/GQ_TongXin/Assets/script/接口/查询/ByCode.cs index ce697b27e..2342d61cf 100644 --- a/GQ_TongXin/Assets/script/接口/查询/ByCode.cs +++ b/GQ_TongXin/Assets/script/接口/查询/ByCode.cs @@ -23,31 +23,34 @@ public class ByCode : MonoBehaviour public IEnumerator getByCode(Action callback) { yield return StartCoroutine( - CombineJSON.GetJson_GET(GameManager.Inst.Jk_URL.xllx_sc, (jsonResult) => - { - try - { - myroot = JsonConvert.DeserializeObject(jsonResult); - if (myroot.data != null && myroot.message == "ɹ") - { - lineCode_dic.Clear(); - for (int i = 0; i < myroot.data.Count; i++) - { - //if (!lineCode_dic.ContainsKey(myroot.data[i].name)) - lineCode_dic.Add(myroot.data[i].name, myroot.data[i].value); - } - callback.Invoke("1"); - } - else - callback.Invoke(null); - } - catch (Exception e) - { - Debug.Log("ѯ·ͽӿڴ" + e.Message + e.StackTrace); - callback.Invoke(null); - } - }) - ); + CombineJSON.GetJson_GET(GameManager.Inst.Jk_URL.xllx_sc, GameManager.Inst.arguments.token, (jsonResult) => + { + if (!string.IsNullOrEmpty(jsonResult)) + { + try + { + myroot = JsonConvert.DeserializeObject(jsonResult); + if (myroot.data != null && myroot.message == "ɹ") + { + lineCode_dic.Clear(); + for (int i = 0; i < myroot.data.Count; i++) + { + //if (!lineCode_dic.ContainsKey(myroot.data[i].name)) + lineCode_dic.Add(myroot.data[i].name, myroot.data[i].value); + } + callback.Invoke("1"); + } + else + callback.Invoke(null); + } + catch (Exception e) + { + Debug.Log("ѯ·ͽӿڴ" + e.Message + e.StackTrace); + callback.Invoke(null); + } + } + })); + } [System.Serializable] @@ -62,7 +65,7 @@ public class ByCode : MonoBehaviour /// public string code; /// - /// Ƶ + /// /// public string name; /// @@ -72,7 +75,7 @@ public class ByCode : MonoBehaviour /// /// /// - public int deleteFlag; + //public int deleteFlag; /// /// /// @@ -80,7 +83,7 @@ public class ByCode : MonoBehaviour /// /// /// - public int createTime; + //public int createTime; } [System.Serializable] diff --git a/GQ_TongXin/Assets/script/画线/CreateLine.cs b/GQ_TongXin/Assets/script/画线/CreateLine.cs index f35d2e9d3..5cbb91a91 100644 --- a/GQ_TongXin/Assets/script/画线/CreateLine.cs +++ b/GQ_TongXin/Assets/script/画线/CreateLine.cs @@ -176,7 +176,7 @@ public class CreateLine : CabinetUIBase } catch (Exception e) { - Debug.Log("匹配线缆颜色错误 " + e.Message + e.StackTrace); + Debug.Log("匹配线缆颜色错误 " + e.Message + "\n" + e.StackTrace); } }