IHttpService.GetImageAsync use Polly & AppLogo Update SVG & Mobile UI…

… MyPage

src/ST.Client.Mobile.Droid/UI/Views.Controls/RecyclerViewRenderer.android.cs

@@ -0,0 +1,79 @@
+//using Android.Content;
+//using Xamarin.Forms;
+//using Xamarin.Forms.Platform.Android;
+//using ARecyclerView = AndroidX.RecyclerView.Widget.RecyclerView;
+//using XFRecyclerView = System.Application.UI.Views.Controls.RecyclerView;
+
+//namespace System.Application.UI.Views.Controls
+//{
+//    partial class RecyclerViewRenderer : ViewRenderer<XFRecyclerView, ARecyclerView>
+//    {
+//        TableViewModelRenderer _adapter;
+//        bool _disposed;
+
+//        public RecyclerViewRenderer(Context context) : base(context)
+//        {
+//            AutoPackage = false;
+//        }
+
+//        protected virtual TableViewModelRenderer GetModelRenderer(ARecyclerView listView, XFRecyclerView view)
+//        {
+//            return new TableViewModelRenderer(Context, listView, view);
+//        }
+
+//        protected override Size MinimumSize()
+//        {
+//            return new Size(20, 20);
+//        }
+
+//        protected override ARecyclerView CreateNativeControl()
+//        {
+//            return new ARecyclerView(Context);
+//        }
+
+//        protected override void OnElementChanged(ElementChangedEventArgs<XFRecyclerView> e)
+//        {
+//            base.OnElementChanged(e);
+
+//            var listView = Control;
+//            if (listView == null)
+//            {
+//                listView = CreateNativeControl();
+//                SetNativeControl(listView);
+//            }
+
+//            listView.Focusable = false;
+//            listView.DescendantFocusability = DescendantFocusability.AfterDescendants;
+
+//            var view = e.NewElement;
+
+//            _adapter = GetModelRenderer(listView, view);
+//            listView.Adapter = _adapter;
+//        }
+
+//        protected override void OnAttachedToWindow()
+//        {
+//            base.OnAttachedToWindow();
+
+//            if (Forms.IsLollipopOrNewer && Control != null)
+//                Control.NestedScrollingEnabled = (Parent.GetParentOfType<NestedScrollView>() != null);
+//        }
+
+//        class CellAdapter : ARecyclerView.Adapter
+//        {
+//            readonly Context context;
+
+//            public CellAdapter(Context context)
+//            {
+//                this.context = context;
+//            }
+//        }
+
+//        class TableViewModelRenderer : CellAdapter
+//        {
+//            public TableViewModelRenderer(Context context, ARecyclerView listView, XFRecyclerView view) : base(context)
+//            {
+//            }
+//        }
+//    }
+//}

src/ST.Client.Mobile.Droid/UI/Views.Controls/RecyclerViewRenderer.shared.cs

@@ -0,0 +1,12 @@
+using System.Application.UI.Views.Controls;
+using Xamarin.Forms;
+using XFRecyclerView = System.Application.UI.Views.Controls.RecyclerView;
+
+[assembly: ExportRenderer(typeof(XFRecyclerView), typeof(RecyclerViewRenderer))]
+
+namespace System.Application.UI.Views.Controls
+{
+    internal partial class RecyclerViewRenderer
+    {
+    }
+}

src/ST.Client.Mobile/ST.Client.Mobile.csproj

@@ -79,6 +79,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Identity.Client" Version="4.31.0" />
+    <PackageReference Include="Xam.Plugins.Forms.ImageCircle" Version="3.0.0.5" />
     <PackageReference Include="Xamarin.Forms" Version="5.0.0.2012" />
     <PackageReference Include="Xamarin.Forms.Visual.Material" Version="5.0.0.2012" />
     <PackageReference Include="StatefulModel.Standard" Version="0.1.0" />
@@ -107,8 +108,4 @@
     </EmbeddedResource>
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="UI\Views\Controls\" />
-  </ItemGroup>
-
 </Project>

src/ST.Client.Mobile/UI/Views/Controls/RecyclerView.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xamarin.Forms;
+
+namespace System.Application.UI.Views.Controls
+{
+    public class RecyclerView : TableView
+    {
+    }
+}

src/ST.Client.Mobile/UI/Views/MyPage.xaml

@@ -1,31 +1,45 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:xfp_controls="clr-namespace:ImageCircle.Forms.Plugin.Abstractions;assembly=ImageCircle.Forms.Plugin"
              xmlns:resx="clr-namespace:System.Application.UI.Resx"
              x:Class="System.Application.UI.Views.MyPage"
+             BackgroundColor="{DynamicResource WindowBackground}"
              Title="{x:Static resx:AppResources.My}">
   <ContentPage.Resources>
-    <OnPlatform x:Key="baseline_phone_black_24" 
-                x:TypeArguments="FileImageSource" 
+    <OnPlatform x:Key="baseline_phone_black_24"
+                x:TypeArguments="FileImageSource"
                 Default="baseline_phone_iphone_black_24">
       <OnPlatform.Platforms>
-        <!--<On Platform="iOS" Value="baseline_phone_iphone_black_24" />-->
-        <On Platform="Android" Value="baseline_phone_android_black_24" />
+        <On Platform="Android" Value="baseline_phone_android_black_24"/>
       </OnPlatform.Platforms>
     </OnPlatform>
   </ContentPage.Resources>
   <ContentPage.Content>
-    <TableView>
-      <TableRoot>
-        <TableSection>
-          <ImageCell ImageSource="baseline_person_black_24" Text="NickName" />
-          <ImageCell ImageSource="baseline_account_box_black_24" Text="{x:Static resx:AppResources.User_EditProfile}" />
-          <ImageCell ImageSource="{x:StaticResource Key=baseline_phone_black_24}" Text="{x:Static resx:AppResources.User_BindPhoneNum}" />
-          <ImageCell ImageSource="{x:StaticResource Key=baseline_phone_black_24}" Text="{x:Static resx:AppResources.User_ChangePhoneNum}" />
-          <ImageCell ImageSource="baseline_settings_black_24" Text="{x:Static resx:AppResources.Settings}" />
-          <ImageCell ImageSource="baseline_info_black_24" Text="{x:Static resx:AppResources.About}" />
-        </TableSection>
-      </TableRoot>
-    </TableView>
+    <StackLayout Orientation="Vertical">
+      <xfp_controls:CircleImage Source="avater_default"
+                                HeightRequest="100"
+                                WidthRequest="100"
+                                BorderColor="#C0C0C0"
+                                BorderThickness="0.5"
+                                Aspect="AspectFill"
+                                HorizontalOptions="Center"
+                                Margin="0,24,0,4"/>
+      <Label HorizontalOptions="Center"
+             Text="{x:Static resx:AppResources.LoginAndRegister}"
+             Margin="0,0,0,4"
+             FontSize="24"/>
+      <TableView>
+        <TableRoot>
+          <TableSection>
+            <ImageCell ImageSource="baseline_account_box_black_24" Text="{x:Static resx:AppResources.User_EditProfile}"/>
+            <ImageCell ImageSource="{x:StaticResource Key=baseline_phone_black_24}" Text="{x:Static resx:AppResources.User_BindPhoneNum}"/>
+            <ImageCell ImageSource="{x:StaticResource Key=baseline_phone_black_24}" Text="{x:Static resx:AppResources.User_ChangePhoneNum}"/>
+            <ImageCell ImageSource="baseline_settings_black_24" Text="{x:Static resx:AppResources.Settings}"/>
+            <ImageCell ImageSource="baseline_info_black_24" Text="{x:Static resx:AppResources.About}"/>
+          </TableSection>
+        </TableRoot>
+      </TableView>
+    </StackLayout>
   </ContentPage.Content>
 </ContentPage>

src/ST.Client/Services/Implementation/HttpServiceImpl.cs

@@ -1,5 +1,6 @@
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
+using Polly;
 using System.Collections.Concurrent;
 using System.IO;
 using System.IO.FileFormats;
@@ -307,7 +308,35 @@ public HttpServiceImpl(
             return string.IsNullOrEmpty(file) ? null : File.OpenRead(file);
         }
 
-        public async Task<string?> GetImageAsync(string requestUri, string channelType, CancellationToken cancellationToken)
+        #region Polly
+
+        const int numRetries = 5;
+
+        static TimeSpan PollyRetryAttempt(int attemptNumber)
+        {
+            var powY = attemptNumber % numRetries;
+            var timeSpan = TimeSpan.FromMilliseconds(Math.Pow(2, powY));
+            int addS = attemptNumber / numRetries;
+            if (addS > 0) timeSpan = timeSpan.Add(TimeSpan.FromSeconds(addS));
+            return timeSpan;
+        }
+
+        #endregion
+
+        Task<string?> IHttpService.GetImageAsync(string requestUri, string channelType, CancellationToken cancellationToken)
+        {
+            return GetImageLocalFilePathByPollyAsync(requestUri, channelType, cancellationToken);
+        }
+
+        public async Task<string?> GetImageLocalFilePathByPollyAsync(string requestUri, string channelType, CancellationToken cancellationToken)
+        {
+            var r = await Policy.HandleResult<string?>(string.IsNullOrWhiteSpace)
+              .WaitAndRetryAsync(numRetries, PollyRetryAttempt)
+              .ExecuteAsync(ct => GetImageLocalFilePathAsync(requestUri, channelType, ct), cancellationToken);
+            return r;
+        }
+
+        public async Task<string?> GetImageLocalFilePathAsync(string requestUri, string channelType, CancellationToken cancellationToken)
         {
             if (!IsHttpUrl(requestUri)) return null;
 

src/ST/Services/IHttpService.cs

@@ -68,6 +68,7 @@ public interface IHttpService
         /// <param name="requestUri"></param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
+        [Obsolete]
         Task<Stream?> GetImageStreamAsync(string requestUri, CancellationToken cancellationToken = default);
     }