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

2.修改RA Image Android，增加上传参数。

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

@@ -15,6 +15,8 @@ import com.usai.redant.raimage.Model.ManufactureListActivity;
 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.Crypto;
+import com.usai.util.MD5;
 import com.usai.util.Network;
 import com.usai.util.RAUtil;
 import com.usai.util.dbUtil;
@@ -248,9 +250,57 @@ public class MainActivity extends AppCompatActivity
 					return;
 				}
 
+				try {
 
-                sendBroadcast(new Intent("REDANT.POP.REQUEST_LOCATION"));
-                return;
+					Intent intent = new Intent("REDANT.RAImage.ADD_TASK");
+
+					ArrayList<Bundle> taskArr = new ArrayList<Bundle>();
+					String name = "POP";
+					if (this.getClass().equals(ModelActivity.class)) {
+						name = "Model";
+					}
+					for (String path : photoList) {
+						Bundle task = new Bundle();
+
+						task.putString("path",name);
+						task.putString("file",path);
+						task.putString("url",RedAntApplication.active_address);
+
+						String md5 = MD5.md5sum(path);
+						String encryptUser = Crypto.encrypt("usai",RedAntApplication.user);
+						String encryptPwd = Crypto.decrypt("usai",RedAntApplication.password);
+
+						Bundle params = new Bundle();
+						params.putString("user",encryptUser);
+						params.putString("password",encryptPwd);
+						params.putString("mode",name);
+						params.putString("barcode",pidval.getText().toString());
+						params.putString("_operate","upload");
+						params.putString("platform","android");
+						params.putString("md5",md5);
+
+						if (this.getClass().equals(ModelActivity.class)) {
+							if (!TextUtils.isEmpty(manufacture)) {
+								params.putString("manufacturer",manufacture);
+							}
+							if (!TextUtils.isEmpty(noteTextView.getText().toString())) {
+								params.putString("note",noteTextView.getText().toString());
+							}
+						}
+
+						task.putBundle("params",params);
+
+						taskArr.add(task);
+					}
+
+					intent.putParcelableArrayListExtra("tasks",taskArr);
+
+					sendBroadcast(intent);
+
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+				return;
 
             }
         });

RA Image/app/src/main/java/com/usai/util/RAUtil.java

@@ -7,6 +7,7 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.provider.Settings;
+import android.text.TextUtils;
 
 /**
  * Created by ray on 27/06/2017.
@@ -19,27 +20,18 @@ public class RAUtil {
 
         if (PackageManager.PERMISSION_GRANTED!= context.checkCallingOrSelfPermission(permission)) {
 
+            String[] tmp = permission.split("\\.");
+            String permission_name = tmp[tmp.length - 1];
+            permission_name = permission_name.replace("_"," ");
 
 
-                new AlertDialog.Builder(context)
-                        .setTitle("Warning")
-                        .setMessage("RA Image need camera permission")
-                        .setPositiveButton("OK", 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:" + context.getPackageName()));
-                                context.startActivity(intent);
-                            }
-                        })
-                        .show();
+            new AlertDialog.Builder(context)
+                    .setTitle("Warning")
+                    .setMessage("RA Image need " + permission_name.toLowerCase() + " permission")
+                    .setPositiveButton("OK", null)
+                    .show();
 
-                return false;
-
-
-
-//            throw new SecurityException("Access denied to process: " + Binder.getCallingPid()
-//                    + ", must have permission " + permission);
+            return false;
         }
         return true;
     }