Skip to content

Commit e1b3f72

Browse files
committed
[global] fixed some warnings android
1 parent 339940b commit e1b3f72

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

Quick.Commons.pas

+11
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ interface
5555
Androidapi.Helpers,
5656
Androidapi.JNI.JavaTypes,
5757
Androidapi.JNI.GraphicsContentViewText,
58+
{$IFDEF DELPHIRX103_UP}
59+
Androidapi.JNI.App,
60+
{$ENDIF}
5861
{$ENDIF}
5962
{$IFDEF IOS}
6063
iOSapi.UIKit,
@@ -1359,7 +1362,11 @@ function GetAppVersionStr: string;
13591362
var
13601363
PkgInfo : JPackageInfo;
13611364
begin
1365+
{$IFDEF DELPHIRX103_UP}
1366+
PkgInfo := TAndroidHelper.Activity.getPackageManager.getPackageInfo(TAndroidHelper.Activity.getPackageName,0);
1367+
{$ELSE}
13621368
PkgInfo := SharedActivity.getPackageManager.getPackageInfo(SharedActivity.getPackageName,0);
1369+
{$ENDIF}
13631370
Result := IntToStr(PkgInfo.VersionCode);
13641371
end;
13651372
{$ELSE} //IOS
@@ -1463,7 +1470,11 @@ function GetAppVersionFullStr: string;
14631470
var
14641471
PkgInfo : JPackageInfo;
14651472
begin
1473+
{$IFDEF DELPHIRX103_UP}
1474+
PkgInfo := TAndroidHelper.Activity.getPackageManager.getPackageInfo(TAndroidHelper.Activity.getPackageName,0);
1475+
{$ELSE}
14661476
PkgInfo := SharedActivity.getPackageManager.getPackageInfo(SharedActivity.getPackageName,0);
1477+
{$ENDIF}
14671478
Result := JStringToString(PkgInfo.versionName);
14681479
end;
14691480
{$ELSE} //IOS

Quick.SysInfo.pas

+10-1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@ interface
4848
System.IOUtils,
4949
{$IFDEF ANDROID}
5050
Androidapi.Helpers,
51+
{$IFDEF DELPHIRX103_UP}
52+
Androidapi.JNI.GraphicsContentViewText,
53+
Androidapi.JNI.JavaTypes,
54+
Androidapi.JNI.App,
55+
{$ENDIF}
5156
{$ENDIF}
5257
{$IFDEF IOS}
5358
Macapi.CoreFoundation,
@@ -96,7 +101,11 @@ procedure TSystemInfo.GetInfo;
96101
else fAppName := ExtractFilenameWithoutExt(ParamStr(0));
97102
{$ELSE}
98103
{$IFDEF ANDROID}
99-
fAppName := JStringToString(SharedActivityContext.getPackageName);
104+
{$IFDEF DELPHIRX103_UP}
105+
fAppName := JStringToString(TAndroidHelper.Context.getPackageName);
106+
{$ELSE}
107+
fAppName := JStringToString(SharedActivityContext.getPackageName);
108+
{$ENDIF}
100109
{$ELSE}
101110
fAppName := TNSString.Wrap(CFBundleGetValueForInfoDictionaryKey(CFBundleGetMainBundle, kCFBundleIdentifierKey)).UTF8String;
102111
{$ENDIF}

0 commit comments

Comments
 (0)