优化代码，无功能更新

sswi · Feb 24, 2024 · aeacd41 · aeacd41
1 parent 787e769
commit aeacd41
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/AcrylicView.Samples/AcrylicView.Samples.csproj b/AcrylicView.Samples/AcrylicView.Samples.csproj
@@ -118,7 +118,7 @@
 	  <Folder Include="Resources\Raw\Video\" />
 	</ItemGroup>
 
-	<ProjectExtensions><VisualStudio><UserProperties XamarinHotReloadWrongLinkerErrorInfoBarAcrylicViewSamplesHideInfoBar="True" /></VisualStudio></ProjectExtensions>
+	<ProjectExtensions><VisualStudio><UserProperties XamarinHotReloadDebuggerTimeoutExceptionAcrylicViewSamplesHideInfoBar="True" XamarinHotReloadWrongLinkerErrorInfoBarAcrylicViewSamplesHideInfoBar="True" /></VisualStudio></ProjectExtensions>
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.7" />

diff --git a/AcrylicView.Samples/MainPage.xaml b/AcrylicView.Samples/MainPage.xaml
@@ -53,12 +53,10 @@
                   RowSpacing="20">
 
                 <!--  Row 1  -->
-                <ui:AcrylicView
-                                BorderColor="WhiteSmoke"
+                <ui:AcrylicView BorderColor="WhiteSmoke"
                                 BorderThickness="1"
                                 CornerRadius="20">
-                    <Grid
-                          ColumnDefinitions="*,*,*,*"
+                    <Grid ColumnDefinitions="*,*,*,*"
                           VerticalOptions="Center">
                         <StackLayout HorizontalOptions="Center">
                             <Label Style="{StaticResource IconStyle}"

diff --git a/AcrylicView/Controls/AcrylicViewHandler.cs b/AcrylicView/Controls/AcrylicViewHandler.cs
@@ -2,7 +2,7 @@
 {
     public partial class AcrylicViewHandler
     {
-        private static readonly PropertyMapper<IAcrylicView, AcrylicViewHandler> propertyMapper = new(ViewMapper)
+        private static readonly PropertyMapper<IAcrylicView, AcrylicViewHandler> propertyMapper = new()
         {
             [nameof(IAcrylicView.CornerRadius)] = MapCornerRadius,
             [nameof(IAcrylicView.TintColor)] = MapTintColor,

diff --git a/AcrylicView/Platforms/Android/AcrylicViewHandler.cs b/AcrylicView/Platforms/Android/AcrylicViewHandler.cs
@@ -167,7 +167,7 @@ private void UpdateColorblendLayer(IAcrylicView view)
         {
             if ((view.TintColor == null || view.TintColor == Colors.Transparent) && view.EffectStyle == EffectStyle.Custom)
             {
-                colorBlendLayer.SetBackgroundDrawable(null);                
+                colorBlendLayer.SetBackgroundDrawable(null);
             }
             else
             {

diff --git a/AcrylicView/Platforms/Android/RealtimeBlurView.cs b/AcrylicView/Platforms/Android/RealtimeBlurView.cs
@@ -430,8 +430,9 @@ public bool OnPreDraw()
                 {
                     bool redrawBitmap = blurView.mBlurredBitmap != oldBmp;
 
-                    //获取view所在的左上角位置
+                    //获取view所在屏幕的左上角位置
                     decor.GetLocationOnScreen(locations);
+                    //获取view在父视图中左上角位置
                     blurView.GetLocationOnScreen(locations);
 
                     //float x = locations[0];
@@ -444,9 +445,11 @@ public bool OnPreDraw()
                     RENDERING_COUNT++;
                     try
                     {
-                        float _borderWidth = (float)(_density * (_borderThickness.Left + _borderThickness.Right));
-                        float _borderHeight = (float)(_density * (_borderThickness.Top + _borderThickness.Bottom));
-                        blurView.mBlurringCanvas.Scale((blurView.mBitmapToBlur.Width + _borderWidth) / blurView.Width, (blurView.mBitmapToBlur.Height + _borderHeight) / blurView.Height);
+                        float sx = (float)blurView.mBitmapToBlur.Width / blurView.Width;
+                        float sy = (float)blurView.mBitmapToBlur.Height / blurView.Height;
+
+                        blurView.mBlurringCanvas.Scale(sx, sy);
+
                         blurView.mBlurringCanvas.Translate(-locations[0], -locations[1]);
                         decor.Background?.Draw(blurView.mBlurringCanvas);
                         decor.Draw(blurView.mBlurringCanvas);