From d815ec427cb61fc6c82d25c6a65fca2e1766ed71 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 25 三月 2021 13:48:51 +0800
Subject: [PATCH] 2021-03-25 1.UI优化
---
Shared.IOS.JLCountryCode/ApiDefinition.cs | 21 +++++++++++++++++++++
Shared.Droid.JLCountryCode/Transforms/Metadata.xml | 1 +
Shared.IOS.JLCountryCode/Resources/ic_ss_arrow_back.png | 0
Shared.IOS.JLCountryCode/Shared.IOS.JLCountryCode.csproj | 1 +
Shared.IOS.JLCountryCode/Properties/AssemblyInfo.cs | 2 +-
Shared.Droid.JLCountryCode/Properties/AssemblyInfo.cs | 4 ++--
Shared.IOS.JLCountryCode/Library/libJLCountryCode.a | 0
Shared.Droid.JLCountryCode/Jars/JLCountryCode-V1.0.4.aar | 0
Shared.Droid.JLCountryCode/Shared.Droid.JLCountryCode.csproj | 2 +-
9 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/Shared.Droid.JLCountryCode/Jars/JLCountryCode-V1.0.3.aar b/Shared.Droid.JLCountryCode/Jars/JLCountryCode-V1.0.4.aar
similarity index 77%
rename from Shared.Droid.JLCountryCode/Jars/JLCountryCode-V1.0.3.aar
rename to Shared.Droid.JLCountryCode/Jars/JLCountryCode-V1.0.4.aar
index 13e4f5b..fbfe9ee 100644
--- a/Shared.Droid.JLCountryCode/Jars/JLCountryCode-V1.0.3.aar
+++ b/Shared.Droid.JLCountryCode/Jars/JLCountryCode-V1.0.4.aar
Binary files differ
diff --git a/Shared.Droid.JLCountryCode/Properties/AssemblyInfo.cs b/Shared.Droid.JLCountryCode/Properties/AssemblyInfo.cs
index 847dd8d..5ef5cb6 100644
--- a/Shared.Droid.JLCountryCode/Properties/AssemblyInfo.cs
+++ b/Shared.Droid.JLCountryCode/Properties/AssemblyInfo.cs
@@ -26,5 +26,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.3.0")]
-[assembly: AssemblyFileVersion("1.0.3.0")]
+[assembly: AssemblyVersion("1.0.5.0")]
+[assembly: AssemblyFileVersion("1.0.5.0")]
diff --git a/Shared.Droid.JLCountryCode/Shared.Droid.JLCountryCode.csproj b/Shared.Droid.JLCountryCode/Shared.Droid.JLCountryCode.csproj
index 3f61bd4..acf7b21 100644
--- a/Shared.Droid.JLCountryCode/Shared.Droid.JLCountryCode.csproj
+++ b/Shared.Droid.JLCountryCode/Shared.Droid.JLCountryCode.csproj
@@ -53,7 +53,7 @@
<TransformFile Include="Transforms\EnumMethods.xml" />
</ItemGroup>
<ItemGroup>
- <LibraryProjectZip Include="Jars\JLCountryCode-V1.0.3.aar" />
+ <LibraryProjectZip Include="Jars\JLCountryCode-V1.0.4.aar" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/Shared.Droid.JLCountryCode/Transforms/Metadata.xml b/Shared.Droid.JLCountryCode/Transforms/Metadata.xml
index 3bbfa94..9246393 100644
--- a/Shared.Droid.JLCountryCode/Transforms/Metadata.xml
+++ b/Shared.Droid.JLCountryCode/Transforms/Metadata.xml
@@ -13,5 +13,6 @@
<remove-node path="/api/package[@name='com.alibaba.fastjson']/class[@name='JSONArray']" />
<remove-node path="/api/package[@name='com.alibaba.fastjson.parser']/class[@name='JavaBeanDeserializer']" />
<remove-node path="/api/package[@name='com.alibaba.fastjson.serializer']/class[@name='FieldSerializer']" />
+ <remove-node path="/api/package[@name='com.widget.jlcountrycode.sortselect']/class[@name='SortSelectItemComparator']" />
<!-- <remove-node />-->
</metadata>
\ No newline at end of file
diff --git a/Shared.IOS.JLCountryCode/ApiDefinition.cs b/Shared.IOS.JLCountryCode/ApiDefinition.cs
index ca4733d..db61d35 100644
--- a/Shared.IOS.JLCountryCode/ApiDefinition.cs
+++ b/Shared.IOS.JLCountryCode/ApiDefinition.cs
@@ -17,5 +17,26 @@
[Export("selectCountryCodeBlock", ArgumentSemantic.Copy)]
selectCountryCodeBlock SelectCountryCodeBlock { get; set; }
}
+
+ // typedef void (^SortSelectionBlock)(NSString * _Nonnull);
+ delegate void SortSelectionBlock(string arg0);
+
+ // @interface JLSortSelectionViewController : UIViewController
+ [BaseType(typeof(UIViewController))]
+ interface JLSortSelectionViewController
+ {
+ // @property (copy, nonatomic) SortSelectionBlock _Nonnull sortSelectionBlock;
+ [Export("sortSelectionBlock", ArgumentSemantic.Copy)]
+ SortSelectionBlock SortSelectionBlock { get; set; }
+
+ // @property (copy, nonatomic) NSDictionary * _Nonnull sortedNameDict;
+ [Export("sortedNameDict", ArgumentSemantic.Copy)]
+ NSDictionary SortedNameDict { get; set; }
+
+ // @property (copy, nonatomic) NSString * _Nonnull titleStr;
+ [Export("titleStr")]
+ string TitleStr { get; set; }
+ }
+
}
diff --git a/Shared.IOS.JLCountryCode/Library/libJLCountryCode.a b/Shared.IOS.JLCountryCode/Library/libJLCountryCode.a
index 53c2b13..b8082c5 100644
--- a/Shared.IOS.JLCountryCode/Library/libJLCountryCode.a
+++ b/Shared.IOS.JLCountryCode/Library/libJLCountryCode.a
Binary files differ
diff --git a/Shared.IOS.JLCountryCode/Properties/AssemblyInfo.cs b/Shared.IOS.JLCountryCode/Properties/AssemblyInfo.cs
index 469151a..5d95df5 100644
--- a/Shared.IOS.JLCountryCode/Properties/AssemblyInfo.cs
+++ b/Shared.IOS.JLCountryCode/Properties/AssemblyInfo.cs
@@ -25,7 +25,7 @@
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-[assembly: AssemblyVersion("1.0.3")]
+[assembly: AssemblyVersion("1.0.5")]
// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.
diff --git a/Shared.IOS.JLCountryCode/Resources/ic_ss_arrow_back.png b/Shared.IOS.JLCountryCode/Resources/ic_ss_arrow_back.png
new file mode 100644
index 0000000..f3d1270
--- /dev/null
+++ b/Shared.IOS.JLCountryCode/Resources/ic_ss_arrow_back.png
Binary files differ
diff --git a/Shared.IOS.JLCountryCode/Shared.IOS.JLCountryCode.csproj b/Shared.IOS.JLCountryCode/Shared.IOS.JLCountryCode.csproj
index 8ab6c9d..23f7018 100644
--- a/Shared.IOS.JLCountryCode/Shared.IOS.JLCountryCode.csproj
+++ b/Shared.IOS.JLCountryCode/Shared.IOS.JLCountryCode.csproj
@@ -54,6 +54,7 @@
<ItemGroup>
<BundleResource Include="Resources\countryCodeCH.plist" />
<BundleResource Include="Resources\countryCodeEN.plist" />
+ <BundleResource Include="Resources\ic_ss_arrow_back.png" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.ObjCBinding.CSharp.targets" />
</Project>
\ No newline at end of file
--
Gitblit v1.8.0