wushaodong 3 anni fa
parent
commit
2f3155c6d1

+ 1 - 0
android/app/src/main/AndroidManifest.xml

@@ -15,6 +15,7 @@
         android:name=".MainApplication"
         android:icon="@mipmap/ic_launcher"
         android:usesCleartextTraffic="true"
+        android:requestLegacyExternalStorage="true"
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
         <uses-library android:name="org.apache.http.legacy" android:required="false" />

+ 25 - 2
android/app/src/main/java/com/zzliaoyuan/power_sensor/activity/MainActivity.java

@@ -1,10 +1,12 @@
 package com.zzliaoyuan.power_sensor.activity;
 
 import android.Manifest;
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
 import android.media.AudioManager;
 import android.media.SoundPool;
 import android.net.Uri;
@@ -31,6 +33,7 @@ import com.rscja.deviceapi.RFIDWithUHFUART;
 import com.zzliaoyuan.power_sensor.fragment.UHFReadTagFragment;
 import com.zzliaoyuan.rifdmastercore.LibCore;
 
+import androidx.core.app.ActivityCompat;
 public class MainActivity extends ReactActivity {
     /**
      * Returns the name of the main component registered from JavaScript. This is used to schedule
@@ -49,9 +52,29 @@ public class MainActivity extends ReactActivity {
 
         setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); // 禁用横屏
 
+        verifyStoragePermissions(this);
         checkLicense();
     }
 
+    // Storage Permissions
+    private static final int REQUEST_EXTERNAL_STORAGE = 1;
+    private static String[] PERMISSIONS_STORAGE = {
+            Manifest.permission.READ_EXTERNAL_STORAGE,
+            Manifest.permission.WRITE_EXTERNAL_STORAGE
+    };
+    public static void verifyStoragePermissions(Activity activity) {
+        // Check if we have write permission
+        int permission_w = ActivityCompat.checkSelfPermission(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE);
+        int permission_r = ActivityCompat.checkSelfPermission(activity, Manifest.permission.READ_EXTERNAL_STORAGE);
+        if (permission_w != PackageManager.PERMISSION_GRANTED || permission_r != PackageManager.PERMISSION_GRANTED) {
+            // We don't have permission so prompt the user
+            ActivityCompat.requestPermissions(
+                    activity,
+                    PERMISSIONS_STORAGE,
+                    REQUEST_EXTERNAL_STORAGE
+            );
+        }
+    }
 
     @Override
     protected ReactActivityDelegate createReactActivityDelegate() {
@@ -65,7 +88,7 @@ public class MainActivity extends ReactActivity {
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (keyCode == 139 || keyCode == 280) {
+        if (keyCode == 139 || keyCode == 280 || keyCode == 293) {
 
             if (event.getRepeatCount() == 0) {
                 UHFReadTagFragment.getInstance().myOnKeyDwon();
@@ -118,7 +141,7 @@ public class MainActivity extends ReactActivity {
         } else {
             final AlertDialog.Builder normalDialog = new AlertDialog.Builder(this);
 //            normalDialog.setTitle("电金晴");
-            normalDialog.setMessage("掌机认证失败,请联系供应商!");
+            normalDialog.setMessage("掌机认证失败,请联系供应商!\n macCode:"+macCode+"。licenseCode:"+licenseCode);
             normalDialog.setPositiveButton("确定",
                     new DialogInterface.OnClickListener() {
                         @Override

BIN
android/app/src/main/jniLibs/arm64-v8a/libcore.so


BIN
android/app/src/main/jniLibs/armeabi-v7a/libcore.so


BIN
android/app/src/main/jniLibs/corewrapper.aar


BIN
android/app/src/main/jniLibs/x86/libcore.so


+ 1 - 1
android/build.gradle

@@ -4,7 +4,7 @@ buildscript {
     ext {
         buildToolsVersion = "29.0.1"
         minSdkVersion = 19
-        compileSdkVersion = 28
+        compileSdkVersion = 29
         targetSdkVersion = 29
         androidXCore = "1.0.2"
     }