Merge pull request #42 from cslrfid/develop-eng

Develop eng

Author: ksclam

app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "com.csl.cs108ademoapp"
         minSdkVersion 19
         targetSdkVersion 31
-        versionCode 37
-        versionName "2.6.0"
+        versionCode 38
+        versionName "2.7.0"
     }
 }
 

app/libs/cs108ademo-20220329-v2.6.0-cs108library4a-debug.zip

@@ -47,7 +47,7 @@ protected void onPreExecute() {
         taskCancelReason = TaskCancelRReason.NULL;
         if (barcodeYieldView != null) barcodeYieldView.setText("");
 
-        MainActivity.mCs108Library4a.barcodeInvventory(true);
+        MainActivity.mCs108Library4a.barcodeInventory(true);
         if (DEBUG) MainActivity.mCs108Library4a.appendToLog("InventoryBarcodeFragment.InventoryRfidTask.onPreExecute()");
         if (MainActivity.mCs108Library4a.getInventoryVibrate() && bUseVibrateMode0 == false) MainActivity.mCs108Library4a.setVibrateOn(3);
     }
@@ -253,7 +253,7 @@ public InventoryBarcodeTask(ArrayList<ReaderDevice> tagsList, ReaderListAdapter
 
     void DeviceConnectTask4InventoryEnding(TaskCancelRReason taskCancelRReason) {
         if (readerListAdapter != null) readerListAdapter.notifyDataSetChanged();
-        MainActivity.mCs108Library4a.barcodeInvventory(false);
+        MainActivity.mCs108Library4a.barcodeInventory(false);
         if (DEBUG) MainActivity.mCs108Library4a.appendToLog("DeviceConnectTask4InventoryEnding(): sent setBarcodeOn(false)");
         if (taskCancelReason == null) {
             new Handler().postDelayed(new Runnable() {

app/libs/cs108ademo-20220811-v2.7.0-cs108library4a-debug.zip

@@ -13,6 +13,7 @@
 import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
@@ -260,7 +261,18 @@ public void onBackPressed() {
     public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
         MainActivity.mCs108Library4a.appendToLog("permissionRequesting: requestCode = " + requestCode + ", permissions is " + (permissions == null ? "null" : "valid") + ", grantResults is " + (grantResults == null ? "null" : "valid") );
         MainActivity.mCs108Library4a.appendToLog("permissionRequesting: permissions[" + permissions.length + "] = " + (permissions != null && permissions.length > 0 ? permissions[0] : ""));
-        MainActivity.mCs108Library4a.appendToLog("permissionRequesting: grantResults[" + grantResults.length + "] = " + (grantResults != null && grantResults.length > 0 ? grantResults[0] : "") );
+        if (grantResults != null && grantResults.length != 0) {
+            boolean bNegative = false;
+            for (int i = 0; i < grantResults.length; i++) {
+                if (grantResults[i] < 0) bNegative = true;
+                mCs108Library4a.appendToLog("permissionRequesting: grantResults[" + i + "] = " + grantResults[i] );
+            }
+            if (bNegative) {
+                Toast toast = Toast.makeText(this, R.string.toast_permission_not_granted, Toast.LENGTH_SHORT);
+                if (false) toast.setGravity(Gravity.TOP | Gravity.RIGHT, 100, 200);
+                toast.show();
+            }
+        }
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         permissionRequesting = false;
     }

app/release/cs108ademo-20220329-v2.6.0-app-debug.zip

@@ -374,14 +374,14 @@ public String save2File(String messageStr, boolean requestPermission) {
         String resultDisplay = "";
         if (MainActivity.mCs108Library4a.getSaveFileEnable() == false) return "No saving file as it is disabled";
         boolean writeExtPermission = true;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             if (mContext.checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
                 mCs108Library4a.appendToLog("WRITE_EXTERNAL_STORAGE Permission is required !!!");
                 writeExtPermission = false;
                 if (requestPermission) {
                     mCs108Library4a.appendToLog("requestPermissions WRITE_EXTERNAL_STORAGE 1");
                     MainActivity.permissionRequesting = true; requestPermissions((Activity) mContext, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1);
-                    Toast.makeText(mContext, com.csl.cs108library4a.R.string.toast_permission_not_granted, Toast.LENGTH_SHORT).show();
+                    if (false) Toast.makeText(mContext, com.csl.cs108library4a.R.string.toast_permission_not_granted, Toast.LENGTH_SHORT).show();
                     return null;
                 }
             } else mCs108Library4a.appendToLog("WRITE_EXTERNAL_STORAGE Permission is GRANTED !!!");