Skip to content

Commit

Permalink
更新
Browse files Browse the repository at this point in the history
  • Loading branch information
@DelphiTeacher
DelphiTeacher committed Mar 25, 2023
1 parent cd9a65f commit 4112bac
Show file tree
Hide file tree
Showing 85 changed files with 3,789 additions and 19,360 deletions.
2,540 changes: 2,540 additions & 0 deletions 1D_PDA_RFID/10.4.2修复/Androidapi.JNIBridge.pas
View file

Large diffs are not rendered by default.

17 changes: 17 additions & 0 deletions 1D_PDA_RFID/PDA_RFID_FMX_D11.dpr
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
program PDA_RFID_FMX_D11;

uses
System.StartUpCopy,
FMX.Forms,
Unit3 in 'Unit3.pas' {Form3},
Androidapi.JNI.Serialport_module in '2D_PDA_RFID_SDK\Androidapi.JNI.Serialport_module.pas',
Androidapi.JNI.xdl2d_RFID in '2D_PDA_RFID_SDK\Androidapi.JNI.xdl2d_RFID.pas',
Androidapi.JNI.my1drfidhelper_debug_aar in '1D_PDA_RFID_SDK\Androidapi.JNI.my1drfidhelper_debug_aar.pas';

{$R *.res}

begin
Application.Initialize;
Application.CreateForm(TForm3, Form3);
Application.Run;
end.
566 changes: 441 additions & 125 deletions 蓝牙称重HC08/Project1.dproj → 1D_PDA_RFID/PDA_RFID_FMX_D11.dproj
View file

Large diffs are not rendered by default.

Binary file added 1D_PDA_RFID/PDA_RFID_FMX_D11.res
View file
Binary file not shown.
1 change: 1 addition & 0 deletions HuaweiScan 1.1.3.301/Androidapi.JNI.scan_1_1_3_301_aar.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10880,3 +10880,4 @@ implementation
{$ENDIF}

end.

354 changes: 178 additions & 176 deletions HuaweiScan 1.1.3.301/HuaweiScan_FMX_D11.deployproj
View file

Large diffs are not rendered by default.

150 changes: 150 additions & 0 deletions HuaweiScan 1.1.3.301/HuaweiScan_FMX_D11.dproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -357,22 +357,124 @@ $(PostBuildEvent)]]></PostBuildEvent>
</Delphi.Personality>
<Deployment Version="4">
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_144x144.png" Configuration="Release" Class="Android_LauncherIcon144"/>
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_144x144.png" Configuration="Release" Class="Android_LauncherIcon144">
<Platform Name="Android">
<RemoteName>ic_launcher.png</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png" Configuration="Release" Class="Android_LauncherIcon192"/>
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png" Configuration="Release" Class="Android_LauncherIcon192">
<Platform Name="Android">
<RemoteName>ic_launcher.png</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_36x36.png" Configuration="Release" Class="Android_LauncherIcon36"/>
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_36x36.png" Configuration="Release" Class="Android_LauncherIcon36">
<Platform Name="Android">
<RemoteName>ic_launcher.png</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_48x48.png" Configuration="Release" Class="Android_LauncherIcon48"/>
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_48x48.png" Configuration="Release" Class="Android_LauncherIcon48">
<Platform Name="Android">
<RemoteName>ic_launcher.png</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_72x72.png" Configuration="Release" Class="Android_LauncherIcon72"/>
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_72x72.png" Configuration="Release" Class="Android_LauncherIcon72">
<Platform Name="Android">
<RemoteName>ic_launcher.png</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_96x96.png" Configuration="Release" Class="Android_LauncherIcon96"/>
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_96x96.png" Configuration="Release" Class="Android_LauncherIcon96">
<Platform Name="Android">
<RemoteName>ic_launcher.png</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_24x24.png" Configuration="Release" Class="Android_NotificationIcon24"/>
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_24x24.png" Configuration="Release" Class="Android_NotificationIcon24">
<Platform Name="Android">
<RemoteName>ic_notification.png</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_36x36.png" Configuration="Release" Class="Android_NotificationIcon36"/>
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_36x36.png" Configuration="Release" Class="Android_NotificationIcon36">
<Platform Name="Android">
<RemoteName>ic_notification.png</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_48x48.png" Configuration="Release" Class="Android_NotificationIcon48"/>
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_48x48.png" Configuration="Release" Class="Android_NotificationIcon48">
<Platform Name="Android">
<RemoteName>ic_notification.png</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_72x72.png" Configuration="Release" Class="Android_NotificationIcon72"/>
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_72x72.png" Configuration="Release" Class="Android_NotificationIcon72">
<Platform Name="Android">
<RemoteName>ic_notification.png</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_96x96.png" Configuration="Release" Class="Android_NotificationIcon96"/>
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_96x96.png" Configuration="Release" Class="Android_NotificationIcon96">
<Platform Name="Android">
<RemoteName>ic_notification.png</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_SplashImage_426x320.png" Configuration="Release" Class="Android_SplashImage426"/>
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_SplashImage_426x320.png" Configuration="Release" Class="Android_SplashImage426">
<Platform Name="Android">
<RemoteName>splash_image.png</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_SplashImage_470x320.png" Configuration="Release" Class="Android_SplashImage470"/>
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_SplashImage_470x320.png" Configuration="Release" Class="Android_SplashImage470">
<Platform Name="Android">
<RemoteName>splash_image.png</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_SplashImage_640x480.png" Configuration="Release" Class="Android_SplashImage640"/>
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_SplashImage_640x480.png" Configuration="Release" Class="Android_SplashImage640">
<Platform Name="Android">
<RemoteName>splash_image.png</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_SplashImage_960x720.png" Configuration="Release" Class="Android_SplashImage960"/>
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_SplashImage_960x720.png" Configuration="Release" Class="Android_SplashImage960">
<Platform Name="Android">
<RemoteName>splash_image.png</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="$(BDS)\lib\android\debug\armeabi\libnative-activity.so" Configuration="Release" Class="AndroidLibnativeArmeabiFile"/>
<DeployFile LocalName="$(BDS)\lib\android\debug\armeabi\libnative-activity.so" Configuration="Release" Class="AndroidLibnativeArmeabiFile">
<Platform Name="Android">
<RemoteName>libHuaweiScan_FMX_D11.so</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="$(BDS)\lib\android\debug\mips\libnative-activity.so" Configuration="Release" Class="AndroidLibnativeMipsFile"/>
<DeployFile LocalName="$(BDS)\lib\android\debug\mips\libnative-activity.so" Configuration="Release" Class="AndroidLibnativeMipsFile">
<Platform Name="Android">
<RemoteName>libHuaweiScan_FMX_D11.so</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="$(BDS)\Redist\iossimulator\libcgunwind.1.0.dylib" Class="DependencyModule">
<Platform Name="iOSSimulator">
<Overwrite>true</Overwrite>
Expand All @@ -389,13 +491,61 @@ $(PostBuildEvent)]]></PostBuildEvent>
</Platform>
</DeployFile>
<DeployFile LocalName="$(NDKBasePath)\prebuilt\android-arm\gdbserver\gdbserver" Configuration="Release" Class="AndroidGDBServer"/>
<DeployFile LocalName="$(NDKBasePath)\prebuilt\android-arm\gdbserver\gdbserver" Configuration="Release" Class="AndroidGDBServer">
<Platform Name="Android">
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="agconnect-services.json" Configuration="Release" Class="File">
<Platform Name="Android">
<RemoteDir>.\assets\</RemoteDir>
<RemoteName>agconnect-services.json</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="Android\D11\Release\AndroidManifest.xml" Configuration="Release" Class="ProjectAndroidManifest">
<Platform Name="Android">
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="Android\D11\Release\colors.xml" Configuration="Release" Class="Android_Colors">
<Platform Name="Android">
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="Android\D11\Release\HuaweiScan_FMX_D11.classes" Configuration="Release" Class="AndroidClasses">
<Platform Name="Android">
<Operation>64</Operation>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="Android\D11\Release\libHuaweiScan_FMX_D11.so" Configuration="Release" Class="ProjectOutput">
<Platform Name="Android">
<RemoteName>libHuaweiScan_FMX_D11.so</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="Android\D11\Release\splash_image_def.xml" Configuration="Release" Class="AndroidSplashImageDef">
<Platform Name="Android">
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="Android\D11\Release\strings.xml" Configuration="Release" Class="Android_Strings">
<Platform Name="Android">
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="Android\D11\Release\styles-v21.xml" Configuration="Release" Class="AndroidSplashStylesV21">
<Platform Name="Android">
<RemoteName>styles.xml</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="Android\D11\Release\styles.xml" Configuration="Release" Class="AndroidSplashStyles">
<Platform Name="Android">
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="Android\Release\AndroidManifest.xml" Configuration="Release" Class="ProjectAndroidManifest"/>
<DeployFile LocalName="Android\Release\colors.xml" Configuration="Release" Class="Android_Colors"/>
<DeployFile LocalName="Android\Release\HuaweiScan_FMX_D11.classes" Configuration="Release" Class="AndroidClasses"/>
Expand Down
24 changes: 12 additions & 12 deletions HuaweiScan 1.1.3.301/OrangeSDK_JarGen/HuaweiScan_FMX_D11/Generate_R_JAVA.bat
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
del "C:\OrangeFreeSDK\HuaweiScan\Android\Release\R_JAVA_HuaweiScan_FMX_D11-dexed.jar"
del "C:\OrangeFreeSDK\HuaweiScan 1.1.3.301\Android\D11\Release\R_JAVA_HuaweiScan_FMX_D11-dexed.jar"
@echo off
cd C:\OrangeFreeSDK\HuaweiScan\OrangeSDK_JarGen\HuaweiScan_FMX_D11\
cd C:\OrangeFreeSDK\HuaweiScan 1.1.3.301\OrangeSDK_JarGen\HuaweiScan_FMX_D11\
C:

setlocal

set JarOutName=R_JAVA_HuaweiScan_FMX_D11.jar

set JDKDir=C:\Program Files (x86)\AdoptOpenJDK\jdk-8.0.252.09-hotspot
set JDKDir=C:\Program Files\Eclipse Adoptium\jdk-11.0.15.10-hotspot

set ANDROID=C:\Users\Public\Documents\Embarcadero\Studio\21.0\PlatformSDKs\android-sdk-windows
set ANDROID=C:\Users\Public\Documents\Embarcadero\Studio\22.0\CatalogRepository\AndroidSDK-2525-22.0.46141.0937

set ANDROID_PLATFORM=C:\Users\Public\Documents\Embarcadero\Studio\21.0\PlatformSDKs\android-sdk-windows\platforms\android-29
set ANDROID_PLATFORM=C:\Users\Public\Documents\Embarcadero\Studio\22.0\CatalogRepository\AndroidSDK-2525-22.0.46141.0937\platforms\android-32

set ANDROID_BT=C:\Users\Public\Documents\Embarcadero\Studio\21.0\PlatformSDKs\android-sdk-windows\build-tools\29.0.3\
set ANDROID_BT=C:\Users\Public\Documents\Embarcadero\Studio\22.0\CatalogRepository\AndroidSDK-2525-22.0.46141.0937\build-tools\32.0.0\

set DX_LIB=%ANDROID_BT%\lib

Expand All @@ -27,18 +27,18 @@ mkdir output\classes 2> nul

if x%VERBOSE% == x1 SET VERBOSE_FLAG=-verbose

"%JDKDir%\bin\javac" %VERBOSE_FLAG% -g -source 1.6 -target 1.6 -Xlint:deprecation -cp "" -d "C:\OrangeFreeSDK\HuaweiScan\OrangeSDK_JarGen\HuaweiScan_FMX_D11\output\classes" C:\OrangeFreeSDK\HuaweiScan\OrangeSDK_JarGen\HuaweiScan_FMX_D11\src\com\huawei\hms\ml\camera\R.java
"%JDKDir%\bin\javac" %VERBOSE_FLAG% -g -source 1.6 -target 1.6 -encoding UTF-8 -Xlint:deprecation -cp "" -d "C:\OrangeFreeSDK\HuaweiScan 1.1.3.301\OrangeSDK_JarGen\HuaweiScan_FMX_D11\output\classes" C:\OrangeFreeSDK\HuaweiScan 1.1.3.301\OrangeSDK_JarGen\HuaweiScan_FMX_D11\src\com\huawei\hms\ml\camera\R.java

"%JDKDir%\bin\javac" %VERBOSE_FLAG% -g -source 1.6 -target 1.6 -Xlint:deprecation -cp "" -d "C:\OrangeFreeSDK\HuaweiScan\OrangeSDK_JarGen\HuaweiScan_FMX_D11\output\classes" C:\OrangeFreeSDK\HuaweiScan\OrangeSDK_JarGen\HuaweiScan_FMX_D11\src\com\huawei\hms\framework\common\R.java
"%JDKDir%\bin\javac" %VERBOSE_FLAG% -g -source 1.6 -target 1.6 -encoding UTF-8 -Xlint:deprecation -cp "" -d "C:\OrangeFreeSDK\HuaweiScan 1.1.3.301\OrangeSDK_JarGen\HuaweiScan_FMX_D11\output\classes" C:\OrangeFreeSDK\HuaweiScan 1.1.3.301\OrangeSDK_JarGen\HuaweiScan_FMX_D11\src\com\huawei\hms\framework\common\R.java

"%JDKDir%\bin\javac" %VERBOSE_FLAG% -g -source 1.6 -target 1.6 -Xlint:deprecation -cp "" -d "C:\OrangeFreeSDK\HuaweiScan\OrangeSDK_JarGen\HuaweiScan_FMX_D11\output\classes" C:\OrangeFreeSDK\HuaweiScan\OrangeSDK_JarGen\HuaweiScan_FMX_D11\src\com\huawei\hms\framework\network\grs\R.java
"%JDKDir%\bin\javac" %VERBOSE_FLAG% -g -source 1.6 -target 1.6 -encoding UTF-8 -Xlint:deprecation -cp "" -d "C:\OrangeFreeSDK\HuaweiScan 1.1.3.301\OrangeSDK_JarGen\HuaweiScan_FMX_D11\output\classes" C:\OrangeFreeSDK\HuaweiScan 1.1.3.301\OrangeSDK_JarGen\HuaweiScan_FMX_D11\src\com\huawei\hms\framework\network\grs\R.java

"%JDKDir%\bin\javac" %VERBOSE_FLAG% -g -source 1.6 -target 1.6 -Xlint:deprecation -cp "" -d "C:\OrangeFreeSDK\HuaweiScan\OrangeSDK_JarGen\HuaweiScan_FMX_D11\output\classes" C:\OrangeFreeSDK\HuaweiScan\OrangeSDK_JarGen\HuaweiScan_FMX_D11\src\com\huawei\hms\scankit\R.java
"%JDKDir%\bin\javac" %VERBOSE_FLAG% -g -source 1.6 -target 1.6 -encoding UTF-8 -Xlint:deprecation -cp "" -d "C:\OrangeFreeSDK\HuaweiScan 1.1.3.301\OrangeSDK_JarGen\HuaweiScan_FMX_D11\output\classes" C:\OrangeFreeSDK\HuaweiScan 1.1.3.301\OrangeSDK_JarGen\HuaweiScan_FMX_D11\src\com\huawei\hms\scankit\R.java

if x%VERBOSE% == x1 SET VERBOSE_FLAG=v

"%JDKDir%\bin\jar" c%VERBOSE_FLAG%f %JarOutName% -C "C:\OrangeFreeSDK\HuaweiScan\OrangeSDK_JarGen\HuaweiScan_FMX_D11\output\classes" .
"%ANDROID_BT%\dx" --dex --output C:\OrangeFreeSDK\HuaweiScan\Android\Release\R_JAVA_HuaweiScan_FMX_D11-dexed.jar R_JAVA_HuaweiScan_FMX_D11.jar
"%JDKDir%\bin\jar" c%VERBOSE_FLAG%f %JarOutName% -C "C:\OrangeFreeSDK\HuaweiScan 1.1.3.301\OrangeSDK_JarGen\HuaweiScan_FMX_D11\output\classes" .
"%ANDROID_BT%\dx" --dex --output C:\OrangeFreeSDK\HuaweiScan 1.1.3.301\Android\D11\Release\R_JAVA_HuaweiScan_FMX_D11-dexed.jar R_JAVA_HuaweiScan_FMX_D11.jar



Expand Down
Binary file modified HuaweiScan 1.1.3.301/OrangeSDK_JarGen/HuaweiScan_FMX_D11/R_JAVA_HuaweiScan_FMX_D11.jar
View file
Binary file not shown.
Loading

0 comments on commit 4112bac

Please sign in to comment.