Merge remote-tracking branch 'origin/release' into feature/yk_release

config.gradle

@@ -8,7 +8,7 @@ ext {
             "m-confide"       : "0.0.50.42",
             "m-consultant"    : "0.0.60.70",
             "m-fm"            : "0.0.30.09",
-            "m-user"          : "0.0.62.61",
+            "m-user"          : "0.0.62.62",
             "m-home"          : "0.0.23.95",
             "m-im"            : "0.0.21.63",
             "m-dynamic"       : "0.0.7.74",
@@ -90,7 +90,7 @@ ext {
             "m-confide"       : "0.0.50.42",
             "m-consultant"    : "0.0.60.70",
             "m-fm"            : "0.0.30.09",
-            "m-user"          : "0.0.62.61",
+            "m-user"          : "0.0.62.62",
             "m-home"          : "0.0.23.95",
             "m-im"            : "0.0.21.63",
             "m-dynamic"       : "0.0.7.74",

m-user/src/main/java/com/yidianling/user/mine/PersonalInfoActivity.java

@@ -406,6 +406,7 @@ public class PersonalInfoActivity extends BaseActivity implements View.OnClickLi
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
         if (resultCode == RESULT_OK) {
             switch (requestCode) {
                 case 21001:
@@ -432,6 +433,7 @@ public class PersonalInfoActivity extends BaseActivity implements View.OnClickLi
 
                 case 21003:
                     if (imgUri != null) {
+                        showProgressDialog("保存中...");
                         String path = fileUtils.getPathByUri4kitkat(this, imgUri);
                         Bitmap bitmap = BitmapFactory.decodeFile(path);
                         bitmap = fileUtils.getZoomImage(bitmap, 200);
@@ -569,12 +571,7 @@ public class PersonalInfoActivity extends BaseActivity implements View.OnClickLi
      */
     @SuppressLint("CheckResult")
     void uploadImage(final String path, final int requestCode) {
-        runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                showProgressDialog("保存中...");
-            }
-        });
+
 
         UserHttp userHttp = UserHttpImpl.Companion.getInstance();
         userHttp.uploadHead(new HeadParam(new File(path)))
@@ -610,6 +607,7 @@ public class PersonalInfoActivity extends BaseActivity implements View.OnClickLi
                                 .transform(new GlideCircleTransform(PersonalInfoActivity.this))
                                 .into(persion_head_iv);
                     }
+                    dismissProgressDialog();
                 }, new ThrowableConsumer() {
                     @Override
                     public void accept(@NotNull String msg) {