在logo启动界面提示申请权限，修复权限申请和复制文件同时进行的bug

mobile/src/main/java/cn/garymb/ygomobile/ui/activities/BaseActivity.java

@@ -23,7 +23,7 @@ import cn.garymb.ygomobile.lite.R;
 
 
 public class BaseActivity extends AppCompatActivity {
-    private final static int REQUEST_PERMISSIONS = 0x1000 + 1;
+    protected final static int REQUEST_PERMISSIONS = 0x1000 + 1;
     private boolean mExitAnim = true;
     private boolean mEnterAnim = true;
 
@@ -33,7 +33,7 @@ public class BaseActivity extends AppCompatActivity {
         return PERMISSIONS;
     }
 
-    protected final String[] PERMISSIONS ={
+    protected final String[] PERMISSIONS = {
 //            Manifest.permission.RECORD_AUDIO,
             Manifest.permission.READ_PHONE_STATE,
 //            Manifest.permission.SYSTEM_ALERT_WINDOW,
@@ -56,7 +56,9 @@ public class BaseActivity extends AppCompatActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        startPermissionsActivity();
+        if (Build.VERSION.SDK_INT<Build.VERSION_CODES.M|| !startPermissionsActivity()){
+            onActivityResult(REQUEST_PERMISSIONS,PermissionsActivity.PERMISSIONS_GRANTED,null);
+        }
     }
 
     public Activity getActivity() {
@@ -191,10 +193,12 @@ public class BaseActivity extends AppCompatActivity {
         setActionBarTitle(getString(rid));
     }
 
-    protected void startPermissionsActivity() {
+    protected boolean startPermissionsActivity() {
         String[] PERMISSIONS = getPermissions();
-        if (PERMISSIONS == null || PERMISSIONS.length == 0) return;
+        if (PERMISSIONS == null || PERMISSIONS.length == 0)
+            return false;
         PermissionsActivity.startActivityForResult(this, REQUEST_PERMISSIONS, PERMISSIONS);
+        return true;
     }
 
     @Override

mobile/src/main/java/cn/garymb/ygomobile/ui/activities/LogoActivity.java

@@ -12,7 +12,7 @@ import cn.garymb.ygomobile.lite.BuildConfig;
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.ui.home.MainActivity;
 
-public class LogoActivity extends Activity {
+public class LogoActivity extends BaseActivity {
     Handler handler;
     Runnable runnable;
 
@@ -25,22 +25,34 @@ public class LogoActivity extends Activity {
             finish();
             return;
         }
-        if(BuildConfig.DEBUG){
-            startActivity(new Intent(LogoActivity.this, MainActivity.class));
+
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        // 拒绝时, 关闭页面, 缺少主要权限, 无法运行
+        if (requestCode == REQUEST_PERMISSIONS && resultCode == PermissionsActivity.PERMISSIONS_DENIED) {
             finish();
         }else {
-            handler = new Handler();
-            runnable = new Runnable() {
-                @Override
-                public void run() {
-                    startActivity(new Intent(LogoActivity.this, MainActivity.class));
-                    finish();
-                }
-            };
-            handler.postDelayed(runnable, 1000);
-            Toast.makeText(LogoActivity.this, R.string.logo_text, Toast.LENGTH_SHORT).show();
+            if(BuildConfig.DEBUG){
+                startActivity(new Intent(LogoActivity.this, MainActivity.class));
+                finish();
+            }else {
+                handler = new Handler();
+                runnable = new Runnable() {
+                    @Override
+                    public void run() {
+                        startActivity(new Intent(LogoActivity.this, MainActivity.class));
+                        finish();
+                    }
+                };
+                handler.postDelayed(runnable, 1000);
+                Toast.makeText(LogoActivity.this, R.string.logo_text, Toast.LENGTH_SHORT).show();
+            }
         }
     }
+
   /*  @Override
     protected void onCreate(Bundle savedInstanceState) {
         requestWindowFeature(Window.FEATURE_NO_TITLE);