diff --git a/Assets/MemoryBox/arScene/Scripts/EditMemory.cs b/Assets/MemoryBox/arScene/Scripts/EditMemory.cs index 093d14c409c62464a2f30ca533227cce07035c3e..34200f53cf362fb06fdaf8b1e871439e5045465c 100644 --- a/Assets/MemoryBox/arScene/Scripts/EditMemory.cs +++ b/Assets/MemoryBox/arScene/Scripts/EditMemory.cs @@ -1,4 +1,5 @@ -using UnityEngine; +using System; +using UnityEngine; using UnityEngine.UI; namespace MemoryBox.arScene.Scripts @@ -11,6 +12,9 @@ namespace MemoryBox.arScene.Scripts public Text GpsData; public Text Text; public Image Image; + public UserGps UserGps; + public GameObject ButtonImage; + public GameObject ButtonText; public Text UploadScreenText; @@ -27,8 +31,26 @@ namespace MemoryBox.arScene.Scripts public void NewMemory() { // creation time + var timeNow = DateTime.Now; // gps data + var gpsData = UserGps.GetLocationInfo(); + // memory + _memory = new Memory + { + CreationTime = timeNow, + GpSdata = gpsData + }; + + // prepare edit Canvas + Name.text = "Memory #142"; + CreationDate.text = timeNow.ToLongDateString(); + GpsData.text = gpsData.ToString(); + Image.gameObject.SetActive(false); + ButtonImage.gameObject.SetActive(true); + Text.text = ""; + Text.gameObject.SetActive(false); + ButtonText.gameObject.SetActive(true); } /// <summary> diff --git a/Assets/MemoryBox/arScene/Scripts/UserGps.cs b/Assets/MemoryBox/arScene/Scripts/UserGps.cs index bc258c1d7ddad909d6ee913a65a84534010d03ac..15d22178c98ee4f4c9fa721dd99b827af815dae5 100644 --- a/Assets/MemoryBox/arScene/Scripts/UserGps.cs +++ b/Assets/MemoryBox/arScene/Scripts/UserGps.cs @@ -94,15 +94,15 @@ namespace MemoryBox.arScene.Scripts public struct GpSdata { - public float Latitude; - public float Longitude; - public float Altitude; + public readonly float Latitude; + public readonly float Longitude; + public readonly float Altitude; public GpSdata(float latitude, float longitude, float altitude) { - this.Latitude = latitude; - this.Longitude = longitude; - this.Altitude = altitude; + Latitude = latitude; + Longitude = longitude; + Altitude = altitude; } public override bool Equals(object obj) @@ -115,5 +115,10 @@ namespace MemoryBox.arScene.Scripts var gpsObj = (GpSdata) obj; return gpsObj.Altitude == Altitude && gpsObj.Latitude == Latitude && gpsObj.Longitude == Longitude; } + + public override string ToString() + { + return Latitude + ", " + Longitude; + } } } diff --git a/Assets/MemoryBox/arScene/arScene.unity b/Assets/MemoryBox/arScene/arScene.unity index 96fa36afd3b157f260883064f9ce7ac95d4169ee..fd726c87d342aeb888c033a8391031d3e4a700e8 100644 --- a/Assets/MemoryBox/arScene/arScene.unity +++ b/Assets/MemoryBox/arScene/arScene.unity @@ -8847,6 +8847,9 @@ MonoBehaviour: GpsData: {fileID: 286571124} Text: {fileID: 1613787920} Image: {fileID: 1539769883} + UserGps: {fileID: 606266132} + ButtonImage: {fileID: 106367896} + ButtonText: {fileID: 1704763487} UploadScreenText: {fileID: 355798165} --- !u!1 &1746675491 GameObject: