Change Nuget packages, Update MediaContentPort in Tizen for new MediaContent APIs

Signed-off-by: heonjae.jang <heonjae.jang@samsung.com>

8 files changed, 57 insertions, 44 deletions

diff --git a/NewPlayer/NewPlayer.Tizen/Port/MediaContentPort.cs b/NewPlayer/NewPlayer.Tizen/Port/MediaContentPort.cs
index f6dbd77..18a1438 100755
--- a/NewPlayer/NewPlayer.Tizen/Port/MediaContentPort.cs
+++ b/NewPlayer/NewPlayer.Tizen/Port/MediaContentPort.cs
@@ -11,22 +11,32 @@ namespace NewPlayer.Tizen.Port
 {
     public class MediaContentPort : IMediaContentAPIs
     {
+        private MediaDatabase mediaDatabase;
+        private MediaInfoCommand mediaInfoCommand;
         public MediaContentPort()
         {
-            ContentDatabase.Connect();
+            mediaDatabase = new MediaDatabase();
+            mediaDatabase.Connect();
+
+            mediaInfoCommand = new MediaInfoCommand(mediaDatabase);
         }
 
         public async Task<IEnumerable<MediaItem>> GetAllVideoItemListAsync()
         {
-            IEnumerable<MediaInformation> mediaInformations;
+            var mediaInformations = new List<MediaInfo>();
             var itemList = new List<MediaItem>();
-            var contentFilter = new ContentFilter();
+            var selectArguments = new SelectArguments();
 
-            contentFilter.Condition = "MEDIA_TYPE=1";
+            selectArguments.FilterExpression = "MEDIA_TYPE=1";
 
             try
             {
-                mediaInformations = ContentManager.Database.SelectAll<MediaInformation>(contentFilter);
+                var reader = mediaInfoCommand.SelectMedia(selectArguments);
+
+                while (reader.Read())
+                {
+                    mediaInformations.Add(reader.Current);
+                }
             }
             catch (Exception exception)
             {
@@ -38,7 +48,7 @@ namespace NewPlayer.Tizen.Port
             {
                 foreach (var mediaInformation in mediaInformations)
                 {
-                    var videoInfomation = mediaInformation as VideoInformation;
+                    var videoInfomation = mediaInformation as VideoInfo;
                     var duration = videoInfomation.Duration;
                     var thumbnailPath = await CheckThumbnailAsync(videoInfomation);
 
@@ -47,7 +57,7 @@ namespace NewPlayer.Tizen.Port
                         {
                             Title = mediaInformation.Title,
                             Thumbnail = thumbnailPath,
-                            Path = mediaInformation.FilePath,
+                            Path = mediaInformation.Path,
                             Duration = duration
                         });
                 }
@@ -56,7 +66,7 @@ namespace NewPlayer.Tizen.Port
             return itemList;
         }
 
-        private async Task<string> CheckThumbnailAsync(VideoInformation information)
+        private async Task<string> CheckThumbnailAsync(VideoInfo information)
         {
             var path = information.ThumbnailPath;
 
@@ -64,7 +74,7 @@ namespace NewPlayer.Tizen.Port
             {
                 try
                 {
-                    path = await information.CreateThumbnailAsync();
+                    path = await mediaInfoCommand.CreateThumbnailAsync(information.Id);
                 }
                 catch (Exception e)
                 {
diff --git a/NewPlayer/NewPlayer.Tizen/Renderers/MediaRenderingViewRenderer.cs b/NewPlayer/NewPlayer.Tizen/Renderers/MediaRenderingViewRenderer.cs
index 3955429..e7e756d 100644
--- a/NewPlayer/NewPlayer.Tizen/Renderers/MediaRenderingViewRenderer.cs
+++ b/NewPlayer/NewPlayer.Tizen/Renderers/MediaRenderingViewRenderer.cs
@@ -61,7 +61,7 @@ namespace NewPlayer.Tizen
             catch (System.Exception e)
             {
                 // TODO : Application Name
-                global::Tizen.Log.Debug("Test", "Error :" + e.Message);
+                Log.Debug("Test", "Error :" + e.Message);
             }
             Element?.Prepare();
 
diff --git a/Preview.Migration/NewPlayer/NewPlayer/NewPlayer.Android/NewPlayer.Android.csproj b/Preview.Migration/NewPlayer/NewPlayer/NewPlayer.Android/NewPlayer.Android.csproj
index 55ac492..89dd01f 100644
--- a/Preview.Migration/NewPlayer/NewPlayer/NewPlayer.Android/NewPlayer.Android.csproj
+++ b/Preview.Migration/NewPlayer/NewPlayer/NewPlayer.Android/NewPlayer.Android.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\Xamarin.Forms.2.4.0.266-pre1\build\netstandard1.0\Xamarin.Forms.props" Condition="Exists('..\..\packages\Xamarin.Forms.2.4.0.266-pre1\build\netstandard1.0\Xamarin.Forms.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -49,7 +50,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="FormsViewGroup, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.4.247\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.4.0.266-pre1\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
     </Reference>
     <Reference Include="Mono.Android" />
     <Reference Include="mscorlib" />
@@ -82,16 +83,16 @@
       <HintPath>..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.4.247\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.4.0.266-pre1\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.4.247\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.4.0.266-pre1\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform.Android, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.4.247\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.4.0.266-pre1\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.4.247\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.4.0.266-pre1\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -159,7 +160,8 @@
       <ErrorText>이 프로젝트는 이 컴퓨터에 없는 NuGet 패키지를 참조합니다. 해당 패키지를 다운로드하려면 NuGet 패키지 복원을 사용하십시오. 자세한 내용은 http://go.microsoft.com/fwlink/?LinkID=322105를 참조하십시오. 누락된 파일은 {0}입니다.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.4.247\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.4.247\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.4.0.266-pre1\build\netstandard1.0\Xamarin.Forms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.4.0.266-pre1\build\netstandard1.0\Xamarin.Forms.props'))" />
+    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.4.0.266-pre1\build\netstandard1.0\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.4.0.266-pre1\build\netstandard1.0\Xamarin.Forms.targets'))" />
   </Target>
-  <Import Project="..\..\packages\Xamarin.Forms.2.3.4.247\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.4.247\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
+  <Import Project="..\..\packages\Xamarin.Forms.2.4.0.266-pre1\build\netstandard1.0\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.4.0.266-pre1\build\netstandard1.0\Xamarin.Forms.targets')" />
 </Project>
\ No newline at end of file
diff --git a/Preview.Migration/NewPlayer/NewPlayer/NewPlayer.Android/Resources/Resource.Designer.cs b/Preview.Migration/NewPlayer/NewPlayer/NewPlayer.Android/Resources/Resource.Designer.cs
index e2d6d9d..43aecb3 100644
--- a/Preview.Migration/NewPlayer/NewPlayer/NewPlayer.Android/Resources/Resource.Designer.cs
+++ b/Preview.Migration/NewPlayer/NewPlayer/NewPlayer.Android/Resources/Resource.Designer.cs
@@ -1,11 +1,11 @@
 #pragma warning disable 1591
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     이 코드는 도구를 사용하여 생성되었습니다.
-//     런타임 버전:4.0.30319.42000
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
-//     파일 내용을 변경하면 잘못된 동작이 발생할 수 있으며, 코드를 다시 생성하면
-//     이러한 변경 내용이 손실됩니다.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
diff --git a/Preview.Migration/NewPlayer/NewPlayer/NewPlayer.Android/packages.config b/Preview.Migration/NewPlayer/NewPlayer/NewPlayer.Android/packages.config
index 69bcae0..fd3f39f 100644
--- a/Preview.Migration/NewPlayer/NewPlayer/NewPlayer.Android/packages.config
+++ b/Preview.Migration/NewPlayer/NewPlayer/NewPlayer.Android/packages.config
@@ -8,5 +8,5 @@
   <package id="Xamarin.Android.Support.v7.MediaRouter" version="23.3.0" targetFramework="monoandroid60" />
   <package id="Xamarin.Android.Support.v7.RecyclerView" version="23.3.0" targetFramework="monoandroid60" />
   <package id="Xamarin.Android.Support.Vector.Drawable" version="23.3.0" targetFramework="monoandroid60" />
-  <package id="Xamarin.Forms" version="2.3.4.247" targetFramework="monoandroid60" />
+  <package id="Xamarin.Forms" version="2.4.0.266-pre1" targetFramework="monoandroid71" />
 </packages>
\ No newline at end of file
diff --git a/Preview.Migration/NewPlayer/NewPlayer/NewPlayer.Tizen/NewPlayer.Tizen.TV/NewPlayer.Tizen.TV.csproj b/Preview.Migration/NewPlayer/NewPlayer/NewPlayer.Tizen/NewPlayer.Tizen.TV/NewPlayer.Tizen.TV.csproj
index 0d1f5ec..7e82379 100644
--- a/Preview.Migration/NewPlayer/NewPlayer/NewPlayer.Tizen/NewPlayer.Tizen.TV/NewPlayer.Tizen.TV.csproj
+++ b/Preview.Migration/NewPlayer/NewPlayer/NewPlayer.Tizen/NewPlayer.Tizen.TV/NewPlayer.Tizen.TV.csproj
@@ -45,11 +45,10 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-	<PackageReference Include="Tizen.Applications" Version="1.5.8" />
-	<PackageReference Include="Tizen.NET" Version="3.0.0" />
-	<PackageReference Include="Tizen.NET.Sdk" Version="1.0.14-pre1" />
-	<PackageReference Include="Xamarin.Forms" Version="2.3.4.247" />
-	<PackageReference Include="Xamarin.Forms.Platform.Tizen" Version="2.3.5-r256-001" />
+	<PackageReference Include="Tizen.NET" Version="4.0.0-preview1-00117" />	
+	<PackageReference Include="Tizen.NET.Sdk" Version="0.9.17-pre1" />
+	<PackageReference Include="Xamarin.Forms" Version="2.4.0.266-pre1" />
+	<PackageReference Include="Xamarin.Forms.Platform.Tizen" Version="2.4.0-r266-005" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\NewPlayer\NewPlayer.csproj" />
diff --git a/Preview.Migration/NewPlayer/NewPlayer/NewPlayer/NewPlayer.csproj b/Preview.Migration/NewPlayer/NewPlayer/NewPlayer/NewPlayer.csproj
index 5a32cde..5aeef03 100644
--- a/Preview.Migration/NewPlayer/NewPlayer/NewPlayer/NewPlayer.csproj
+++ b/Preview.Migration/NewPlayer/NewPlayer/NewPlayer/NewPlayer.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\Xamarin.Forms.2.4.0.266-pre1\build\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.props" Condition="Exists('..\..\packages\Xamarin.Forms.2.4.0.266-pre1\build\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
@@ -102,20 +103,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.4.247\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.4.247\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.4.247\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
     <EmbeddedResource Include="..\..\..\..\NewPlayer\NewPlayer\Views\MediaRenderingView.xaml">
       <Link>Views\MediaRenderingView.xaml</Link>
       <Generator>MSBuild:Compile</Generator>
@@ -132,12 +119,27 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xamarin.Forms.2.4.0.266-pre1\lib\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xamarin.Forms.2.4.0.266-pre1\lib\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.Platform.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xamarin.Forms.2.4.0.266-pre1\lib\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.Xaml.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Project="..\..\packages\Xamarin.Forms.2.3.4.247\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.4.247\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>이 프로젝트는 이 컴퓨터에 없는 NuGet 패키지를 참조합니다. 해당 패키지를 다운로드하려면 NuGet 패키지 복원을 사용하십시오. 자세한 내용은 http://go.microsoft.com/fwlink/?LinkID=322105를 참조하십시오. 누락된 파일은 {0}입니다.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.4.247\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.4.247\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.4.0.266-pre1\build\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.4.0.266-pre1\build\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.props'))" />
+    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.4.0.266-pre1\build\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.4.0.266-pre1\build\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.targets'))" />
   </Target>
+  <Import Project="..\..\packages\Xamarin.Forms.2.4.0.266-pre1\build\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.4.0.266-pre1\build\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.targets')" />
 </Project>
\ No newline at end of file
diff --git a/Preview.Migration/NewPlayer/NewPlayer/NewPlayer/packages.config b/Preview.Migration/NewPlayer/NewPlayer/NewPlayer/packages.config
index e18960f..46b0e7b 100644
--- a/Preview.Migration/NewPlayer/NewPlayer/NewPlayer/packages.config
+++ b/Preview.Migration/NewPlayer/NewPlayer/NewPlayer/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Xamarin.Forms" version="2.3.4.247" targetFramework="portable45-net45+win8+wp8+wpa81" />
+  <package id="Xamarin.Forms" version="2.4.0.266-pre1" targetFramework="portable45-net45+win8+wp8+wpa81" />
 </packages>
\ No newline at end of file