refactor

realZhangChi · Mar 2, 2023 · e1e05ea · e1e05ea
1 parent 422a576
commit e1e05ea
Show file tree

Hide file tree

Showing 254 changed files with 717 additions and 1,579 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,10 +13,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: setup dotnet 6.0
+      - name: setup dotnet 7.0
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "6.0.x"
+          dotnet-version: "7.0.x"
 
       - name: install workload
         shell: pwsh

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,10 +14,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: setup dotnet 6.0
+      - name: setup dotnet 7.0
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "6.0.x"
+          dotnet-version: "7.0.x"
 
       - name: install workload
         shell: pwsh
@@ -38,7 +38,7 @@ jobs:
 
       - name: pack
         shell: pwsh
-        run: dotnet pack -c Release -o packages
+        run: dotnet pack -c Release
 
       - name: push
         env:

diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,4 @@
 /src/Getui/**/*.aar
 /src/Toaster/**/*.aar
 /src/WeChat/**/*.aar
+/src/DialogX/**/*.aar
diff --git a/common.props → Directory.Build.props b/common.props → Directory.Build.props
@@ -1,10 +1,7 @@
 <Project>
   <PropertyGroup>
-    <PackageId>Chi.$(AssemblyName)</PackageId>
-    <Title>Chi.$(AssemblyName)</Title>
+    <PackageIdPrefix>Chi.MauiBinding</PackageIdPrefix>
     <Authors>ZhangChi</Authors>
-    <Version>0.1.0</Version>
-    <Description>Maui binding library for third-party vendor mobile SDKs.</Description>
     <Copyright>Copyright (c) ZhangChi(https://github.com/realZhangChi)</Copyright>
     <PackageProjectUrl>https://github.com/realZhangChi/MauiBinding</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/MauiBinding.sln b/MauiBinding.sln
diff --git a/global.json b/global.json
@@ -0,0 +1,5 @@
+{
+    "sdk": {
+      "version": "7.0.200"
+    }
+  }
diff --git a/scripts/push.ps1 b/scripts/push.ps1
@@ -2,9 +2,9 @@ $apiKey = $args[0]
 
 $rootPath = (Get-Item -Path "./" -Verbose).FullName
 
-Set-Location ./packages
+Set-Location $rootPath
 
-Get-ChildItem ./*.nupkg -recurse | ForEach-Object -Process {
+Get-ChildItem src/**/bin/Release/*.nupkg -recurse | ForEach-Object -Process {
 	if ($_ -is [System.IO.FileInfo]) {
 		dotnet nuget push $_.Name -s https://api.nuget.org/v3/index.json --api-key "$apiKey" --skip-duplicate
 	}

diff --git a/src/AMap/Android/AMap2D/AMap2D.csproj b/src/AMap/Android/AMap2D/AMap2D.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFramework>net7.0-android</TargetFramework>
+		<SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
+		<Nullable>enable</Nullable>
+		<ImplicitUsings>enable</ImplicitUsings>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<Version>6.0.0</Version>
+		<Description>Maui binding library for AMap2DMap_6.0.0_AMapSearch_9.2.0_AMapLocation_6.1.0_20220414.</Description>
+		<PackageId>$(PackageIdPrefix).Android.AMap2D</PackageId>
+		<Title>$(PackageIdPrefix).Android.AMap2D</Title>
+	</PropertyGroup>
+
+</Project>
diff --git a/...rch_9.2.0_AMapLocation_6.1.0_20220414.aar → ...rch_9.2.0_AMapLocation_6.1.0_20220414.aar b/...rch_9.2.0_AMapLocation_6.1.0_20220414.aar → ...rch_9.2.0_AMapLocation_6.1.0_20220414.aar
diff --git a/...p.2D.Android/Additions/AboutAdditions.txt → ...droid/AMap2D/Additions/AboutAdditions.txt b/...p.2D.Android/Additions/AboutAdditions.txt → ...droid/AMap2D/Additions/AboutAdditions.txt
diff --git a/...AMap.2D.Android/Transforms/EnumFields.xml → .../Android/AMap2D/Transforms/EnumFields.xml b/...AMap.2D.Android/Transforms/EnumFields.xml → .../Android/AMap2D/Transforms/EnumFields.xml
diff --git a/...Map.2D.Android/Transforms/EnumMethods.xml → ...Android/AMap2D/Transforms/EnumMethods.xml b/...Map.2D.Android/Transforms/EnumMethods.xml → ...Android/AMap2D/Transforms/EnumMethods.xml
diff --git a/...g.AMap.2D.Android/Transforms/Metadata.xml → ...ap/Android/AMap2D/Transforms/Metadata.xml b/...g.AMap.2D.Android/Transforms/Metadata.xml → ...ap/Android/AMap2D/Transforms/Metadata.xml
diff --git a/src/AMap/Android/AMap3D/AMap3D.csproj b/src/AMap/Android/AMap3D/AMap3D.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net7.0-android</TargetFramework>
+		<SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
+		<Nullable>enable</Nullable>
+		<ImplicitUsings>enable</ImplicitUsings>
+	</PropertyGroup>
+
+
+	<PropertyGroup>
+		<Version>9.4.0</Version>
+		<Description>Maui binding library for AMap3DMap_9.4.0_AMapSearch_9.4.0_AMapLocation_6.1.0_20220808.</Description>
+		<PackageId>$(PackageIdPrefix).Android.AMap3D</PackageId>
+		<Title>$(PackageIdPrefix).Android.AMap3D</Title>
+	</PropertyGroup>
+
+</Project>
diff --git a/...rch_9.4.0_AMapLocation_6.1.0_20220808.aar → ...rch_9.4.0_AMapLocation_6.1.0_20220808.aar b/...rch_9.4.0_AMapLocation_6.1.0_20220808.aar → ...rch_9.4.0_AMapLocation_6.1.0_20220808.aar
diff --git a/...p.3D.Android/Additions/AboutAdditions.txt → ...droid/AMap3D/Additions/AboutAdditions.txt b/...p.3D.Android/Additions/AboutAdditions.txt → ...droid/AMap3D/Additions/AboutAdditions.txt
diff --git a/...AMap.3D.Android/Transforms/EnumFields.xml → .../Android/AMap3D/Transforms/EnumFields.xml b/...AMap.3D.Android/Transforms/EnumFields.xml → .../Android/AMap3D/Transforms/EnumFields.xml
diff --git a/...Map.3D.Android/Transforms/EnumMethods.xml → ...Android/AMap3D/Transforms/EnumMethods.xml b/...Map.3D.Android/Transforms/EnumMethods.xml → ...Android/AMap3D/Transforms/EnumMethods.xml
diff --git a/...g.AMap.3D.Android/Transforms/Metadata.xml → ...ap/Android/AMap3D/Transforms/Metadata.xml b/...g.AMap.3D.Android/Transforms/Metadata.xml → ...ap/Android/AMap3D/Transforms/Metadata.xml
diff --git a/src/AMap/Android/AMapLite/AMapLite.csproj b/src/AMap/Android/AMapLite/AMapLite.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net7.0-android</TargetFramework>
+		<SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
+		<Nullable>enable</Nullable>
+		<ImplicitUsings>enable</ImplicitUsings>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<Version>1.2.0</Version>
+		<Description>Maui binding library for AMap Lite3dMap_1.2.0_AMapSearch_9.2.0_AMapLocation_6.1.0_20220414.</Description>
+		<PackageId>$(PackageIdPrefix).Android.Lite</PackageId>
+		<Title>$(PackageIdPrefix).Android.Lite</Title>
+	</PropertyGroup>
+
+</Project>
diff --git a/...Lite.Android/Additions/AboutAdditions.txt → ...oid/AMapLite/Additions/AboutAdditions.txt b/...Lite.Android/Additions/AboutAdditions.txt → ...oid/AMapLite/Additions/AboutAdditions.txt
diff --git a/...rch_9.2.0_AMapLocation_6.1.0_20220414.aar → ...rch_9.2.0_AMapLocation_6.1.0_20220414.aar b/...rch_9.2.0_AMapLocation_6.1.0_20220414.aar → ...rch_9.2.0_AMapLocation_6.1.0_20220414.aar
diff --git a/...ap.Lite.Android/Transforms/EnumFields.xml → ...ndroid/AMapLite/Transforms/EnumFields.xml b/...ap.Lite.Android/Transforms/EnumFields.xml → ...ndroid/AMapLite/Transforms/EnumFields.xml
diff --git a/...p.Lite.Android/Transforms/EnumMethods.xml → ...droid/AMapLite/Transforms/EnumMethods.xml b/...p.Lite.Android/Transforms/EnumMethods.xml → ...droid/AMapLite/Transforms/EnumMethods.xml
diff --git a/...AMap.Lite.Android/Transforms/Metadata.xml → .../Android/AMapLite/Transforms/Metadata.xml b/...AMap.Lite.Android/Transforms/Metadata.xml → .../Android/AMapLite/Transforms/Metadata.xml
diff --git a/src/AMap/Android/AMapLocation/AMapLocation.csproj b/src/AMap/Android/AMapLocation/AMapLocation.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net7.0-android</TargetFramework>
+		<SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
+		<Nullable>enable</Nullable>
+		<ImplicitUsings>enable</ImplicitUsings>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<Version>6.1.0</Version>
+		<Description>Maui binding library for AMapLocation_6.1.0_20220406.</Description>
+		<PackageId>$(PackageIdPrefix).Android.AMapLocation</PackageId>
+		<Title>$(PackageIdPrefix).Android.AMapLocation</Title>
+	</PropertyGroup>
+
+</Project>
diff --git a/...n.Android/AMapLocation_6.1.0_20220406.aar → ...pLocation/AMapLocation_6.1.0_20220406.aar b/...n.Android/AMapLocation_6.1.0_20220406.aar → ...pLocation/AMapLocation_6.1.0_20220406.aar
diff --git a/...tion.Android/Additions/AboutAdditions.txt → ...AMapLocation/Additions/AboutAdditions.txt b/...tion.Android/Additions/AboutAdditions.txt → ...AMapLocation/Additions/AboutAdditions.txt
diff --git a/...ocation.Android/Transforms/EnumFields.xml → ...id/AMapLocation/Transforms/EnumFields.xml b/...ocation.Android/Transforms/EnumFields.xml → ...id/AMapLocation/Transforms/EnumFields.xml
diff --git a/...cation.Android/Transforms/EnumMethods.xml → ...d/AMapLocation/Transforms/EnumMethods.xml b/...cation.Android/Transforms/EnumMethods.xml → ...d/AMapLocation/Transforms/EnumMethods.xml
diff --git a/....Location.Android/Transforms/Metadata.xml → ...roid/AMapLocation/Transforms/Metadata.xml b/....Location.Android/Transforms/Metadata.xml → ...roid/AMapLocation/Transforms/Metadata.xml
diff --git a/...rch_9.2.0_AMapLocation_6.1.0_20220608.aar → ...rch_9.2.0_AMapLocation_6.1.0_20220608.aar b/...rch_9.2.0_AMapLocation_6.1.0_20220608.aar → ...rch_9.2.0_AMapLocation_6.1.0_20220608.aar
diff --git a/src/AMap/Android/AMapNavi/AMapNavi.csproj b/src/AMap/Android/AMapNavi/AMapNavi.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net7.0-android</TargetFramework>
+		<SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
+		<Nullable>enable</Nullable>
+		<ImplicitUsings>enable</ImplicitUsings>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<Version>9.3.0</Version>
+		<Description>Maui binding library for AMap3DMap_9.3.0_AMapNavi_9.3.0_AMapSearch_9.2.0_AMapLocation_6.1.0_20220608.</Description>
+		<PackageId>$(PackageIdPrefix).Android.AMapNavi</PackageId>
+		<Title>$(PackageIdPrefix).Android.AMapNavi</Title>
+	</PropertyGroup>
+
+</Project>
diff --git a/...Navi.Android/Additions/AboutAdditions.txt → ...oid/AMapNavi/Additions/AboutAdditions.txt b/...Navi.Android/Additions/AboutAdditions.txt → ...oid/AMapNavi/Additions/AboutAdditions.txt
diff --git a/...ap.Navi.Android/Transforms/EnumFields.xml → ...ndroid/AMapNavi/Transforms/EnumFields.xml b/...ap.Navi.Android/Transforms/EnumFields.xml → ...ndroid/AMapNavi/Transforms/EnumFields.xml
diff --git a/...p.Navi.Android/Transforms/EnumMethods.xml → ...droid/AMapNavi/Transforms/EnumMethods.xml b/...p.Navi.Android/Transforms/EnumMethods.xml → ...droid/AMapNavi/Transforms/EnumMethods.xml
diff --git a/...AMap.Navi.Android/Transforms/Metadata.xml → .../Android/AMapNavi/Transforms/Metadata.xml b/...AMap.Navi.Android/Transforms/Metadata.xml → .../Android/AMapNavi/Transforms/Metadata.xml
diff --git a/src/AMap/Android/AMapTrack/AMapTrack.csproj b/src/AMap/Android/AMapTrack/AMapTrack.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net7.0-android</TargetFramework>
+		<SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
+		<Nullable>enable</Nullable>
+		<ImplicitUsings>enable</ImplicitUsings>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<Version>1.4.1</Version>
+		<Description>Maui binding library for AMapTrack_1.4.1_AMapLocation_6.1.0_20220406.</Description>
+		<PackageId>$(PackageIdPrefix).Android.AMapTrack</PackageId>
+		<Title>$(PackageIdPrefix).Android.AMapTrack</Title>
+	</PropertyGroup>
+
+</Project>
diff --git a/...ack_1.4.1_AMapLocation_6.1.0_20220406.aar → ...ack_1.4.1_AMapLocation_6.1.0_20220406.aar b/...ack_1.4.1_AMapLocation_6.1.0_20220406.aar → ...ack_1.4.1_AMapLocation_6.1.0_20220406.aar
diff --git a/...rack.Android/Additions/AboutAdditions.txt → ...id/AMapTrack/Additions/AboutAdditions.txt b/...rack.Android/Additions/AboutAdditions.txt → ...id/AMapTrack/Additions/AboutAdditions.txt
diff --git a/...p.Track.Android/Transforms/EnumFields.xml → ...droid/AMapTrack/Transforms/EnumFields.xml b/...p.Track.Android/Transforms/EnumFields.xml → ...droid/AMapTrack/Transforms/EnumFields.xml
diff --git a/....Track.Android/Transforms/EnumMethods.xml → ...roid/AMapTrack/Transforms/EnumMethods.xml b/....Track.Android/Transforms/EnumMethods.xml → ...roid/AMapTrack/Transforms/EnumMethods.xml
diff --git a/...Map.Track.Android/Transforms/Metadata.xml → ...Android/AMapTrack/Transforms/Metadata.xml b/...Map.Track.Android/Transforms/Metadata.xml → ...Android/AMapTrack/Transforms/Metadata.xml
diff --git a/src/AMap/MauiBinding.AMap.2D.Android/MauiBinding.AMap.2D.Android.csproj b/src/AMap/MauiBinding.AMap.2D.Android/MauiBinding.AMap.2D.Android.csproj
diff --git a/src/AMap/MauiBinding.AMap.3D.Android/MauiBinding.AMap.3D.Android.csproj b/src/AMap/MauiBinding.AMap.3D.Android/MauiBinding.AMap.3D.Android.csproj
diff --git a/src/AMap/MauiBinding.AMap.Lite.Android/MauiBinding.AMap.Lite.Android.csproj b/src/AMap/MauiBinding.AMap.Lite.Android/MauiBinding.AMap.Lite.Android.csproj
diff --git a/src/AMap/MauiBinding.AMap.Location.Android/MauiBinding.AMap.Location.Android.csproj b/src/AMap/MauiBinding.AMap.Location.Android/MauiBinding.AMap.Location.Android.csproj
diff --git a/src/AMap/MauiBinding.AMap.Navi.Android/MauiBinding.AMap.Navi.Android.csproj b/src/AMap/MauiBinding.AMap.Navi.Android/MauiBinding.AMap.Navi.Android.csproj
diff --git a/src/AMap/MauiBinding.AMap.Track.Android/MauiBinding.AMap.Track.Android.csproj b/src/AMap/MauiBinding.AMap.Track.Android/MauiBinding.AMap.Track.Android.csproj
diff --git a/...iPay.Android/Additions/AboutAdditions.txt → ...iPay/Android/Additions/AboutAdditions.txt b/...iPay.Android/Additions/AboutAdditions.txt → ...iPay/Android/Additions/AboutAdditions.txt
diff --git a/src/AliPay/Android/AliPay.csproj b/src/AliPay/Android/AliPay.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFramework>net7.0-android</TargetFramework>
+		<SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
+		<Nullable>enable</Nullable>
+		<ImplicitUsings>enable</ImplicitUsings>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<Version>15.8.11</Version>
+		<Description>Maui binding library for com.alipay.sdk.alipaysdk-android.</Description>
+		<PackageId>$(PackageIdPrefix).Android.AliPay</PackageId>
+		<Title>$(PackageIdPrefix).Android.AliPay</Title>
+	</PropertyGroup>
+
+</Project>
diff --git a/...auiBinding.AliPay.Android/NativeAsset.txt → src/AliPay/Android/NativeAsset.txt b/...auiBinding.AliPay.Android/NativeAsset.txt → src/AliPay/Android/NativeAsset.txt
diff --git a/....AliPay.Android/Transforms/EnumFields.xml → src/AliPay/Android/Transforms/EnumFields.xml b/....AliPay.Android/Transforms/EnumFields.xml → src/AliPay/Android/Transforms/EnumFields.xml
diff --git a/...AliPay.Android/Transforms/EnumMethods.xml → ...AliPay/Android/Transforms/EnumMethods.xml b/...AliPay.Android/Transforms/EnumMethods.xml → ...AliPay/Android/Transforms/EnumMethods.xml
diff --git a/...ng.AliPay.Android/Transforms/Metadata.xml → src/AliPay/Android/Transforms/Metadata.xml b/...ng.AliPay.Android/Transforms/Metadata.xml → src/AliPay/Android/Transforms/Metadata.xml
diff --git a/src/AliPay/MauiBinding.AliPay.Android/MauiBinding.AliPay.Android.csproj b/src/AliPay/MauiBinding.AliPay.Android/MauiBinding.AliPay.Android.csproj
diff --git a/...tion.Android/Additions/AboutAdditions.txt → ...uMapLocation/Additions/AboutAdditions.txt b/...tion.Android/Additions/AboutAdditions.txt → ...uMapLocation/Additions/AboutAdditions.txt
diff --git a/src/BaiduMap/Android/BaiduMapLocation/BaiduMapLocation.csproj b/src/BaiduMap/Android/BaiduMapLocation/BaiduMapLocation.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net7.0-android</TargetFramework>
+		<SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
+		<Nullable>enable</Nullable>
+		<ImplicitUsings>enable</ImplicitUsings>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<Version>9.3.7</Version>
+		<Description>Maui binding library for BaiduMapSDK_Location.</Description>
+		<PackageId>$(PackageIdPrefix).Android.BaiduMap_Location</PackageId>
+		<Title>$(PackageIdPrefix).Android.BaiduMap_Location</Title>
+	</PropertyGroup>
+
+	<ItemGroup>
+	  <None Remove="BaiduMapSDK_Location.aar" />
+	</ItemGroup>
+
+</Project>
diff --git a/...BaiduMap.Location.Android/NativeAsset.txt → .../Android/BaiduMapLocation/NativeAsset.txt b/...BaiduMap.Location.Android/NativeAsset.txt → .../Android/BaiduMapLocation/NativeAsset.txt
diff --git a/...ocation.Android/Transforms/EnumFields.xml → ...aiduMapLocation/Transforms/EnumFields.xml b/...ocation.Android/Transforms/EnumFields.xml → ...aiduMapLocation/Transforms/EnumFields.xml
diff --git a/...cation.Android/Transforms/EnumMethods.xml → ...iduMapLocation/Transforms/EnumMethods.xml b/...cation.Android/Transforms/EnumMethods.xml → ...iduMapLocation/Transforms/EnumMethods.xml
diff --git a/....Location.Android/Transforms/Metadata.xml → .../BaiduMapLocation/Transforms/Metadata.xml b/....Location.Android/Transforms/Metadata.xml → .../BaiduMapLocation/Transforms/Metadata.xml
diff --git a/...nAll.Android/Additions/AboutAdditions.txt → ...pLocationAll/Additions/AboutAdditions.txt b/...nAll.Android/Additions/AboutAdditions.txt → ...pLocationAll/Additions/AboutAdditions.txt
diff --git a/src/BaiduMap/Android/BaiduMapLocationAll/BaiduMapLocationAll.csproj b/src/BaiduMap/Android/BaiduMapLocationAll/BaiduMapLocationAll.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net7.0-android</TargetFramework>
+		<SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
+		<Nullable>enable</Nullable>
+		<ImplicitUsings>enable</ImplicitUsings>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<Version>9.3.7</Version>
+		<Description>Maui binding library for BaiduMapSDK_Location_All.</Description>
+		<PackageId>$(PackageIdPrefix).Android.BaiduMap_LocationAll</PackageId>
+		<Title>$(PackageIdPrefix).Android.BaiduMap_LocationAll</Title>
+	</PropertyGroup>
+
+	<ItemGroup>
+	  <None Remove="BaiduMapSDK_Location_All.aar" />
+	</ItemGroup>
+</Project>
diff --git a/...duMap.LocationAll.Android/NativeAsset.txt → ...droid/BaiduMapLocationAll/NativeAsset.txt b/...duMap.LocationAll.Android/NativeAsset.txt → ...droid/BaiduMapLocationAll/NativeAsset.txt
diff --git a/...tionAll.Android/Transforms/EnumFields.xml → ...uMapLocationAll/Transforms/EnumFields.xml b/...tionAll.Android/Transforms/EnumFields.xml → ...uMapLocationAll/Transforms/EnumFields.xml
diff --git a/...ionAll.Android/Transforms/EnumMethods.xml → ...MapLocationAll/Transforms/EnumMethods.xml b/...ionAll.Android/Transforms/EnumMethods.xml → ...MapLocationAll/Transforms/EnumMethods.xml
diff --git a/...cationAll.Android/Transforms/Metadata.xml → ...iduMapLocationAll/Transforms/Metadata.xml b/...cationAll.Android/Transforms/Metadata.xml → ...iduMapLocationAll/Transforms/Metadata.xml
diff --git a/....Map.Android/Additions/AboutAdditions.txt → .../BaiduMapMap/Additions/AboutAdditions.txt b/....Map.Android/Additions/AboutAdditions.txt → .../BaiduMapMap/Additions/AboutAdditions.txt
diff --git a/src/BaiduMap/Android/BaiduMapMap/BaiduMapMap.csproj b/src/BaiduMap/Android/BaiduMapMap/BaiduMapMap.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net7.0-android</TargetFramework>
+		<SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
+		<Nullable>enable</Nullable>
+		<ImplicitUsings>enable</ImplicitUsings>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<Version>7.5.4</Version>
+		<Description>Maui binding library for BaiduMapSDK_Map.</Description>
+		<PackageId>$(PackageIdPrefix).Android.BaiduMap_Map</PackageId>
+		<Title>$(PackageIdPrefix).Android.BaiduMap_Map</Title>
+	</PropertyGroup>
+
+	<ItemGroup>
+	  <None Remove="BaiduMapSDK_Map.aar" />
+	</ItemGroup>
+
+</Project>
diff --git a/...ding.BaiduMap.Map.Android/NativeAsset.txt → ...duMap/Android/BaiduMapMap/NativeAsset.txt b/...ding.BaiduMap.Map.Android/NativeAsset.txt → ...duMap/Android/BaiduMapMap/NativeAsset.txt
diff --git a/...Map.Map.Android/Transforms/EnumFields.xml → ...oid/BaiduMapMap/Transforms/EnumFields.xml b/...Map.Map.Android/Transforms/EnumFields.xml → ...oid/BaiduMapMap/Transforms/EnumFields.xml
diff --git a/...ap.Map.Android/Transforms/EnumMethods.xml → ...id/BaiduMapMap/Transforms/EnumMethods.xml b/...ap.Map.Android/Transforms/EnumMethods.xml → ...id/BaiduMapMap/Transforms/EnumMethods.xml
diff --git a/...duMap.Map.Android/Transforms/Metadata.xml → ...droid/BaiduMapMap/Transforms/Metadata.xml b/...duMap.Map.Android/Transforms/Metadata.xml → ...droid/BaiduMapMap/Transforms/Metadata.xml
diff --git a/...Navi.Android/Additions/AboutAdditions.txt → ...apMapAllNavi/Additions/AboutAdditions.txt b/...Navi.Android/Additions/AboutAdditions.txt → ...apMapAllNavi/Additions/AboutAdditions.txt
diff --git a/src/BaiduMap/Android/BaiduMapMapAllNavi/BaiduMapMapAllNavi.csproj b/src/BaiduMap/Android/BaiduMapMapAllNavi/BaiduMapMapAllNavi.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net7.0-android</TargetFramework>
+		<SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
+		<Nullable>enable</Nullable>
+		<ImplicitUsings>enable</ImplicitUsings>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<Version>7.5.4</Version>
+		<Description>Maui binding library for BaiduMapSDK_Map-AllNavi.</Description>
+		<PackageId>$(PackageIdPrefix).Android.BaiduMap_MapAllNavi</PackageId>
+		<Title>$(PackageIdPrefix).Android.BaiduMap_MapAllNavi</Title>
+	</PropertyGroup>
+
+	<ItemGroup>
+	  <None Remove="BaiduMapSDK_Map-AllNavi.aar" />
+	</ItemGroup>
+
+</Project>
diff --git a/...iduMap.MapAllNavi.Android/NativeAsset.txt → ...ndroid/BaiduMapMapAllNavi/NativeAsset.txt b/...iduMap.MapAllNavi.Android/NativeAsset.txt → ...ndroid/BaiduMapMapAllNavi/NativeAsset.txt
diff --git a/...AllNavi.Android/Transforms/EnumFields.xml → ...duMapMapAllNavi/Transforms/EnumFields.xml b/...AllNavi.Android/Transforms/EnumFields.xml → ...duMapMapAllNavi/Transforms/EnumFields.xml
diff --git a/...llNavi.Android/Transforms/EnumMethods.xml → ...uMapMapAllNavi/Transforms/EnumMethods.xml b/...llNavi.Android/Transforms/EnumMethods.xml → ...uMapMapAllNavi/Transforms/EnumMethods.xml
diff --git a/...apAllNavi.Android/Transforms/Metadata.xml → ...aiduMapMapAllNavi/Transforms/Metadata.xml b/...apAllNavi.Android/Transforms/Metadata.xml → ...aiduMapMapAllNavi/Transforms/Metadata.xml
diff --git a/...Navi.Android/Additions/AboutAdditions.txt → ...MapMapBWNavi/Additions/AboutAdditions.txt b/...Navi.Android/Additions/AboutAdditions.txt → ...MapMapBWNavi/Additions/AboutAdditions.txt