1.修改Android Apex Mobile使用Library中的工具类替换当前实现。

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/utils/FileManager.java

@@ -326,13 +326,6 @@ public class FileManager {
 
     }
 
-    public static void openFile(Context context, File file) {
-
-        String authority = "com.usai.apex.fileprovider";
-
-        openFile(context, "", file);
-    }
-
     public static void shareFile(Context context,Uri uri, String type) {
 
         Intent shareIntent = new Intent();

ApexDrivers/apexmobile/src/main/AndroidManifest.xml

@@ -344,10 +344,12 @@
             android:theme="@style/ResultActionbarTheme"/>
         <activity android:name=".LicenseActivity"/>
         <activity android:name=".TestActivity"/>
+
         <activity
             android:name=".mainframe.NewDetailActivity"
             android:screenOrientation="portrait"
             android:theme="@style/DetailActionbarTheme"/>
+
         <activity android:name=".apexresult.ApexResultActivity"
                   android:theme="@style/ResultActionbarTheme">
         </activity>

ApexDrivers/apexmobile/src/main/java/com/usai/apex/Alarmreceiver.java

@@ -6,7 +6,6 @@ import org.json.JSONObject;
 //import com.usai.util.Crypto;
 import com.usai.util.Network;
 import com.usai.util.dbUtil;
-import com.usai.util.dbgUtil;
 
 import android.app.Notification;
 import android.app.NotificationManager;
@@ -86,8 +85,7 @@ public class Alarmreceiver extends BroadcastReceiver
 		@Override
 		protected void onPostExecute(Boolean success)
 		{
-			String tag = "onPostExec@Alarmreceiver";
-			Log.i( tag, "entry");
+
 			m_task = null;
 			// showProgress(false);
 

ApexDrivers/apexmobile/src/main/java/com/usai/apex/ApexTrackingApplication.java

@@ -22,6 +22,7 @@ import android.os.SystemClock;
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.usai.redant.rautils.utils.RAProviderHelper;
 import com.usai.util.AES;
 import com.usai.util.Network;
 import com.usai.util.RAUtil;
@@ -33,7 +34,7 @@ import org.json.JSONObject;
 import java.io.File;
 import java.lang.ref.WeakReference;
 
-public class ApexTrackingApplication extends Application
+public class ApexTrackingApplication extends Application implements RAProviderHelper.ProviderHelperDelegate
 {
 
 	static final String						TAG				= "ApexTrackingApplication";
@@ -73,6 +74,10 @@ public class ApexTrackingApplication extends Application
 	public static ApexTrackingApplication getInstance() {
 		return instance;
 	}
+
+
+
+
 	@Override
 	public void onCreate()
 	{
@@ -184,6 +189,11 @@ public class ApexTrackingApplication extends Application
 	private Handler handler = new CheckUpdateHandler(this);
 	private Activity mCurrentActivity;
 
+	@Override
+	public String getProviderAuthorities() {
+		return "com.usai.apex.fileprovider";
+	}
+
 	private static final class CheckUpdateHandler extends Handler {
 
         WeakReference<ApexTrackingApplication> mWeakApp;

ApexDrivers/apexmobile/src/main/java/com/usai/apex/Result/SearchResultActivity.java

@@ -1319,7 +1319,7 @@ public class SearchResultActivity extends AppCompatActivity {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
 
             // "com.usai.apex.fileprovider"即是在Manifest文件中配置的authorities
-            uri = FileProvider.getUriForFile(mContext, "com.usai.apex.fileprovider", file);
+            uri = FileProvider.getUriForFile(mContext, RAUtil.getProviderAuthorities(), file);
             // 给目标应用一个临时授权
             intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
         } else {

ApexDrivers/apexmobile/src/main/java/com/usai/apex/apexresult/ApexResultActivity.java

@@ -25,9 +25,9 @@ import android.widget.TextView;
 import com.usai.apex.ApexTrackingApplication;
 import com.usai.apex.CustomizeFieldsActivity;
 import com.usai.apex.R;
-import com.usai.apex.actionSheet.ActionSheet;
 import com.usai.apex.mainframe.NewDetailActivity;
 import com.usai.apex.pdf.PDFPreviewActivity;
+import com.usai.redant.rautils.actionSheet.ActionSheet;
 import com.usai.util.Network;
 import com.usai.util.commonUtil;
 

ApexDrivers/apexmobile/src/main/java/com/usai/apex/apexresult/ApexResultPresenter.java

@@ -7,7 +7,7 @@ import com.usai.apex.ApexTrackingApplication;
 import com.usai.apex.apexresult.model.ApexResultBaseModel;
 import com.usai.apex.apexresult.model.ApexResultDocumentModel;
 import com.usai.apex.apexresult.model.ApexResultShipModel;
-import com.usai.apex.operationQueue.OperationQueue;
+import com.usai.redant.rautils.operationQueue.OperationQueue;
 import com.usai.util.Network;
 import com.usai.util.RAUtil;
 

ApexDrivers/apexmobile/src/main/java/com/usai/apex/pdf/PDFPreviewActivity.java

@@ -52,7 +52,7 @@ public class PDFPreviewActivity extends RAPDFPreviewActivity {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
 
             // "com.usai.apex.fileprovider"即是在Manifest文件中配置的authorities
-            uri = FileProvider.getUriForFile(this, "com.usai.apex.fileprovider", file);
+            uri = FileProvider.getUriForFile(this, RAUtil.getProviderAuthorities(), file);
             // 给目标应用一个临时授权
             intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
         } else {
@@ -139,7 +139,7 @@ public class PDFPreviewActivity extends RAPDFPreviewActivity {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
 
             // "com.usai.apex.fileprovider"即是在Manifest文件中配置的authorities
-            uri = FileProvider.getUriForFile(this, "com.usai.apex.fileprovider", file);
+            uri = FileProvider.getUriForFile(this, RAUtil.getProviderAuthorities(), file);
             // 给目标应用一个临时授权
         } else {
             uri = Uri.fromFile(file);

ApexDrivers/apexmobile/src/main/java/com/usai/util/RAUtil.java

@@ -22,6 +22,8 @@ import android.util.Log;
 import android.webkit.MimeTypeMap;
 
 import com.usai.apex.ApexTrackingApplication;
+import com.usai.redant.rautils.utils.FileManager;
+import com.usai.redant.rautils.utils.ImageUtil;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -53,805 +55,55 @@ import java.util.Set;
 
 
 public class RAUtil {
-    public static final int MY_PERMISSIONS_REQUEST= 1;
-//    public static void checkPermissions1(Activity activity, String[] permissions)
-//    {
-//        Log.d("_RAIMAGE", "checkPermissions1:==================================== ");
-//        for(String permission : permissions) {
-//            boolean bshow=ActivityCompat.shouldShowRequestPermissionRationale(activity,permission);
-//            boolean granted= ContextCompat.checkSelfPermission(activity,
-//                    Manifest.permission.ACCESS_FINE_LOCATION)
-//                    == PackageManager.PERMISSION_GRANTED;
-//            boolean pc = PermissionChecker.checkSelfPermission(activity,permission)==PermissionChecker.PERMISSION_GRANTED;
-//            Log.d("_RAIMAGE", "checkPermissions1: "+permission+"  SHOW  "+bshow+"  granted  "+granted +","+pc);
-//        }
-//        Log.d("_RAIMAGE", "checkPermissions1:==================================== ");
-//    }
-    public static boolean isNumeric(String str){
-        for (int i = 0; i < str.length(); i++){
-            System.out.println(str.charAt(i));
-            if (!Character.isDigit(str.charAt(i))){
-                return false;
-            }
-        }
-        return true;
-    }
-    public static Boolean checkPermissions(Activity activity, String[] permissions)
-    {
-        if (Build.VERSION.SDK_INT >= 23)
-        {
-            return checkPermissions_23(activity,permissions);
-        }
-        else
-        {
-            return false;
-//            return checkPermissions_23(activity,permissions);
-        }
-    }
-
-    public static Boolean checkPermissions_23(String[] permissions)
-    {
-        Log.d("_RAIMAGE", "checkPermissions23:==================================== ");
-        ArrayList<String> request_list = new ArrayList<String>();
-        Context context = ApexTrackingApplication.getInstance().getApplicationContext();
-        for(String permission : permissions) {
-
-            boolean pc = PermissionChecker.checkSelfPermission(context,permission)== PermissionChecker.PERMISSION_GRANTED;
-            if(!pc)
-                return false;
-        }
-        Log.d("_RAIMAGE", "checkPermissions23:==================================== ");
-
-
-
-        return true;
-
-    }
-
-    public static void updateGallery(String filename)//filename是我们的文件全名，包括后缀哦
-    {
-
-        Context context = ApexTrackingApplication.getInstance().getApplicationContext();
-        MediaScannerConnection.scanFile(context,
-                new String[] { filename }, null,
-                new MediaScannerConnection.OnScanCompletedListener() {
-                    public void onScanCompleted(String path, Uri uri) {
-                        Log.i("ExternalStorage", "Scanned " + path + ":");
-                        Log.i("ExternalStorage", "-> uri=" + uri);
-                    }
-                });
-    }
-
-    public static Boolean checkPermissions_23(Activity activity, String[] permissions)
-    {
-        Log.d("_RAIMAGE", "checkPermissions23:==================================== ");
-        ArrayList<String> request_list = new ArrayList<String>();
-        for(String permission : permissions) {
-            boolean bshow= ActivityCompat.shouldShowRequestPermissionRationale(activity,permission);
-//            boolean granted= ContextCompat.checkSelfPermission(activity,
-//                    Manifest.permission.ACCESS_FINE_LOCATION)
-//                    == PackageManager.PERMISSION_GRANTED;
-            boolean pc = PermissionChecker.checkSelfPermission(activity,permission)== PermissionChecker.PERMISSION_GRANTED;
-//            Log.d("_RAIMAGE", "checkPermissions23: "+permission+"  SHOW  "+bshow+"  granted  "+granted +","+pc);
-
-            if(!pc)
-                request_list.add(permission);
-        }
-        Log.d("_RAIMAGE", "checkPermissions23:==================================== ");
-
-
-        if(request_list.isEmpty())
-            return false;
-        ActivityCompat.requestPermissions(activity,
-                request_list.toArray(new String[0]),
-                MY_PERMISSIONS_REQUEST);
-
-
-        return true;
-
-    }
-    public static Boolean checkPermissions_24(Activity activity, String[] permissions)
-    {
-
-
-
-
-//        ArrayList<String> request_list = new ArrayList<String>();
-//        for(String permission : permissions) {
-//
-//
-////            boolean bshow=ActivityCompat.shouldShowRequestPermissionRationale(activity,permission);
-////
-////
-////            AppOpsManager appOpsManager = (AppOpsManager) activity.getSystemService(Context.APP_OPS_SERVICE);
-////            String opsName = AppOpsManager.permissionToOp(permission);
-////            if (opsName == null) {
-////                return true;
-////            }
-////            int opsMode = appOpsManager.checkOpNoThrow(opsName, Process.myUid(), activity.getPackageName());
-//////            return opsMode == AppOpsManager.MODE_ALLOWED;
-//
-//
-////            if (ContextCompat.checkSelfPermission(activity,
-////                    Manifest.permission.ACCESS_FINE_LOCATION)
-////                    != PackageManager.PERMISSION_GRANTED||opsMode != AppOpsManager.MODE_ALLOWED)
-//
-//                request_list.add(permission);
-//
-//        }
 
-//        File logfile = new File(Environment.getExternalStorageDirectory()
-//                .getPath() + "/redant/pop/" + "debug" + ".log");
-//
-//        // int mode = Application.MODE_APPEND;
-//        if (!logfile.exists())
-//        {
-//            // mode = Application.MODE_PRIVATE;
-//            try
-//            {
-//                logfile.createNewFile();
-//            }
-//            catch (IOException e)
-//            {
-//                // TODO Auto-generated catch block
-//                e.printStackTrace();
-//
-//            }
-//        }
-        if(permissions.length==0)
-            return true;
-        ActivityCompat.requestPermissions(activity,
-                permissions,
-                MY_PERMISSIONS_REQUEST);
-
-
-        return true;
-
-//
-//        if (ContextCompat.checkSelfPermission(activity,
-//                Manifest.permission.ACCESS_FINE_LOCATION)
-//                != PackageManager.PERMISSION_GRANTED)
-//        {
-//
-//
-////            if (ActivityCompat.shouldShowRequestPermissionRationale(activity,
-////                    permission))
-////            {
-////                return false;
-////            }
-////            else
-//            {
-//                ActivityCompat.requestPermissions(activity,
-//                        new String[]{permission},
-//                        MY_PERMISSIONS_REQUEST);
-//                return true;
-//            }
-//        } else
-//        {
-//           return true;
-//        }
-//        if(true)
-//        return true;
-        // 调用Context的checkCallingOrSelfPermission来检查权限
-
-//        Activity activity1 = (Activity) activity;
-//        if(activity==null)
-//            return false;
-//        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 " + permission_name.toLowerCase() + " permission")
-////                    .setPositiveButton("OK", null)
-////                    .show();
-////
-////            return false;
-//
-//
-//             if (ActivityCompat.shouldShowRequestPermissionRationale(activity,
-//                    permission)) {
-//
-//                Log.d("_RAIMAGE", "checkPermission: shouldShowRequestPermissionRationale TRUE   " + permission);
-//                // Show an expanation to the user *asynchronously* -- don't block
-//                // this thread waiting for the user's response! After the user
-//                // sees the explanation, try again to request the permission.
-//
-//            } else {
-//
-//                // No explanation needed, we can request the permission.
-//
-//
-//                Log.d("_RAIMAGE", "checkPermission: shouldShowRequestPermissionRationale false   "+ permission);
-//                ActivityCompat.requestPermissions(activity,
-//                        new String[]{permission},
-//                        123);
-//
-//                // MY_PERMISSIONS_REQUEST_READ_CONTACTS is an
-//                // app-defined int constant. The callback method gets the
-//                // result of the request.
-//            }
-//
-//        }
-//        return true;
-    }
-
-    public static String lastPathComponent(String path){
-
-        int start=path.lastIndexOf("/");
-        int end=path.lastIndexOf(".");
-        if(start!=-1 && end!=-1){
-            return path.substring(start+1,end);
-        }else{
-            return null;
-        }
-
-    }
-
-    public static File routeBitmap(File sourceFile, String file_name)
-    {
-        /**
-         * 获取图片的旋转角度，有些系统把拍照的图片旋转了，有的没有旋转
-         */
-        int degree = RAUtil.readPictureDegree(sourceFile.getAbsolutePath());
-
-        BitmapFactory.Options opts=new BitmapFactory.Options();//获取缩略图显示到屏幕上
-        opts.inSampleSize=1;
-        Bitmap cbitmap= BitmapFactory.decodeFile(sourceFile.getAbsolutePath(),opts);
-
-        /**
-         * 把图片旋转为正的方向
-         */
-        Bitmap newbitmap = RAUtil.rotaingImageView(degree, cbitmap);
-
-        //sourceFile.get
-        String routedPath = "";
-        if(file_name==null) {
-            String path = sourceFile.getPath();
-
-            routedPath=path.replace(".jpg", "_routed.jpg");
-        }
-        else
-        {
-            String path = sourceFile.getParent();
-            routedPath = path+"/"+file_name;
-        }
-        File routedFile = new File(routedPath);
-        try {
-
-            FileOutputStream outputStream = new FileOutputStream(routedFile);
-            newbitmap.compress(Bitmap.CompressFormat.JPEG, 100, outputStream);
-
-            outputStream.flush();
-            outputStream.close();
-
-            String filepath = sourceFile.getAbsolutePath();
-            sourceFile.delete();
-            RAUtil.updateGallery(filepath);
-//				scaleFile.renameTo(new File(path));
-            return routedFile;
-
-        } catch (IOException e) {
-            e.printStackTrace();
-            return null;
-        }
-
-    }
-    /**
-     * 读取图片属性：旋转的角度
-     * @param path 图片绝对路径
-     * @return degree旋转的角度
-     */
-    public static int readPictureDegree(String path) {
-        int degree  = 0;
-        try {
-            ExifInterface exifInterface = new ExifInterface(path);
-            int orientation = exifInterface.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL);
-            switch (orientation) {
-                case ExifInterface.ORIENTATION_ROTATE_90:
-                    degree = 90;
-                    break;
-                case ExifInterface.ORIENTATION_ROTATE_180:
-                    degree = 180;
-                    break;
-                case ExifInterface.ORIENTATION_ROTATE_270:
-                    degree = 270;
-                    break;
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return degree;
-    }
-    /*
-     * 旋转图片
-     * @param angle
-     * @param bitmap
-     * @return Bitmap
-     */
-    public static Bitmap rotaingImageView(int angle , Bitmap bitmap) {
-        //旋转图片 动作
-        Matrix matrix = new Matrix();;
-        matrix.postRotate(angle);
-        System.out.println("angle2=" + angle);
-        // 创建新的图片
-        Bitmap resizedBitmap = Bitmap.createBitmap(bitmap, 0, 0,
-                bitmap.getWidth(), bitmap.getHeight(), matrix, true);
-        return resizedBitmap;
-    }
     public static JSONObject Bundle2Json(Bundle bundle)
     {
-        JSONObject json = new JSONObject();
-        Set<String> keys = bundle.keySet();
-        for (String key : keys) {
-            try {
-                Log.d("", "Bundle2Json: key:"+key+"  val: "+wrap(bundle.get(key)));
-                 json.put(key, wrap(bundle.get(key))); //see edit below
-//                json.put(key, JSONObject.wrap(bundle.get(key)));
-            } catch(JSONException e) {
-                //Handle exception here
-            }
-        }
-        return json;
+        return com.usai.redant.rautils.utils.RAUtil.Bundle2Json(bundle);
     }
 
-    private static Object wrap(Object o) {
-        if (o == null) {
-            return JSONObject.NULL;
-        }
-        if (o instanceof JSONArray || o instanceof JSONObject) {
-            return o;
-        }
-        if (o.equals(JSONObject.NULL)) {
-            return o;
-        }
-        try {
-            if (o instanceof Bundle)
-            {
-                return Bundle2Json((Bundle) o);
-
-            }
-            if (o instanceof Collection) {
-                return new JSONArray((Collection) o);
-            } else if (o.getClass().isArray()) {
-                return toJSONArray(o);
-            }
-            if (o instanceof Map) {
-                return new JSONObject((Map) o);
-            }
-            if (o instanceof Boolean ||
-                    o instanceof Byte ||
-                    o instanceof Character ||
-                    o instanceof Double ||
-                    o instanceof Float ||
-                    o instanceof Integer ||
-                    o instanceof Long ||
-                    o instanceof Short ||
-                    o instanceof String) {
-                return o;
-            }
-            if (o.getClass().getPackage().getName().startsWith("java.")) {
-                return o.toString();
-            }
-        } catch (Exception ignored) {
-        }
-        return null;
-    }
-
-    private static JSONArray toJSONArray(Object array) throws JSONException {
-        JSONArray result = new JSONArray();
-        if (!array.getClass().isArray()) {
-            throw new JSONException("Not a primitive array: " + array.getClass());
-        }
-        final int length = Array.getLength(array);
-        for (int i = 0; i < length; ++i) {
-            result.put(wrap(Array.get(array, i)));
-        }
-        return result;
-    }
     public static Bundle Json2Bundle(JSONObject s) {
-        Bundle bundle = new Bundle();
-
-        for (Iterator<String> it = s.keys(); it.hasNext(); ) {
-            String key = it.next();
-            try {
-                Object o = s.get(key);
-
-
-
-                if (o == null) {
-                    continue;
-                }
-                else if ( o instanceof JSONObject) {
-                    bundle.putBundle(key,Json2Bundle((JSONObject) o));
-                }
-                else if(o instanceof JSONArray)
-                {
-                    throw new JSONException("Json2Bundle does not support Json array: " + o.getClass());// bundle.putarr
-                }
-                else if (o.equals(JSONObject.NULL)) {
-                    continue;
-                }
-                else if (o instanceof Boolean)
-                {
-                    bundle.putBoolean(key,((Boolean) o).booleanValue());
-                }
-                else if(o instanceof Byte)
-                {
-                    bundle.putByte(key, ((Byte) o).byteValue());
-                }
-                else if(o instanceof Character)
-                {
-                    bundle.putChar(key, ((Character) o).charValue());
-                }
-                else if(o instanceof Double)
-                {
-                    bundle.putDouble(key, ((Double) o).doubleValue());
-                }
-                else if(o instanceof Float)
-                {
-                    bundle.putFloat(key, ((Float) o).floatValue());
-                }
-                else if(o instanceof Integer)
-                {
-                    bundle.putInt(key, ((Integer) o).intValue());
-                }
-                else if(o instanceof Long)
-                {
-                    bundle.putLong(key, ((Long) o).longValue());
-                }
-                else if(o instanceof Short)
-                {
-                    bundle.putShort(key, ((Short) o).shortValue());
-                }
-                else if(o instanceof String)
-                {
-                    bundle.putString(key, o.toString());
-                }
-
-//                ArrayList<Parcelable> a = new ArrayList<>();
-//                a.add("");
-//                a.add(1);
-//                bundle.putParcelableArrayList("arr", a);
-
-
-
-            } catch (JSONException e) {
-                e.printStackTrace();
-            }
-        }
-        return bundle;
+        return com.usai.redant.rautils.utils.RAUtil.Json2Bundle(s);
     }
-    public static Bundle Json2Bundle1(JSONObject s) {
-        Bundle bundle = new Bundle();
-
-        for (Iterator<String> it = s.keys(); it.hasNext(); ) {
-            String key = it.next();
-            JSONArray arr = s.optJSONArray(key);
-            Double num = s.optDouble(key);
-//            Integer i = s.optInt(key);
-            String str = s.optString(key);
-            JSONObject obj = s.optJSONObject(key);
-            if (arr != null && arr.length() <= 0)
-            {
-                bundle.putStringArray(key, new String[]{});
-            }
 
-            else if (arr != null && !Double.isNaN(arr.optDouble(0))) {
-                double[] newarr = new double[arr.length()];
-                for (int i=0; i<arr.length(); i++)
-                    newarr[i] = arr.optDouble(i);
-                bundle.putDoubleArray(key, newarr);
-            }
-
-            else if (arr != null && arr.optString(0) != null) {
-                String[] newarr = new String[arr.length()];
-                for (int i=0; i<arr.length(); i++)
-                    newarr[i] = arr.optString(i);
-                bundle.putStringArray(key, newarr);
-            }
-
-
-            else if (obj != null)
-            {
-                Bundle b=Json2Bundle(obj);
-                bundle.putBundle(key, b);
-            }
-
-            else if (!num.isNaN())
-                bundle.putDouble(key, num);
-
-            else if (str != null)
-                bundle.putString(key, str);
-
-            else
-                System.err.println("unable to transform json to bundle " + key);
-        }
-        return bundle;
-    }
-//    public static Bundle Json2Bundle(JSONObject jsonObject) throws JSONException {
-//        Bundle bundle = new Bundle();
-//        Iterator iter = jsonObject.keys();
-//        while(iter.hasNext()){
-//            String key = (String)iter.next();
-//            String value = jsonObject.getString(key);
-//            bundle.putString(key,value);
-//        }
-//        return bundle;
-//    }
-
-    public static JSONArray jsonObject2KVArray(JSONObject object, boolean trim) {
-
-        if (object == null) {
-            return null;
-        }
-
-        try {
-            JSONArray ret = new JSONArray();
-            Iterator<String> iterator = object.keys();
-
-            while (iterator.hasNext()) {
-
-                JSONObject kv = new JSONObject();
-
-                String key = iterator.next();
-                Object value = object.get(key);
-
-                kv.put("key",key);
-                if (trim) {
-                    if (value == null) {
-                        continue;
-                    }
-                    String val = value.toString();
-                    if (val.length() == 0) {
-                        continue;
-                    }
-                }
-
-                kv.put("value",value);
-                ret.put(kv);
-
-            }
-
-            return ret;
-
-        } catch (JSONException e) {
-            e.printStackTrace();
-            return null;
-        }
-
-    }
 
     public static String getApplicationName(Context context) {
 
-        PackageManager packageManager = null;
-        ApplicationInfo applicationInfo = null;
-        try {
-            packageManager = context.getPackageManager();
-            applicationInfo = packageManager.getApplicationInfo(context.getPackageName(), 0);
-        } catch (PackageManager.NameNotFoundException e) {
-            applicationInfo = null;
-        }
-        String applicationName = (String) packageManager.getApplicationLabel(applicationInfo);
-        return applicationName;
+        return com.usai.redant.rautils.utils.RAUtil.getApplicationName(context);
     }
 
     public static String SDCardRoot() {
-        return Environment.getExternalStorageDirectory()+File.separator;
-    }
-
-    public static File createSDDir(String dir)throws IOException{
-        File dirFile=new File(SDCardRoot()+dir);
-        dirFile.mkdir();//mkdir()只能创建一层文件目录，mkdirs()可以创建多层文件目录
-        return dirFile;
-    }
-
-    //在SD卡上创建文件
-    public static File createFileInSDCard(String fileName,String dir) throws IOException {
-        File file=new File(SDCardRoot()+dir+File.separator+fileName);
-        file.createNewFile();
-        return file;
-    }
-
-    public static boolean isFileExist(String fileName,String dir){
-        File file=new File(SDCardRoot()+dir+File.separator+fileName);
-        return file.exists();
-    }
-
-    public static File createFileInDir(String fileName,String dir) throws IOException {
-        File file=new File(dir+File.separator+fileName);
-        file.createNewFile();
-        return file;
-    }
-
-    //将一个InoutStream里面的数据写入到SD卡中
-    public static File write2SDFromInput(String fileName,String dir,InputStream input){
-        File file=null;
-        OutputStream output=null;
-        try {
-//            //创建目录
-//            createSDDir(dir);
-            //创建文件
-            file=createFileInDir(fileName,dir);
-            //写数据流
-            output=new FileOutputStream(file);
-            byte buffer[]=new byte[4*1024];//每次存4K
-            int temp;
-            //写入数据
-            while((temp=input.read(buffer))!=-1){
-                output.write(buffer,0,temp);
-            }
-            output.flush();
-        } catch (Exception e) {
-            System.out.println("写数据异常："+e);
-        }
-        finally{
-            try {
-                output.close();
-            } catch (Exception e2) {
-                System.out.println(e2);
-            }
-        }
-        return file;
+        return FileManager.SDCardRoot();
     }
 
     public static String getMimeType(String filePath) {
-        String ext = MimeTypeMap.getFileExtensionFromUrl(filePath);
-        String mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext);
-        if (mime == null || mime.isEmpty()) {
-            mime = "text/plain";
-        }
-        return mime;
+        return FileManager.getMimeType(filePath);
     }
 
-    /**
-     * 复制单个文件
-     * @param oldPath String 原文件路径 如：c:/fqf.txt
-     * @param newPath String 复制后路径 如：f:/fqf.txt
-     * @return boolean
-     */
     public static boolean copyFile(String oldPath, String newPath) {
-        try {
-            int bytesum = 0;
-            int byteread = 0;
-            File oldfile = new File(oldPath);
-            if (oldfile.exists()) { //文件存在时
-                InputStream inStream = new FileInputStream(oldPath); //读入原文件
-                FileOutputStream fs = new FileOutputStream(newPath);
-                byte[] buffer = new byte[4*1024];
-                int length;
-                while ( (byteread = inStream.read(buffer)) != -1) {
-                    bytesum += byteread; //字节数 文件大小
-                    System.out.println(bytesum);
-                    fs.write(buffer, 0, byteread);
-                }
-                inStream.close();
-            }
-        }
-        catch (Exception e) {
-            System.out.println("复制单个文件操作出错");
-            e.printStackTrace();
-            return false;
-
-        }
-        return true;
-
+        return FileManager.copyFile(oldPath, newPath);
     }
-    public static void openFile(Context context,File file) {
-
-        if (context == null || file == null || !file.exists()) {
-            return;
-        }
-
-        Uri uri = null;
-        String type = RAUtil.getMimeType(file.getPath());
-
-        // type "application/pdf"
-        Intent intent = new Intent(Intent.ACTION_VIEW);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-
-            // "com.usai.apex.fileprovider"即是在Manifest文件中配置的authorities
-            uri = FileProvider.getUriForFile(context, "com.usai.apex.fileprovider", file);
-            // 给目标应用一个临时授权
-            intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-        } else {
-            uri = Uri.fromFile(file);
-        }
-
-        intent.setDataAndType(uri, type);
-
-        if (context.getPackageManager().resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY) != null) {
-            // someone knows how to handle this mime type with this scheme, don't download.
-            try {
-                context.startActivity(intent);
-                return;
-            } catch (Exception ex) {
-                Log.d("Open File", "activity not found for " + type + " over " + uri, ex);
-            }
-
-        } else {
-            Log.d("Open File", "openFileAtPath: " + "No App " + uri);
-            try {
-                shareFile(context,uri,type);
-            } catch (Exception e) {
-                Log.e("Show Dialog Error", "openFileAtPath: ", e);
-            }
-        }
 
+    public static String getProviderAuthorities() {
+        return ApexTrackingApplication.getInstance().getProviderAuthorities();
     }
 
-    public static void shareFile(Context context,Uri uri, String type) {
+    public static void openFile(Context context,File file) {
+
+        String authority = getProviderAuthorities();
+        FileManager.openFile(context, authority, file);
 
-        Intent shareIntent = new Intent();
-        shareIntent.setAction(Intent.ACTION_SEND);
-        shareIntent.putExtra(Intent.EXTRA_STREAM, uri);
-        shareIntent.setType(type);
-        context.startActivity(Intent.createChooser(shareIntent, "Share"));
     }
 
     public static void writeJson(String json, String filePath) {
 
-        Writer writer = null;
-        try {
-
-            OutputStream out = new FileOutputStream(new File(filePath));
-            writer = new OutputStreamWriter(out);
-            writer.write(json);
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            if (writer != null) {
-                try {
-                    writer.close();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
+        FileManager.writeJson(json, filePath);
     }
 
     public static String readJson(String filePath) {
-        BufferedReader reader = null;
-        StringBuilder jsonString = null;
-        try {
-            InputStream in = new FileInputStream(new File(filePath));
-            reader = new BufferedReader(new InputStreamReader(in));
-            jsonString = new StringBuilder();
-            String line = null;
-            while ((line = reader.readLine()) != null) {
-                jsonString.append(line);
-            }
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            if (reader != null) {
-                try {
-                    reader.close();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        if (jsonString != null) {
-            return jsonString.toString();
-        } else {
-            return null;
-        }
-    }
-
-    public static String getAndroidId(Context context) {
-        return Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID);
+        return FileManager.readJson(filePath);
     }
 
     public static String getDeviceID(Context context) {
-        return getAndroidId(context);
+        return com.usai.redant.rautils.utils.RAUtil.getDeviceId(context);
     }
 }

ApexDrivers/apexmobile/src/main/java/com/usai/util/commonUtil.java

@@ -1,131 +1,46 @@
 package com.usai.util;
 
 import java.io.File;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import com.usai.apex.ApexTrackingApplication;
 import com.usai.apex.R;
+import com.usai.redant.rautils.utils.RAUtil;
 
 import android.Manifest;
 import android.app.Activity;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
 import android.os.Environment;
 import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.PermissionChecker;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
 
 
 public class commonUtil {
+
     public static final int MY_PERMISSIONS_REQUEST = 1;
     private static final AtomicInteger sNextGeneratedId = new AtomicInteger(1);
 
 
-
-
     public static int dp2px(Context context, float dipValue)
-
     {
 
-        float m=context.getResources().getDisplayMetrics().density ;
-
-        return (int)(dipValue * m + 0.5f) ;
-
+        return RAUtil.dp2px(context, dipValue);
     }
 
     public static int sp2px(Context context, float spValue) {
-        float fontScale = context.getResources().getDisplayMetrics().scaledDensity;
-        return (int) (spValue * fontScale + 0.5f);
-    }
-
-    public static int px2dp(Context context, float pxValue)
-
-    {
-
-        float m=context.getResources().getDisplayMetrics().density ;
-
-        return (int)(pxValue / m + 0.5f) ;
 
+        return RAUtil.sp2px(context, spValue);
     }
 
 
     public static Boolean checkPermissions(Activity activity, String[] permissions) {
-        if (Build.VERSION.SDK_INT >= 23) {
-            return checkPermissions_23(activity, permissions);
-        } else {
-            return false;
-//            return checkPermissions_23(activity,permissions);
-        }
+       return RAUtil.checkPermissions(activity, permissions);
     }
 
-    public static Boolean checkPermissions_23(Activity activity, String[] permissions) {
-        Log.d("_APEXMOBILE", "checkPermissions23:==================================== ");
-        ArrayList<String> request_list = new ArrayList<String>();
-        for (String permission : permissions) {
-            boolean bshow = ActivityCompat.shouldShowRequestPermissionRationale(activity, permission);
-//            boolean granted= ContextCompat.checkSelfPermission(activity,
-//                    Manifest.permission.ACCESS_FINE_LOCATION)
-//                    == PackageManager.PERMISSION_GRANTED;
-            boolean pc = PermissionChecker.checkSelfPermission(activity, permission) == PermissionChecker.PERMISSION_GRANTED;
-//            Log.d("_RAIMAGE", "checkPermissions23: "+permission+"  SHOW  "+bshow+"  granted  "+granted +","+pc);
-
-            if (!pc)
-                request_list.add(permission);
-        }
-        Log.d("_APEXMOBILE", "checkPermissions23:==================================== ");
-
-
-        if (request_list.isEmpty())
-            return false;
-        ActivityCompat.requestPermissions(activity,
-                request_list.toArray(new String[0]),
-                MY_PERMISSIONS_REQUEST);
-
-
-        return true;
-
-    }
-//	public static Boolean checkPermissions_24(Activity activity, String[] permissions)
-//	{
-//
-//
-//		if(permissions.length==0)
-//			return true;
-//		ActivityCompat.requestPermissions(activity,
-//				permissions,
-//				MY_PERMISSIONS_REQUEST);
-//
-//
-//		return true;
-//
-//
-//	}
-//
-//	public static Boolean checkPermissions_23(String[] permissions)
-//	{
-//		Log.d("_RAIMAGE", "checkPermissions23:==================================== ");
-//		ArrayList<String> request_list = new ArrayList<String>();
-//		Context context = ApexTrackingApplication.getInstance().getApplicationContext();
-//		for(String permission : permissions) {
-//
-//			boolean pc = PermissionChecker.checkSelfPermission(context,permission)==PermissionChecker.PERMISSION_GRANTED;
-//			if(!pc)
-//				return false;
-//		}
-//		Log.d("_RAIMAGE", "checkPermissions23:==================================== ");
-//
-//
-//
-//		return true;
-//
-//	}
 
     public static int iconName2Rid(Context context,String name) {
 

ApexDrivers/apexmobile/src/main/java/com/usai/util/dbUtil.java

@@ -12,6 +12,7 @@ import android.text.format.DateFormat;
 import android.util.Log;
 
 import com.usai.apex.ApexTrackingApplication;
+import com.usai.redant.rautils.utils.dbgUtil;
 
 import org.json.JSONArray;
 

ApexDrivers/apexmobile/src/main/java/com/usai/util/dbgUtil.java

@@ -1,119 +0,0 @@
-package com.usai.util;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.util.Log;
-
-public class dbgUtil
-{
-//	static boolean ENABLE_DEBUG = true;
-//	static boolean ENABLE_SQL_DEBUG = true;
-//	final int DEBUG_LEVEL_NONE = 8;
-//	static int DEBUG_LEVEL = Log.VERBOSE;
-
-	// private static boolean m_dbgFlag = true;
-	/*
-	 * public dbgUtil(Context context) {
-	 * 
-	 * m_dbgFlag = Boolean.parseBoolean(context.getString(R.string.flag_debug));
-	 * 
-	 * }
-	 * 
-	 * public dbgUtil(Context context) { m_dbgFlag =
-	 * Boolean.parseBoolean(context.getString(R.string.flag_debug)); return
-	 * this; }
-	 */
-	public static void Logd(String tag,String msg)
-	{
-		String pos = getTracePos();
-		Log.d(tag,msg+pos);
-	}
-//	public static void Log(int type, String tag, String msg)
-//	{
-////		if (ENABLE_DEBUG == false)
-////			return;
-////		if (type < DEBUG_LEVEL)
-////			return;
-//		String pos= getTracePos();
-//		switch (type)
-//		{
-//			case Log.ASSERT:
-//				Log.wtf(tag, msg+pos);
-//				break;
-//			case Log.DEBUG:
-//				Log.d(tag, msg+pos);
-//				break;
-//			case Log.ERROR:
-//				Log.e(tag, msg+pos);
-//				break;
-//			case Log.INFO:
-//				Log.i(tag, msg+pos);
-//				break;
-//			case Log.VERBOSE:
-//				Log.v(tag, msg+pos);
-//				break;
-//			case Log.WARN:
-//				Log.w(tag, msg+pos);
-//				break;
-//			default:
-//				Log.wtf("dbgUtil", "LOG TYPE ERROR!"+pos);
-//				break;
-//		}
-//
-//	}
-
-	private static String getTracePos()
-	{
-		// StackTraceElement[] elements =
-		// Thread.currentThread().getStackTrace();
-		StackTraceElement element = Thread.currentThread().getStackTrace()[4];
-		
-		return " at " + element.getClassName() + "." + element.getMethodName()
-				+ "("+element.getFileName()+":" + element.getLineNumber()+")" ;
-	}
-
-	public static void dbgCursorInfo(Cursor cursor, Context context/*
-																	 * , String
-																	 * TracePos
-																	 */)
-	{
-//		if (ENABLE_SQL_DEBUG == false)
-//			return;
-
-		// ----------------------debug cursor-----------------------------------
-		Log.d("sql_dbg@dbgCursorInfo", getTracePos() + "Cursor size:	" + cursor.getCount()
-				+ ";	columns count:	" + cursor.getColumnCount() + ";");
-//		dbgUtil.Log(Log.DEBUG,"sql_dbg", getTracePos() + "Cursor size:	" + cursor.getCount()
-//				+ ";	columns count:	" + cursor.getColumnCount() + ";");
-		for (int i = 0; i < cursor.getColumnCount(); i++)
-		{
-			Log.d("sql_dbg@dbgCursorInfo","column idx:	" + i + ";		column name:	"
-					+ cursor.getColumnName(i) + ";");
-//			dbgUtil.Log(Log.DEBUG,"sql_dbg",
-//					"column idx:	" + i + ";		column name:	"
-//							+ cursor.getColumnName(i) + ";");
-		}
-		// ----------------------debug cursor-----------------------------------
-
-	}
-	// public static void dbgCursorMoreInfo(Cursor cursor /*, String TracePos*/)
-	// {
-	// if(Boolean.parseBoolean(context.getString(R.string.flag_debug))==false)
-	// return;
-	//
-	//
-	// //----------------------debug cursor-----------------------------------
-	// dbgUtil.Log(Log.DEBUG,"sql_dbg",Log.getStackTraceString(new Throwable())
-	// +"Cursor size:	"+cursor.getCount()
-	// +";	columns count:	"+cursor.getColumnCount()
-	// +";");
-	// for (int i =0;i<cursor.getColumnCount();i++)
-	// {
-	// dbgUtil.Log(Log.DEBUG,"sql_dbg","column idx:	"+i
-	// +";		column name:	"+cursor.getColumnName(i)
-	// +";");
-	// }
-	// //----------------------debug cursor-----------------------------------
-	//
-	// }
-}

ApexDrivers/apexmobile/src/main/res/anim/dialog_in.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-           android:duration="200"
-           android:fromYDelta="100%"
-           android:toYDelta="0" />

ApexDrivers/apexmobile/src/main/res/anim/dialog_out.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-           android:duration="200"
-           android:fromYDelta="0"
-           android:toYDelta="100%" />

ApexDrivers/apexmobile/src/main/res/drawable/actionsheet_round_corner_highlight_bg.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <corners android:radius="10dp"/>
-
-    <solid android:color="#aaaaaaaa"/>
-
-    <stroke
-        android:width="1dp"
-        android:color="#aaaaaaaa"
-        />
-
-</shape>

ApexDrivers/apexmobile/src/main/res/drawable/actionsheet_round_corner_normal_bg.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <corners android:radius="10dp"/>
-
-    <solid android:color="#ffffff"/>
-
-    <stroke
-        android:width="1dp"
-        android:color="#ffffff"
-        />
-
-</shape>

ApexDrivers/apexmobile/src/main/res/drawable/actionsheet_round_corner_selected_bg.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <corners android:radius="10dp"/>
-
-    <solid android:color="#00ffff"/>
-
-    <stroke
-        android:width="1dp"
-        android:color="#ffffff"
-        />
-
-</shape>

ApexDrivers/apexmobile/src/main/res/layout/action_sheet.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-    android:background="#00000000"
-    >
-
-</LinearLayout>

ApexDrivers/apexmobile/src/main/res/values/actionsheet_styles.xml

@@ -1,22 +0,0 @@
-<resources>
-
-    <style name="actionSheet" parent="@android:style/Theme.Dialog">
-
-        <!-- 背景透明 -->
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <!-- 浮于Activity之上 -->
-        <item name="android:windowIsFloating">true</item>
-        <!-- 边框 -->
-        <item name="android:windowFrame">@null</item>
-        <!-- Dialog以外的区域模糊效果 -->
-        <item name="android:backgroundDimEnabled">true</item>
-        <!-- 无标题 -->
-        <item name="android:windowNoTitle">true</item>
-        <!-- 半透明 -->
-        <item name="android:windowIsTranslucent">true</item>
-        <!-- Dialog进入及退出动画 -->
-        <item name="android:windowAnimationStyle">@style/DialogAnimation</item>
-    </style>
-
-</resources>

ApexDrivers/apexmobile/src/main/res/values/animation.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- Dialog进出动画 -->
-    <style name="DialogAnimation" parent="@android:style/Animation.Dialog">
-        <item name="android:windowEnterAnimation">@anim/dialog_in</item>
-        <item name="android:windowExitAnimation">@anim/dialog_out</item>
-    </style>
-
-</resources>