权限管控

app/src/main/java/com/uas/jlt_storage/activity/IndexActivity.java

@@ -71,8 +71,6 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
         //获取条码打印模板
         getPrintTemplate();*/
         getCheckSetting();
-
-        initPermissions();
     }
 
     private void getCheckSetting() {
@@ -148,18 +146,6 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                 });
     }
 
-    private void initPermissions() {
-        String[] permissions = {
-                Manifest.permission.CAMERA
-                , Manifest.permission.WRITE_EXTERNAL_STORAGE
-        };
-        for (String permission : permissions) {
-            if (PermissionUtil.lacksPermissions(this, permission)) {
-                PermissionUtil.requestPermission(this, PermissionUtil.DEFAULT_REQUEST, permission);
-            }
-        }
-    }
-
     @Override
     protected void initViews() {
         setContentView(R.layout.activity_index);
@@ -289,18 +275,6 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
 //        }
     }
 
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        if (requestCode == PermissionUtil.DEFAULT_REQUEST) {
-            if (grantResults.length != 1 || grantResults[0] != PackageManager.PERMISSION_GRANTED) {
-                //没有获取到权限
-            } else {
-
-            }
-        }
-    }
-
     @Override
     public void onBackPressed() {
         if (mExitPopupWindow.isShowing()) {

app/src/main/java/com/uas/jlt_storage/activity/MainActivity.java

@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
 import android.view.ViewGroup;
 import android.view.WindowManager;
 
@@ -34,7 +35,7 @@ public class MainActivity extends BaseActivity implements BackHandlerInterface {
         setContentView(R.layout.activity_main);
 
 //        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
-
+        initPermissions();
         Intent intent = getIntent();
         if (intent != null) {
             isConnected = intent.getBooleanExtra("isConnected", false);
@@ -84,6 +85,35 @@ public class MainActivity extends BaseActivity implements BackHandlerInterface {
 
     }
 
+    private void initPermissions() {
+        AndPermission.with(this)
+                .runtime()
+                .permission(
+                        Permission.Group.STORAGE,
+                        Permission.Group.CAMERA
+                )
+                .rationale(new Rationale<List<String>>() {
+                    @Override
+                    public void showRationale(Context context, List<String> data, RequestExecutor executor) {
+                        new AlertDialog.Builder(MainActivity.this)
+                                .setTitle("提示")
+                                .setMessage("APP运行需要部分权限，请确认授权")
+                                .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialog, int which) {
+                                        executor.cancel();
+                                    }
+                                })
+                                .setPositiveButton(R.string.confirm, new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialog, int which) {
+                                        executor.execute();
+                                    }
+                                })
+                                .show();
+                    }
+                }).start();
+    }
 
     @Override
     protected void onDestroy() {

app/src/main/java/com/uas/jlt_storage/activity/SplashActivity.java

@@ -38,13 +38,13 @@ public class SplashActivity extends BaseActivity {
                 case VolleyUtil.SUCCESS_SUCCESS:
                     //添加缓存
                     saveCache(mIp, mPort);
-                    if (time <= 2000) {
+                    if (time <= 1500) {
                         mHandler.postDelayed(new Runnable() {
                             @Override
                             public void run() {
                                 startLogin();
                             }
-                        }, 2000 - time);
+                        }, 1500 - time);
                     } else {
                         startLogin();
                     }
@@ -53,13 +53,13 @@ public class SplashActivity extends BaseActivity {
                 case VolleyUtil.FAILED_FAILED:
                     String notice = (String) msg.obj;
                     CommonUtil.toastNoRepeat(SplashActivity.this, notice);
-                    if (time <= 2000) {
+                    if (time <= 1500) {
                         mHandler.postDelayed(new Runnable() {
                             @Override
                             public void run() {
                                 startServer();
                             }
-                        }, 2000 - time);
+                        }, 1500 - time);
                     } else {
                         startServer();
                     }
@@ -137,7 +137,7 @@ public class SplashActivity extends BaseActivity {
                 public void run() {
                     startServer();
                 }
-            }, 2000);
+            }, 1500);
         }
     }
 

app/src/main/java/com/uas/jlt_storage/fragment/JLTStorageInBarcodeFragment.java

@@ -536,10 +536,7 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
             CommonUtil.toastNoRepeat(mActivity, "请采集条码获取必填数据");
             return;
         }
-        if (mPoCheckBox.isChecked() && TextUtils.isEmpty(mBarcodeParseBean.getORDERCODE())) {
-            CommonUtil.toastNoRepeat(mActivity, "已勾选PO校验，PO号不允许为空");
-            return;
-        }
+        if (mPoCheckBox.isChecked() && TextUtils.isEmpty(mBarcodeParseBean.getORDERCODE()))
         /*if (mBoxNum == null || !mBoxNum.equals(mRealBoxNum)) {
             CommonUtil.toastNoRepeat(mActivity, "当前采集的条码不属于当前箱号");
             return;