8000 Changes in Xamarin Client to fox image erro with local Docker · ITCSsDeveloper/eShopOnContainers@67bfe7d · GitHub
Skip to content

Commit 67bfe7d

Browse files
jsuarezruizjsuarezruiz
committed
Changes in Xamarin Client to fox image erro with local Docker
1 parent 484a7d0 commit 67bfe7d

8 files changed

Lines changed: 40 additions & 60 deletions

File tree

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/ServicesHelper.cs‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
using eShopOnContainers.Core.Models.Catalog;
2+
using eShopOnContainers.ViewModels.Base;
3+
using System.Collections.Generic;
4+
using System.Text.RegularExpressions;
5+
6+
namespace eShopOnContainers.Core.Helpers
7+
{
8+
public static class ServicesHelper
9+
{
10+
public static void FixCatalogItemPictureUri(IEnumerable<CatalogItem> catalogItems)
11+
{
12+
if(catalogItems == null)
13+
{
14+
return;
15+
}
16+
17+
if (!ViewModelLocator.Instance.UseMockService
18+
&& Settings.UrlBase != GlobalSetting.DefaultEndpoint)
19+
{
20+
foreach (var catalogItem in catalogItems)
21+
{
22+
Regex ip = new Regex(@"\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b");
23+
MatchCollection serverResult = ip.Matches(catalogItem.PictureUri);
24+
MatchCollection localResult = ip.Matches(Settings.UrlBase);
25+
26+
if (serverResult.Count != -1 && localResult.Count != -1)
27+
{
28+
var serviceIp = serverResult[0].Value;
29+
var localIp = localResult[0].Value;
30+
catalogItem.PictureUri = catalogItem.PictureUri.Replace(serviceIp, localIp);
31+
}
32+
}
33+
}
34+
}
35+
}
36+
}

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Catalog/CatalogService.cs‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
using eShopOnContainers.Core.Services.RequestProvider;
66
using eShopOnContainers.Core.Extensions;
77
using System.Collections.Generic;
8-
using eShopOnContainers.ViewModels.Base;
98
using eShopOnContainers.Core.Helpers;
10 77F4 -
using Xamarin.Forms;
11-
using eShopOnContainers.Core.Services.IPAddress;
12-
using System.Text.RegularExpressions;
139

1410
namespace eShopOnContainers.Core.Services.Catalog
1511
{
@@ -61,22 +57,7 @@ public async Task<ObservableCollection<CatalogItem>> GetCatalogAsync()
6157

6258
if (catalog?.Data != null)
6359
{
64-
// TODO: Experimental
65-
if (!ViewModelLocator.Instance.UseMockService && Settings.UrlBase != GlobalSetting.DefaultEndpoint)
66-
{
67-
foreach (var catalogItem in catalog?.Data)
68-
{
69-
//string ipaddress = DependencyService.Get<IIPAddressService>().GetIPAddress();
70-
Regex ip = new Regex(@"\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b");
71-
MatchCollection result = ip.Matches(catalogItem.PictureUri);
72-
73-
if (result.Count != -1)
74-
{
75-
var serviceIp = result[0].Value;
76-
catalogItem.PictureUri = catalogItem.PictureUri.Replace(serviceIp, Settings.UrlBase);
77-
}
78-
}
79-
}
60+
ServicesHelper.FixCatalogItemPictureUri(catalog?.Data);
8061

8162
return catalog?.Data.ToObservableCollection();
8263
}

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/IPAddress/IIPAddressService.cs‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
<Compile Include="Extensions\ObservableExtension.cs" />
6767
<Compile Include="GlobalSettings.cs" />
6868
<Compile Include="Helpers\EasingHelper.cs" />
69+
<Compile Include="Helpers\ServicesHelper.cs" />
6970
<Compile Include="Helpers\Settings.cs" />
7071
<Compile Include="Models\Basket\BasketItem.cs" />
7172
<Compile Include="Models\Basket\CustomerBasket.cs" />
@@ -94,7 +95,6 @@
9495
<Compile Include="Services\Dialog\IDialogService.cs" />
9596
<Compile Include="Services\Identity\IdentityService.cs" />
9697
<Compile Include="Services\Identity\IIdentityService.cs" />
97-
<Compile Include="Services\IPAddress\IIPAddressService.cs" />
9898
<Compile Include="Services\Navigation\INavigationService.cs" />
9999
<Compile Include="Services\Navigation\NavigationService.cs" />
100100
<Compile Include="Services\OpenUrl\IOpenUrlService.cs" />

‎src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Services/IPAddress/IPAddressService.cs‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@
231231
<Compile Include="Renderers\SlideDownMenuPageRenderer.cs" />
232232
<Compile Include="Resources\Resource.Designer.cs" />
233233
<Compile Include="Properties\AssemblyInfo.cs" />
234-
<Compile Include="Services\IPAddress\IPAddressService.cs" />
235234
</ItemGroup>
236235
<ItemGroup>
237236
<AndroidAsset Include="..\CommonResources\Fonts\Montserrat-Bold.ttf">

‎src/Mobile/eShopOnContainers/eShopOnContainers.Windows/eShopOnContainers.Windows.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,7 @@
178178
<Name>eShopOnContainers.Core</Name>
179179
</ProjectReference>
180180
</ItemGroup>
181-
<ItemGroup>
182-
<Folder Include="Services\IPAddress\" />
183-
</ItemGroup>
181+
<ItemGroup />
184182
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
185183
<VisualStudioVersion>14.0</VisualStudioVersion>
186184
</PropertyGroup>

‎src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -429,9 +429,7 @@
429429
<Name>eShopOnContainers.Core</Name>
430430
</ProjectReference>
431431
</ItemGroup>
432-
<ItemGroup>
433-
<Folder Include="Services\IPAddress\" />
434-
</ItemGroup>
432+
<ItemGroup />
435433
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
436434
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
437435
<PropertyGroup>

0 commit comments

Comments
 (0)