Merge branch 'dev-member-john' of http://113.105.137.151:22280/lify/rvapp

RvClient/src/main/java/com/xxfc/rv/RvClientApplication.java

@@ -2,6 +2,7 @@ package com.xxfc.rv;
 
 
 import android.app.Activity;
+import android.os.StrictMode;
 
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.baidu.mapapi.CoordType;
@@ -42,6 +43,11 @@ public class RvClientApplication extends FrameApp {
     @Override
     public void onCreate() {
         super.onCreate();
+        StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder();
+        StrictMode.setVmPolicy(builder.build());
+        builder.detectFileUriExposure();
+
+
         CrashHandler.getInstance().init(this);
         // 在使用 SDK 各组间之前初始化 context 信息，传入 ApplicationContext
         SDKInitializer.initialize(this);
@@ -80,7 +86,7 @@ public class RvClientApplication extends FrameApp {
 
 //        ModuleUtil.register();
 
-        if (isDedugARouter){
+        if (isDedugARouter) {
             ARouter.openLog();
             ARouter.openDebug();
         }
@@ -129,7 +135,6 @@ public class RvClientApplication extends FrameApp {
     }
 
 
-
     private void initAuto() {
 
         //当 App 中出现多进程, 并且您需要适配所有的进程, 就需要在 App 初始化时调用 initCompatMultiProcess()

module_mine/src/main/java/com/rv/rvmine/traveler/PersonalInformationActivity.java

@@ -152,10 +152,10 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
             if (data != null && data.getData() != null) {
                 mPresenter.cropPhoto(data.getData());
             }
-        } else if (requestCode == mPresenter.TYPE_CAMERA_CODE) {
+        } else if (requestCode == mPresenter.TYPE_CAMERA_CODE && resultCode == RESULT_OK ) {
             mPresenter.cropPhoto(Uri.fromFile(new File(mPresenter.gerCameraStoreUrl())));
-        } else if (requestCode == mPresenter.TYPE_CROP_CODE) {
-            String url = String.format("%1$s%2$s", "file://", mPresenter.gerCameraStoreUrl());
+        } else if (requestCode == mPresenter.TYPE_CROP_CODE && resultCode == RESULT_OK) {
+            String url = mPresenter.gerCameraStoreUrl();
             GlideManager.getInstance(mActivity).loadImage(url, ivAvatar);
             uploadFile(new File(mPresenter.gerCameraStoreUrl()), "camera");
         }

plugin_version/src/main/res/xml/update_file_paths.xml

@@ -5,7 +5,7 @@
      
     <cache-path name="cache-path" path="" />
      
-    <external-path name="external-path" path="photo" />
+    <external-path name="external-path" path="photo/camera" />
      
     <external-files-path name="external-files-path" path="" />