bug修复

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/DrivingUploadActivity.java

@@ -112,7 +112,7 @@ public class DrivingUploadActivity extends BaseStatusActivity<PickerPresenter> {
                     return;
                 }
 
-                if (getDrivingPhone().length() != 11){
+                if (getDrivingPhone().length() != 11) {
                     showToast("请输入正确手机号");
                     return;
                 }
@@ -122,7 +122,7 @@ public class DrivingUploadActivity extends BaseStatusActivity<PickerPresenter> {
                     return;
                 }
 
-                if (getDrivingIdCard().length() != 18){
+                if (getDrivingIdCard().length() != 18) {
                     showToast("请输入正确身份证号");
                     return;
                 }
@@ -184,7 +184,7 @@ public class DrivingUploadActivity extends BaseStatusActivity<PickerPresenter> {
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == mPresenter.TYPE_ALBUM_CODE) {
+        if (requestCode == mPresenter.TYPE_ALBUM_CODE && resultCode == RESULT_OK) {
             if (data != null && data.getData() != null) {
                 llCard.setVisibility(View.GONE);
                 GlideManager.getInstance(mActivity).loadImage(mPresenter.getUriUrl(data.getData()), cardType == 0 ? ivCard : ivCardCopy);
@@ -192,12 +192,14 @@ public class DrivingUploadActivity extends BaseStatusActivity<PickerPresenter> {
             }
             return;
         }
-        if (requestCode == mPresenter.TYPE_CAMERA_CODE) {
-            llCardCopy.setVisibility(View.GONE);
+        if (requestCode == mPresenter.TYPE_CAMERA_CODE && resultCode == RESULT_OK) {
+            if (!TextUtils.isEmpty(mPresenter.gerCameraStoreUrl())) {
+                llCard.setVisibility(View.GONE);
                 String url = String.format("%1$s%2$s", "file://", mPresenter.gerCameraStoreUrl());
                 GlideManager.getInstance(mActivity).loadImage(url, cardType == 0 ? ivCard : ivCardCopy);
                 uploadFile(new File(mPresenter.gerCameraStoreUrl()), "camera");
             }
+        }
 
     }
 
@@ -246,6 +248,7 @@ public class DrivingUploadActivity extends BaseStatusActivity<PickerPresenter> {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             new RxPermission(mActivity).request(
                     Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                    Manifest.permission.READ_EXTERNAL_STORAGE,
                     Manifest.permission.CAMERA).subscribe(new Consumer<Boolean>() {
                 @Override
                 public void accept(Boolean aBoolean) throws Exception {
@@ -314,8 +317,6 @@ public class DrivingUploadActivity extends BaseStatusActivity<PickerPresenter> {
                 }).launch();    //启动压缩
 
 
-
-
     }
 
 

module_home/src/main/res/layout/rv_act_driving_upload.xml

@@ -241,7 +241,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/size_50"
             android:layout_margin="@dimen/size_25"
-            android:background="@drawable/shape_rv_bg_yellow"
+            android:background="@drawable/shape_rv_bg_dark_yellow"
             android:gravity="center"
             android:text="@string/rv_delete"
             android:textColor="@color/colorWrite"

module_mine/src/main/java/com/rv/rvmine/personal/IDCardCertificationActivity.java

@@ -147,7 +147,7 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
                 return;
             }
 
-            if (idCard.length() != 18){
+            if (idCard.length() != 18) {
                 showToast("身份证号不正确！");
                 return;
             }
@@ -169,7 +169,7 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == mPresenter.TYPE_ALBUM_CODE) {
+        if (requestCode == mPresenter.TYPE_ALBUM_CODE && resultCode == RESULT_OK) {
             if (data != null && data.getData() != null) {
                 if (cardType == 0) {
                     llCard.setVisibility(View.GONE);
@@ -181,7 +181,7 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
             }
             return;
         }
-        if (requestCode == mPresenter.TYPE_CAMERA_CODE) {
+        if (requestCode == mPresenter.TYPE_CAMERA_CODE && resultCode == RESULT_OK) {
             if (!TextUtil.isEmpty(mPresenter.gerCameraStoreUrl())) {
                 if (cardType == 0) {
                     llCard.setVisibility(View.GONE);
@@ -298,7 +298,7 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        EasyPermissions.onRequestPermissionsResult(requestCode,permissions,grantResults, this);
+        EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
     }
 
     /**