1.修改RA Image Android权限检查。

2.修复RA Image Android从设置返回登陆界面崩溃。

RA Image/app/src/main/java/com/usai/redant/raimage/FullScreenLoginActivity.java

@@ -37,6 +37,7 @@ import android.widget.Toast;
 import com.usai.util.AES;
 import com.usai.util.Crypto;
 import com.usai.util.Network;
+import com.usai.util.RAUtil;
 import com.usai.util.dbUtil;
 import com.usai.util.dbgUtil;
 
@@ -409,8 +410,10 @@ public class FullScreenLoginActivity extends Activity {
 
         super.onActivityResult(requestCode, resultCode, data);
 
-        String server=data.getStringExtra("server");
-        m_etServer.setText(server);
+        if (resultCode == Activity.RESULT_OK && data != null) {
+            String server=data.getStringExtra("server");
+            m_etServer.setText(server);
+        }
     }
 
     @Override
@@ -544,24 +547,24 @@ public class FullScreenLoginActivity extends Activity {
 
         boolean granted = checkAllPermission();
         if (!granted) {
-            new AlertDialog.Builder(this)
-                    .setTitle("Warning")
-                    .setMessage("RA Image need some permission")
-                    .setPositiveButton("Setting", new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-                            intent.setData(Uri.parse("package:" + getPackageName()));
-                            startActivity(intent);
-                        }
-                    })
-                    .setNegativeButton("No", new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            finish();
-                        }
-                    })
-                    .show();
+//            new AlertDialog.Builder(this)
+//                    .setTitle("Warning")
+//                    .setMessage("RA Image need some permission")
+//                    .setPositiveButton("Setting", new DialogInterface.OnClickListener() {
+//                        @Override
+//                        public void onClick(DialogInterface dialog, int which) {
+//                            Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+//                            intent.setData(Uri.parse("package:" + getPackageName()));
+//                            startActivity(intent);
+//                        }
+//                    })
+//                    .setNegativeButton("No", new DialogInterface.OnClickListener() {
+//                        @Override
+//                        public void onClick(DialogInterface dialog, int which) {
+//                            finish();
+//                        }
+//                    })
+//                    .show();
         }
 
     }
@@ -582,7 +585,7 @@ public class FullScreenLoginActivity extends Activity {
         };
 
         for(String permission : permissions) {
-            boolean granted = checkPermission(permission);
+            boolean granted = RAUtil.checkPermission(this,permission);
             if (!granted) {
                 return false;
             }
@@ -591,12 +594,12 @@ public class FullScreenLoginActivity extends Activity {
         return true;
     }
 
-    public boolean checkPermission(String per) {
-        int permission = ContextCompat.checkSelfPermission(FullScreenLoginActivity.this, per);
-        if (permission == PackageManager.PERMISSION_DENIED) {
-
-            return false;
-        }
-        return true;
-    }
+//    public boolean checkPermission(String per) {
+//        int permission = ContextCompat.checkSelfPermission(FullScreenLoginActivity.this, per);
+//        if (permission == PackageManager.PERMISSION_DENIED) {
+//
+//            return false;
+//        }
+//        return true;
+//    }
 }

RA Image/app/src/main/java/com/usai/redant/raimage/MainActivity.java

@@ -16,6 +16,7 @@ import com.usai.redant.raimage.Model.ModelActivity;
 import com.usai.redant.raimage.POP.PopActivity;
 import com.usai.redant.raimage.PhotoList.PhotoListActivity;
 import com.usai.util.Network;
+import com.usai.util.RAUtil;
 import com.usai.util.dbUtil;
 import com.usai.util.dbgUtil;
 
@@ -133,33 +134,33 @@ public class MainActivity extends AppCompatActivity
 				.show();
 	}
 
-	public boolean checkCameraPermission() {
-		int permission = ContextCompat.checkSelfPermission(MainActivity.this, "android.permission.CAMERA");
-		if (permission == PackageManager.PERMISSION_DENIED) {
-
-			new AlertDialog.Builder(this)
-					.setTitle("Warning")
-					.setMessage("RA Image need camera permission")
-					.setPositiveButton("Setting", new DialogInterface.OnClickListener() {
-						@Override
-						public void onClick(DialogInterface dialog, int which) {
-							Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-							intent.setData(Uri.parse("package:" + getPackageName()));
-							startActivity(intent);
-						}
-					})
-					.setNegativeButton("No", new DialogInterface.OnClickListener() {
-						@Override
-						public void onClick(DialogInterface dialog, int which) {
-							finish();
-						}
-					})
-					.show();
-
-			return false;
-		}
-		return true;
-	}
+//	public boolean checkCameraPermission() {
+//		int permission = ContextCompat.checkSelfPermission(MainActivity.this, "android.permission.CAMERA");
+//		if (permission == PackageManager.PERMISSION_DENIED) {
+//
+//			new AlertDialog.Builder(this)
+//					.setTitle("Warning")
+//					.setMessage("RA Image need camera permission")
+//					.setPositiveButton("Setting", new DialogInterface.OnClickListener() {
+//						@Override
+//						public void onClick(DialogInterface dialog, int which) {
+//							Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+//							intent.setData(Uri.parse("package:" + getPackageName()));
+//							startActivity(intent);
+//						}
+//					})
+//					.setNegativeButton("No", new DialogInterface.OnClickListener() {
+//						@Override
+//						public void onClick(DialogInterface dialog, int which) {
+//							finish();
+//						}
+//					})
+//					.show();
+//
+//			return false;
+//		}
+//		return true;
+//	}
 
 	protected void initView() {
 		thumbsImageView = (ImageView)findViewById(R.id.photo_iv);
@@ -206,7 +207,7 @@ public class MainActivity extends AppCompatActivity
             {
                 Log.d(TAG, "==============>Click Scan button");
 
-				if (!checkCameraPermission()) {
+				if (!RAUtil.checkPermission(MainActivity.this,"android.permission.CAMERA")) {
 					return;
 				}
 
@@ -323,7 +324,7 @@ public class MainActivity extends AppCompatActivity
 	private void StartCamera()
 	{
 
-		if (!checkCameraPermission()) {
+		if (!RAUtil.checkPermission(this,"android.permission.CAMERA")) {
 			return;
 		}
 

RA Image/app/src/main/java/com/usai/redant/raimage/ServerSettingActivity.java

@@ -21,37 +21,39 @@ import android.widget.ImageButton;
 import android.widget.RadioGroup;
 import android.widget.Toast;
 
+import com.usai.util.RAUtil;
+
 public class ServerSettingActivity extends Activity
 {
 	static final int	REQUEST_SCAN_BARCODE	= 2;
 
-	public boolean checkCameraPermission() {
-		int permission = ContextCompat.checkSelfPermission(ServerSettingActivity.this, "android.permission.CAMERA");
-		if (permission == PackageManager.PERMISSION_DENIED) {
-
-			new AlertDialog.Builder(this)
-					.setTitle("Warning")
-					.setMessage("RA Image need camera permission")
-					.setPositiveButton("Setting", new DialogInterface.OnClickListener() {
-						@Override
-						public void onClick(DialogInterface dialog, int which) {
-							Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-							intent.setData(Uri.parse("package:" + getPackageName()));
-							startActivity(intent);
-						}
-					})
-					.setNegativeButton("No", new DialogInterface.OnClickListener() {
-						@Override
-						public void onClick(DialogInterface dialog, int which) {
-							finish();
-						}
-					})
-					.show();
-
-			return false;
-		}
-		return true;
-	}
+//	public boolean checkCameraPermission() {
+//		int permission = ContextCompat.checkSelfPermission(ServerSettingActivity.this, "android.permission.CAMERA");
+//		if (permission == PackageManager.PERMISSION_DENIED) {
+//
+//			new AlertDialog.Builder(this)
+//					.setTitle("Warning")
+//					.setMessage("RA Image need camera permission")
+//					.setPositiveButton("Setting", new DialogInterface.OnClickListener() {
+//						@Override
+//						public void onClick(DialogInterface dialog, int which) {
+//							Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+//							intent.setData(Uri.parse("package:" + getPackageName()));
+//							startActivity(intent);
+//						}
+//					})
+//					.setNegativeButton("No", new DialogInterface.OnClickListener() {
+//						@Override
+//						public void onClick(DialogInterface dialog, int which) {
+//							finish();
+//						}
+//					})
+//					.show();
+//
+//			return false;
+//		}
+//		return true;
+//	}
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState)
@@ -89,7 +91,7 @@ public class ServerSettingActivity extends Activity
 			public void onClick(View v)
 			{
 			//	Log.d(TAG, "==============>Click Scan button");
-				if (!checkCameraPermission()) {
+				if (!RAUtil.checkPermission(ServerSettingActivity.this,"android.permission.CAMERA")) {
 
 					return;
 				}