From: dongsug.song Date: Mon, 13 Nov 2017 11:51:02 +0000 (+0900) Subject: [NUI] seperate NUIWatchApplication X-Git-Tag: 5.0.0-preview1-00376^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F91%2F159891%2F2;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git [NUI] seperate NUIWatchApplication Change-Id: I9ad31056c58e8b75ac5efc4699a65c64c86eaf87 Signed-off-by: dongsug.song --- diff --git a/pkg/PlatformFileList.txt b/pkg/PlatformFileList.txt old mode 100644 new mode 100755 index 62c008f..a0538ab --- a/pkg/PlatformFileList.txt +++ b/pkg/PlatformFileList.txt @@ -59,6 +59,7 @@ Tizen.Network.Smartcard.dll #mobile #mobile-emul #ivi #we Tizen.Network.WiFi.dll #common #mobile #mobile-emul #tv #ivi #wearable Tizen.Network.WiFiDirect.dll #mobile #tv #ivi Tizen.NUI.dll #common #mobile #mobile-emul #tv #wearable +Tizen.NUI.Wearable.dll #wearable Tizen.PhonenumberUtils.dll #mobile #mobile-emul #wearable Tizen.Pims.Calendar.dll #common #mobile #mobile-emul #tv #wearable Tizen.Pims.Contacts.dll #mobile #mobile-emul #wearable diff --git a/src/Tizen.NUI.Wearable/Tizen.NUI.Wearable.csproj b/src/Tizen.NUI.Wearable/Tizen.NUI.Wearable.csproj new file mode 100755 index 0000000..c45cd7c --- /dev/null +++ b/src/Tizen.NUI.Wearable/Tizen.NUI.Wearable.csproj @@ -0,0 +1,13 @@ + + + + netstandard2.0 + Tizen.NUI + + + + + + + + \ No newline at end of file diff --git a/src/Tizen.NUI.Wearable/Tizen.NUI.Wearable.sln b/src/Tizen.NUI.Wearable/Tizen.NUI.Wearable.sln new file mode 100755 index 0000000..0837f67 --- /dev/null +++ b/src/Tizen.NUI.Wearable/Tizen.NUI.Wearable.sln @@ -0,0 +1,55 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27004.2008 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.NUI.Wearable", "Tizen.NUI.Wearable.csproj", "{742A3CD5-6B46-48A2-A01B-42F69C25E4C1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Applications.Common", "..\Tizen.Applications.Common\Tizen.Applications.Common.csproj", "{30335A16-6F46-4ED0-AB6E-C3A42C5DA0FD}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.NUI", "..\Tizen.NUI\Tizen.NUI.csproj", "{E62C42D3-9CE0-4EE4-930B-59AD6B9E84BE}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Log", "..\Tizen.Log\Tizen.Log.csproj", "{A5E9303A-3BB9-46F3-A68C-8395A0806C66}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen", "..\Tizen\Tizen.csproj", "{4ADC956F-2E94-444C-8D3C-DC93EAC390AC}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.System.SystemSettings", "..\Tizen.System.SystemSettings\Tizen.System.SystemSettings.csproj", "{018869DB-9E2F-4475-BADE-74CF46BEB757}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {742A3CD5-6B46-48A2-A01B-42F69C25E4C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {742A3CD5-6B46-48A2-A01B-42F69C25E4C1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {742A3CD5-6B46-48A2-A01B-42F69C25E4C1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {742A3CD5-6B46-48A2-A01B-42F69C25E4C1}.Release|Any CPU.Build.0 = Release|Any CPU + {30335A16-6F46-4ED0-AB6E-C3A42C5DA0FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {30335A16-6F46-4ED0-AB6E-C3A42C5DA0FD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {30335A16-6F46-4ED0-AB6E-C3A42C5DA0FD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {30335A16-6F46-4ED0-AB6E-C3A42C5DA0FD}.Release|Any CPU.Build.0 = Release|Any CPU + {E62C42D3-9CE0-4EE4-930B-59AD6B9E84BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E62C42D3-9CE0-4EE4-930B-59AD6B9E84BE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E62C42D3-9CE0-4EE4-930B-59AD6B9E84BE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E62C42D3-9CE0-4EE4-930B-59AD6B9E84BE}.Release|Any CPU.Build.0 = Release|Any CPU + {A5E9303A-3BB9-46F3-A68C-8395A0806C66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A5E9303A-3BB9-46F3-A68C-8395A0806C66}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A5E9303A-3BB9-46F3-A68C-8395A0806C66}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A5E9303A-3BB9-46F3-A68C-8395A0806C66}.Release|Any CPU.Build.0 = Release|Any CPU + {4ADC956F-2E94-444C-8D3C-DC93EAC390AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4ADC956F-2E94-444C-8D3C-DC93EAC390AC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4ADC956F-2E94-444C-8D3C-DC93EAC390AC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4ADC956F-2E94-444C-8D3C-DC93EAC390AC}.Release|Any CPU.Build.0 = Release|Any CPU + {018869DB-9E2F-4475-BADE-74CF46BEB757}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {018869DB-9E2F-4475-BADE-74CF46BEB757}.Debug|Any CPU.Build.0 = Debug|Any CPU + {018869DB-9E2F-4475-BADE-74CF46BEB757}.Release|Any CPU.ActiveCfg = Release|Any CPU + {018869DB-9E2F-4475-BADE-74CF46BEB757}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {06119924-8D1B-4803-84AB-9A6CFDD25B49} + EndGlobalSection +EndGlobal diff --git a/src/Tizen.NUI/src/internal/NUIWatchCoreBackend.cs b/src/Tizen.NUI.Wearable/src/internal/NUIWatchCoreBackend.cs old mode 100644 new mode 100755 similarity index 100% rename from src/Tizen.NUI/src/internal/NUIWatchCoreBackend.cs rename to src/Tizen.NUI.Wearable/src/internal/NUIWatchCoreBackend.cs diff --git a/src/Tizen.NUI/src/public/NUIWatchApplication.cs b/src/Tizen.NUI.Wearable/src/public/NUIWatchApplication.cs old mode 100644 new mode 100755 similarity index 100% rename from src/Tizen.NUI/src/public/NUIWatchApplication.cs rename to src/Tizen.NUI.Wearable/src/public/NUIWatchApplication.cs diff --git a/src/Tizen.NUI/src/internal/FriendAssembly.cs b/src/Tizen.NUI/src/internal/FriendAssembly.cs index ca831bc..d59733d 100755 --- a/src/Tizen.NUI/src/internal/FriendAssembly.cs +++ b/src/Tizen.NUI/src/internal/FriendAssembly.cs @@ -20,9 +20,9 @@ // compile with: /target:Tizen.NUI.ExtTEST /keyfile:FriendAssemblies.snk using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("NUIsamples, PublicKey=0024000004800000940000000602000000240000525341310004000001000100ed445c2a988d35b99e5766f42eef33d89d1f67225db051f011abcfce47a4788875c39750a2e5695f1ec117f41d96610419811762669f98131db30a6e64c6bb8fde3731f373f6cda4c0087d121f5108559f216dc015807dc46ec5a4d1b63f5deff64c01754a0db0dc849bc300672572cbd2697432ab6c193ebf9fade6bf0f2aad")] [assembly: InternalsVisibleTo("Tizen.Multimedia, PublicKey=0024000004800000940000000602000000240000525341310004000001000100d115b1004248416b12d21b626cfb17149c9303fe394693fd3b32d7872e89559a4fa96c98110c2e62eea48aca693bddbe17094ca8ea2e2cd79970ca590fb672b9b371b5d7002076817321f62d6483ea50c56dbd1f37b185a4c24c47718876e6ae6d266508c551170d4cbdda3f82edaff9405ee3d7857282d8269e8e518d2f0fb2")] [assembly: InternalsVisibleTo("Tizen.TV.NUI, PublicKey=0024000004800000940000000602000000240000525341310004000001000100ed445c2a988d35b99e5766f42eef33d89d1f67225db051f011abcfce47a4788875c39750a2e5695f1ec117f41d96610419811762669f98131db30a6e64c6bb8fde3731f373f6cda4c0087d121f5108559f216dc015807dc46ec5a4d1b63f5deff64c01754a0db0dc849bc300672572cbd2697432ab6c193ebf9fade6bf0f2aad")] +[assembly: InternalsVisibleTo("Tizen.NUI.Wearable, PublicKey=0024000004800000940000000602000000240000525341310004000001000100d115b1004248416b12d21b626cfb17149c9303fe394693fd3b32d7872e89559a4fa96c98110c2e62eea48aca693bddbe17094ca8ea2e2cd79970ca590fb672b9b371b5d7002076817321f62d6483ea50c56dbd1f37b185a4c24c47718876e6ae6d266508c551170d4cbdda3f82edaff9405ee3d7857282d8269e8e518d2f0fb2")] namespace Tizen.NUI { diff --git a/test/NUITestSample/NUITestSample/NUITestSample.cs b/test/NUITestSample/NUITestSample/NUITestSample.cs index a047d08..4ff97ef 100755 --- a/test/NUITestSample/NUITestSample/NUITestSample.cs +++ b/test/NUITestSample/NUITestSample/NUITestSample.cs @@ -10,7 +10,8 @@ namespace NUITestSample [STAThread] static void Main(string[] args) { - new ImageViewUserShaderTest2.Test().Run(args); + new WatchSample.Program().Run(args); + //new ImageViewUserShaderTest2.Test().Run(args); //new ImageViewUserShaderTest.Test().Run(args); //new ScreenPositionTest.Test().Run(args); //new ImageViewOrientationCorrectionTest.Test().Run(args); diff --git a/test/NUITestSample/NUITestSample/examples/WatchFace.cs b/test/NUITestSample/NUITestSample/examples/WatchFace.cs new file mode 100755 index 0000000..95b2ac1 --- /dev/null +++ b/test/NUITestSample/NUITestSample/examples/WatchFace.cs @@ -0,0 +1,65 @@ +using Tizen.NUI; +using Tizen.NUI.BaseComponents; + +namespace WatchSample +{ + class Program : NUIWatchApplication + { + private TextLabel text; + protected override void OnCreate() + { + base.OnCreate(); + Initialize(); + } + + protected override void OnTimeTick(TimeTickEventArgs e) + { + base.OnTimeTick(e); + text.Text = "Hello NUI Watch \n" + e.WatchTime.Hour + ":" + e.WatchTime.Minute + ":" + e.WatchTime.Second + ":" + e.WatchTime.Millisecond; + Tizen.Log.Error("NUI", "TimeTick " + e.WatchTime.TimeZone + "(" + e.WatchTime.DaylightSavingTimeStatus + ") | " + e.WatchTime.Year + "/" + e.WatchTime.Month + "/" + e.WatchTime.Day + "(" + e.WatchTime.DayOfWeek + ") " + e.WatchTime.Hour + "(" + e.WatchTime.Hour24 + "):" + e.WatchTime.Minute + ":" + e.WatchTime.Second + ":" + e.WatchTime.Millisecond + "\n"); + } + + protected override void OnAmbientTick(AmbientTickEventArgs e) + { + base.OnAmbientTick(e); + Tizen.Log.Error("NUI", "AmbientTick " + e.WatchTime.TimeZone + "(" + e.WatchTime.DaylightSavingTimeStatus + ") | " + e.WatchTime.Year + "/" + e.WatchTime.Month + "/" + e.WatchTime.Day + "(" + e.WatchTime.DayOfWeek + ") " + e.WatchTime.Hour + "(" + e.WatchTime.Hour24 + "):" + e.WatchTime.Minute + ":" + e.WatchTime.Second + ":" + e.WatchTime.Millisecond + "\n"); + } + + protected override void OnAmbientChanged(AmbientChangedEventArgs e) + { + base.OnAmbientChanged(e); + Tizen.Log.Error("NUI", "AmbientChanged " + e.Changed + "\n"); + } + + void Initialize() + { + Window window = this.Window; + window.KeyEvent += OnKeyEvent; + + text = new TextLabel("Hello Tizen NUI World"); + text.HorizontalAlignment = HorizontalAlignment.Center; + text.VerticalAlignment = VerticalAlignment.Center; + text.TextColor = Color.White; + text.PointSize = 10.0f; + text.HeightResizePolicy = ResizePolicyType.FillToParent; + text.WidthResizePolicy = ResizePolicyType.FillToParent; + text.MultiLine = true; + window.GetDefaultLayer().Add(text); + } + + public void OnKeyEvent(object sender, Window.KeyEventArgs e) + { + if (e.Key.State == Key.StateType.Down && (e.Key.KeyPressedName == "XF86Back" || e.Key.KeyPressedName == "Escape")) + { + Exit(); + } + } + + static void _Main(string[] args) + { + Tizen.Log.Error("NUI", "App Start....\n"); + var app = new Program(); + app.Run(args); + } + } +}