diff --git a/Unit1.pas b/Unit1.pas
index 5efa15c54b28257197e236a07e2eaed058c52a8d..c9e57811d1db1e7e525622c91232932274213198 100644
--- a/Unit1.pas
+++ b/Unit1.pas
@@ -95,9 +95,11 @@ begin
end;
procedure TForm5.FormCreate(Sender: TObject);
+{$IFDEF ANDROID}
var
FPermissionReadExternalStorage,
FPermissionWriteExternalStorage:String;
+{$ENDIF}
begin
{$IFDEF ANDROID}
//FPermissionCamera := JStringToString(TJManifest_permission.JavaClass.CAMERA);
@@ -162,9 +164,8 @@ begin
GlowEffect1.Softness:=0.4;
lbl_winner.TextSettings.Font.Size:=112;
Timer1.Enabled:=true;
- if FileExists(musicName) then
+ if FileExists(MediaPlayer1.FileName) then
begin
- MediaPlayer1.FileName:=musicName;
MediaPlayer1.Play;
end;
end;
@@ -172,7 +173,7 @@ begin
end
else
begin
- MediaPlayer1.Stop;
+ MediaPlayer1.Stop();
spb_loadname.Enabled:=true;
spb_loadmusic.Enabled:=true;
spb_go.Text:='¿ªÊ¼Ò¡½±';
@@ -201,7 +202,12 @@ begin
if opd_music.Execute then
begin
musicName:=opd_music.FileName;
- end
+ end;
+ if FileExists(musicName) then
+ begin
+ MediaPlayer1.Stop;
+ MediaPlayer1.FileName:=musicName;
+ end;
end;
procedure TForm5.spb_loadnameClick(Sender: TObject);
diff --git a/pro_Loteery_Icon.ico b/pro_Loteery_Icon.ico
deleted file mode 100644
index 70f08c9a7fde6fcecebd660e9fc8ce0265743f70..0000000000000000000000000000000000000000
Binary files a/pro_Loteery_Icon.ico and /dev/null differ
diff --git a/pro_Lottery.deployproj b/pro_Lottery.deployproj
index dad2c788722209fc725675290cfbe30a889abffa..cfc9a963122f0ec7be04c99c7c85beac46cc544d 100644
--- a/pro_Lottery.deployproj
+++ b/pro_Lottery.deployproj
@@ -50,7 +50,7 @@
True
-
+
pro_Lottery\res\values\
colors.xml
Android_Colors
@@ -86,7 +86,16 @@
True
-
+
+ pro_Lottery\classes\
+ classes.dex
+ AndroidClassesDexFile
+ 1
+
+
+ True
+
+
pro_Lottery\
AndroidManifest.xml
ProjectAndroidManifest
@@ -104,7 +113,7 @@
True
-
+
pro_Lottery\library\lib\arm64-v8a\
libpro_Lottery.so
ProjectOutput
@@ -114,7 +123,7 @@
True
True
-
+
pro_Lottery\res\values-v21\
styles.xml
AndroidSplashStylesV21
@@ -150,7 +159,7 @@
True
-
+
pro_Lottery\res\drawable\
splash_image_def.xml
AndroidSplashImageDef
@@ -159,7 +168,7 @@
True
-
+
pro_Lottery\res\values\
styles.xml
AndroidSplashStyles
@@ -186,7 +195,7 @@
True
-
+
pro_Lottery\res\values\
strings.xml
Android_Strings
diff --git a/pro_Lottery.dproj b/pro_Lottery.dproj
index 737ab15f3173ccd1afb59ee9d2cec17a67b71b83..3640a1a1807b466bacb9919e237a91cc6566aa9e 100644
--- a/pro_Lottery.dproj
+++ b/pro_Lottery.dproj
@@ -38,6 +38,12 @@
Base
true
+
+ true
+ Cfg_1
+ true
+ true
+
true
Cfg_1
@@ -74,8 +80,8 @@
true
- .\$(Platform)\$(Config)
- .\$(Platform)\$(Config)
+ .\$(Platform)
+ .\$(Platform)
false
false
false
@@ -119,7 +125,7 @@
DBXSqliteDriver;RESTComponents;DBXInterBaseDriver;emsclientfiredac;tethering;DataSnapFireDAC;bindcompfmx;FmxTeeUI;fmx;FireDACIBDriver;FireDACDBXDriver;dbexpress;IndyCore;dsnap;emsclient;DataSnapCommon;FireDACCommon;RESTBackendComponents;soapserver;bindengine;CloudService;FireDACCommonDriver;DataSnapClient;inet;IndyIPCommon;bindcompdbx;IndyIPServer;IndySystem;fmxFireDAC;FireDAC;FireDACSqliteDriver;FMXTee;soaprtl;DbxCommonDriver;xmlrtl;soapmidas;DataSnapNativeClient;FireDACDSDriver;rtl;DbxClientDriver;CustomIPTransport;bindcomp;IndyIPClient;dbxcds;dsnapxml;DataSnapProviderClient;dbrtl;IndyProtocols;$(DCC_UsePackage)
- package=com.ac.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=7;versionName=1.0.6;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=No TitleBar;hardwareAccelerated=true;apiKey=
+ package=com.ac.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=9;versionName=1.0.8;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=No TitleBar;hardwareAccelerated=true;apiKey=
Debug
true
res\ICON\cia_36.png
@@ -137,7 +143,7 @@
res\ICON\cia_72.png
res\ICON\cia_96.png
android-support-v4.dex.jar;cloud-messaging.dex.jar;com-google-android-gms.play-services-ads-base.17.2.0.dex.jar;com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar;com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar;com-google-android-gms.play-services-ads.17.2.0.dex.jar;com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar;com-google-android-gms.play-services-analytics.16.0.8.dex.jar;com-google-android-gms.play-services-base.16.0.1.dex.jar;com-google-android-gms.play-services-basement.16.2.0.dex.jar;com-google-android-gms.play-services-gass.17.2.0.dex.jar;com-google-android-gms.play-services-identity.16.0.0.dex.jar;com-google-android-gms.play-services-maps.16.1.0.dex.jar;com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar;com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar;com-google-android-gms.play-services-stats.16.0.1.dex.jar;com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar;com-google-android-gms.play-services-tasks.16.0.1.dex.jar;com-google-android-gms.play-services-wallet.16.0.1.dex.jar;com-google-firebase.firebase-analytics.16.4.0.dex.jar;com-google-firebase.firebase-common.16.1.0.dex.jar;com-google-firebase.firebase-iid-interop.16.0.1.dex.jar;com-google-firebase.firebase-iid.17.1.1.dex.jar;com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar;com-google-firebase.firebase-messaging.17.5.0.dex.jar;fmx.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar
- 7
+ 9
disabled
center
#000000
@@ -147,6 +153,8 @@
false
false
false
+ .\$(Platform)
+ .\$(Platform)
DBXSqliteDriver;RESTComponents;fmxase;DBXDb2Driver;DBXInterBaseDriver;vclactnband;vclFireDAC;bindcompvclsmp;emsclientfiredac;tethering;svnui;DataSnapFireDAC;FireDACADSDriver;DBXMSSQLDriver;DatasnapConnectorsFreePascal;FireDACMSSQLDriver;unidac270;vcltouch;vcldb;bindcompfmx;svn;crcontrols270;DBXOracleDriver;inetdb;FmxTeeUI;emsedge;fmx;FireDACIBDriver;fmxdae;vcledge;FireDACDBXDriver;dbexpress;IndyCore;vclx;dsnap;emsclient;DataSnapCommon;FireDACCommon;RESTBackendComponents;DataSnapConnectors;VCLRESTComponents;soapserver;dacfmx270;vclie;bindengine;DBXMySQLDriver;CloudService;FireDACOracleDriver;FireDACMySQLDriver;DBXFirebirdDriver;FireDACCommonODBC;FireDACCommonDriver;DataSnapClient;inet;IndyIPCommon;bindcompdbx;vcl;IndyIPServer;DBXSybaseASEDriver;dacvcl270;IndySystem;vquery270;FireDACDb2Driver;dac270;dsnapcon;FireDACMSAccDriver;fmxFireDAC;FireDACInfxDriver;vclimg;unidacfmx270;TeeDB;FireDAC;emshosting;FireDACSqliteDriver;FireDACPgDriver;FireDACASADriver;DBXOdbcDriver;FireDACTDataDriver;FMXTee;soaprtl;DbxCommonDriver;Tee;DataSnapServer;xmlrtl;soapmidas;DataSnapNativeClient;fmxobj;vclwinx;FireDACDSDriver;rtl;emsserverresource;DbxClientDriver;DBXSybaseASADriver;CustomIPTransport;vcldsnap;unidacvcl270;bindcomp;appanalytics;DBXInformixDriver;IndyIPClient;bindcompvcl;TeeUI;dbxcds;VclSmp;adortl;FireDACODBCDriver;DataSnapIndy10ServerTransport;dsnapxml;DataSnapProviderClient;dbrtl;IndyProtocols;inetdbxpress;FireDACMongoDBDriver;DataSnapServerMidas;$(DCC_UsePackage)
@@ -157,7 +165,10 @@
$(BDS)\bin\default_app.manifest
res\ICON\cia_44.png
res\ICON\cia_150.png
- pro_Loteery_Icon.ico
+ res\ICON\cia.ico
+ .\$(Platform)
+ .\$(Platform)
+ res\ICON\cia_48.icns
DBXSqliteDriver;RESTComponents;fmxase;DBXDb2Driver;DBXInterBaseDriver;vclactnband;vclFireDAC;bindcompvclsmp;emsclientfiredac;tethering;DataSnapFireDAC;FireDACADSDriver;DBXMSSQLDriver;DatasnapConnectorsFreePascal;FireDACMSSQLDriver;vcltouch;vcldb;bindcompfmx;DBXOracleDriver;inetdb;FmxTeeUI;emsedge;fmx;FireDACIBDriver;fmxdae;vcledge;FireDACDBXDriver;dbexpress;IndyCore;vclx;dsnap;emsclient;DataSnapCommon;FireDACCommon;RESTBackendComponents;DataSnapConnectors;VCLRESTComponents;soapserver;vclie;bindengine;DBXMySQLDriver;CloudService;FireDACOracleDriver;FireDACMySQLDriver;DBXFirebirdDriver;FireDACCommonODBC;FireDACCommonDriver;DataSnapClient;inet;IndyIPCommon;bindcompdbx;vcl;IndyIPServer;DBXSybaseASEDriver;IndySystem;FireDACDb2Driver;dsnapcon;FireDACMSAccDriver;fmxFireDAC;FireDACInfxDriver;vclimg;TeeDB;FireDAC;emshosting;FireDACSqliteDriver;FireDACPgDriver;FireDACASADriver;DBXOdbcDriver;FireDACTDataDriver;FMXTee;soaprtl;DbxCommonDriver;Tee;DataSnapServer;xmlrtl;soapmidas;DataSnapNativeClient;fmxobj;vclwinx;FireDACDSDriver;rtl;emsserverresource;DbxClientDriver;DBXSybaseASADriver;CustomIPTransport;vcldsnap;bindcomp;appanalytics;DBXInformixDriver;IndyIPClient;bindcompvcl;TeeUI;dbxcds;VclSmp;adortl;FireDACODBCDriver;DataSnapIndy10ServerTransport;dsnapxml;DataSnapProviderClient;dbrtl;IndyProtocols;inetdbxpress;FireDACMongoDBDriver;DataSnapServerMidas;$(DCC_UsePackage)
@@ -178,10 +189,16 @@
true
true
+
+ 7
+
false
true
PerMonitorV2
+ 1033
+ res\ICON\cia.ico
+ res\ICON\cia_48.icns
true
@@ -194,14 +211,20 @@
0
- 8
- package=com.ac.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=8;versionName=1.0.7;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=No TitleBar;hardwareAccelerated=true;apiKey=
+ 9
+ package=com.ac.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=9;versionName=1.0.8;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=No TitleBar;hardwareAccelerated=true;apiKey=
true
PerMonitorV2
true
1033
+ res\ICON\cia.ico
+ 8
+ 36
+ true
+ CompanyName=奥诚科技;FileDescription=奥诚科技新春年会大抽奖;FileVersion=1.0.8.36;InternalName=ac_lattery.exe;LegalCopyright=AC;LegalTrademarks=AC;OriginalFilename=pro_lattery.exe;ProgramID=com.ac.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0;Comments=
+ res\ICON\cia_48.icns
true
@@ -249,7 +272,7 @@
true
-
+
true
@@ -272,7 +295,13 @@
true
-
+
+
+ classes.dex
+ true
+
+
+
true
@@ -283,13 +312,13 @@
true
-
+
libpro_Lottery.so
true
-
+
styles.xml
true
@@ -323,7 +352,7 @@
true
-
+
true
@@ -335,7 +364,7 @@
true
-
+
true
@@ -363,7 +392,7 @@
true
-
+
true
diff --git a/pro_Lottery.dproj.local b/pro_Lottery.dproj.local
index fa0f4d4cb73389ecbb80228422e45e738506a79b..6f6be501b587bf11df787a7e27abd1121dd34aa3 100644
--- a/pro_Lottery.dproj.local
+++ b/pro_Lottery.dproj.local
@@ -1,7 +1,7 @@

- 1899-12-30 00:00:00.000.111,C:\Users\Shion\Documents\Embarcadero\Studio\Projects\Project1.dproj=C:\Users\Shion\Documents\Embarcadero\Studio\Projects\Lottery\pro_Lottery.dproj
+ 1899-12-30 00:00:00.000.111,C:\Users\Shion\Documents\Embarcadero\Studio\Projects\Lottery\pro_Lottery.dproj=C:\Users\Shion\Documents\Embarcadero\Studio\Projects\Project1.dproj
1899-12-30 00:00:00.000.439,=C:\Users\Shion\Documents\Embarcadero\Studio\Projects\Unit1.pas
1899-12-30 00:00:00.000.173,=C:\Users\Shion\Documents\Embarcadero\Studio\Projects\Lottery\Unit1.pas
diff --git a/pro_Lottery.res b/pro_Lottery.res
index 6339b553f918089f7a841e6b1d778ef713ec21b4..36f26e234a8ac66a47e95cec6d496cf2f1442471 100644
Binary files a/pro_Lottery.res and b/pro_Lottery.res differ