Browse Source

[global] fixed some warnings android

Exilon 3 years ago
parent
commit
e1b3f7224e
2 changed files with 21 additions and 1 deletions
  1. 11 0
      Quick.Commons.pas
  2. 10 1
      Quick.SysInfo.pas

+ 11 - 0
Quick.Commons.pas

@@ -55,6 +55,9 @@ interface
     Androidapi.Helpers,
     Androidapi.JNI.JavaTypes,
     Androidapi.JNI.GraphicsContentViewText,
+    {$IFDEF DELPHIRX103_UP}
+      Androidapi.JNI.App,
+    {$ENDIF}
     {$ENDIF}
     {$IFDEF IOS}
     iOSapi.UIKit,
@@ -1359,7 +1362,11 @@ end;
       var
         PkgInfo : JPackageInfo;
       begin
+        {$IFDEF DELPHIRX103_UP}
+        PkgInfo := TAndroidHelper.Activity.getPackageManager.getPackageInfo(TAndroidHelper.Activity.getPackageName,0);
+        {$ELSE}
         PkgInfo := SharedActivity.getPackageManager.getPackageInfo(SharedActivity.getPackageName,0);
+        {$ENDIF}
         Result := IntToStr(PkgInfo.VersionCode);
       end;
       {$ELSE} //IOS
@@ -1463,7 +1470,11 @@ end;
       var
         PkgInfo : JPackageInfo;
       begin
+        {$IFDEF DELPHIRX103_UP}
+        PkgInfo := TAndroidHelper.Activity.getPackageManager.getPackageInfo(TAndroidHelper.Activity.getPackageName,0);
+        {$ELSE}
         PkgInfo := SharedActivity.getPackageManager.getPackageInfo(SharedActivity.getPackageName,0);
+        {$ENDIF}
         Result := JStringToString(PkgInfo.versionName);
       end;
       {$ELSE} //IOS

+ 10 - 1
Quick.SysInfo.pas

@@ -48,6 +48,11 @@ uses
     System.IOUtils,
       {$IFDEF ANDROID}
       Androidapi.Helpers,
+        {$IFDEF DELPHIRX103_UP}
+        Androidapi.JNI.GraphicsContentViewText,
+        Androidapi.JNI.JavaTypes,
+        Androidapi.JNI.App,
+        {$ENDIF}
       {$ENDIF}
       {$IFDEF IOS}
       Macapi.CoreFoundation,
@@ -96,7 +101,11 @@ begin
     else fAppName := ExtractFilenameWithoutExt(ParamStr(0));
   {$ELSE}
     {$IFDEF ANDROID}
-    fAppName := JStringToString(SharedActivityContext.getPackageName);
+      {$IFDEF DELPHIRX103_UP}
+      fAppName := JStringToString(TAndroidHelper.Context.getPackageName);
+      {$ELSE}
+      fAppName := JStringToString(SharedActivityContext.getPackageName);
+      {$ENDIF}
     {$ELSE}
     fAppName := TNSString.Wrap(CFBundleGetValueForInfoDictionaryKey(CFBundleGetMainBundle, kCFBundleIdentifierKey)).UTF8String;
     {$ENDIF}