From 49e4e46cdb697e74b9b03946d9fbd0479ff4e04c Mon Sep 17 00:00:00 2001 From: gaoyuan Date: Sun, 6 Mar 2022 22:19:06 +0800 Subject: [PATCH] fix sort issue --- Billing.Shared/Views/BillPage.xaml.cs | 2 +- Billing.sln | 26 +++++++++---------- .../Properties/AndroidManifest.xml | 2 +- Billing/Billing.iOS/Billing.iOS.csproj | 4 ++- Billing/Billing.iOS/Info.plist | 4 +-- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/Billing.Shared/Views/BillPage.xaml.cs b/Billing.Shared/Views/BillPage.xaml.cs index fe8ecaf..c7d23ff 100644 --- a/Billing.Shared/Views/BillPage.xaml.cs +++ b/Billing.Shared/Views/BillPage.xaml.cs @@ -60,7 +60,7 @@ namespace Billing.Views b.CreateTime.Year == e.Date.Year && b.CreateTime.Month == e.Date.Month && b.CreateTime.Day == e.Date.Day); - Bills = new List(bills.Select(b => WrapBill(b))); + Bills = new List(bills.OrderBy(b => b.CreateTime).Select(b => WrapBill(b))); RefreshBalance(Bills); MainThread.BeginInvokeOnMainThread(async () => await scrollView.ScrollToAsync(0, 0, true)); }); diff --git a/Billing.sln b/Billing.sln index 84061b3..60899bf 100644 --- a/Billing.sln +++ b/Billing.sln @@ -9,7 +9,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Billing.iOS", "Billing\Bill EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Billing.Shared", "Billing.Shared\Billing.Shared.shproj", "{6AC75D01-70D6-4A07-8685-BC52AFD97A7A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Svg2Png", "Svg2Png\Svg2Png.csproj", "{43BB5B21-61E0-42BB-ADF1-DBCD662E61E1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Svg2Png", "Svg2Png\Svg2Png.csproj", "{6A012FCA-3B1C-4593-ADD7-0751E5815C67}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution @@ -62,18 +62,18 @@ Global {5C4F1C35-6F66-4063-9605-A9F37FCABBA8}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator {5C4F1C35-6F66-4063-9605-A9F37FCABBA8}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator {5C4F1C35-6F66-4063-9605-A9F37FCABBA8}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator - {43BB5B21-61E0-42BB-ADF1-DBCD662E61E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {43BB5B21-61E0-42BB-ADF1-DBCD662E61E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {43BB5B21-61E0-42BB-ADF1-DBCD662E61E1}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {43BB5B21-61E0-42BB-ADF1-DBCD662E61E1}.Debug|iPhone.Build.0 = Debug|Any CPU - {43BB5B21-61E0-42BB-ADF1-DBCD662E61E1}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {43BB5B21-61E0-42BB-ADF1-DBCD662E61E1}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {43BB5B21-61E0-42BB-ADF1-DBCD662E61E1}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator - {43BB5B21-61E0-42BB-ADF1-DBCD662E61E1}.Release|Any CPU.Build.0 = Release|iPhoneSimulator - {43BB5B21-61E0-42BB-ADF1-DBCD662E61E1}.Release|iPhone.ActiveCfg = Release|iPhoneSimulator - {43BB5B21-61E0-42BB-ADF1-DBCD662E61E1}.Release|iPhone.Build.0 = Release|iPhoneSimulator - {43BB5B21-61E0-42BB-ADF1-DBCD662E61E1}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {43BB5B21-61E0-42BB-ADF1-DBCD662E61E1}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator + {6A012FCA-3B1C-4593-ADD7-0751E5815C67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6A012FCA-3B1C-4593-ADD7-0751E5815C67}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6A012FCA-3B1C-4593-ADD7-0751E5815C67}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {6A012FCA-3B1C-4593-ADD7-0751E5815C67}.Debug|iPhone.Build.0 = Debug|Any CPU + {6A012FCA-3B1C-4593-ADD7-0751E5815C67}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator + {6A012FCA-3B1C-4593-ADD7-0751E5815C67}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator + {6A012FCA-3B1C-4593-ADD7-0751E5815C67}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator + {6A012FCA-3B1C-4593-ADD7-0751E5815C67}.Release|Any CPU.Build.0 = Release|iPhoneSimulator + {6A012FCA-3B1C-4593-ADD7-0751E5815C67}.Release|iPhone.ActiveCfg = Release|iPhoneSimulator + {6A012FCA-3B1C-4593-ADD7-0751E5815C67}.Release|iPhone.Build.0 = Release|iPhoneSimulator + {6A012FCA-3B1C-4593-ADD7-0751E5815C67}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator + {6A012FCA-3B1C-4593-ADD7-0751E5815C67}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Billing/Billing.Android/Properties/AndroidManifest.xml b/Billing/Billing.Android/Properties/AndroidManifest.xml index 816f0a7..f0ced59 100644 --- a/Billing/Billing.Android/Properties/AndroidManifest.xml +++ b/Billing/Billing.Android/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@  - + diff --git a/Billing/Billing.iOS/Billing.iOS.csproj b/Billing/Billing.iOS/Billing.iOS.csproj index d0cff99..9a4e4f3 100644 --- a/Billing/Billing.iOS/Billing.iOS.csproj +++ b/Billing/Billing.iOS/Billing.iOS.csproj @@ -37,6 +37,7 @@ 4 None x86_64 + iPhone Distribution true @@ -60,8 +61,9 @@ prompt 4 ARM64 - iPhone Developer + iPhone Distribution Entitlements.plist + SdkOnly diff --git a/Billing/Billing.iOS/Info.plist b/Billing/Billing.iOS/Info.plist index 7615a37..b7517b4 100644 --- a/Billing/Billing.iOS/Info.plist +++ b/Billing/Billing.iOS/Info.plist @@ -45,8 +45,8 @@ UIFileSharingEnabled CFBundleVersion - 3 + 4 CFBundleShortVersionString - 0.3.303 + 0.4.306