Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

app/src/main/java/com/sheep/gamegroup/view/activity/AccountAndSecurityAct.java

@@ -127,6 +127,20 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
     }
 
 
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onMessageEvent(ImageHeadChange done) {
+        UserInfoEntity user=mEntity;
+        user.setAvatar(done.getAvatar());
+        mEntity=user;
+        Glide.with(AccountAndSecurityAct.this)
+                .load(mEntity.getAvatar())
+                .placeholder(R.drawable.icon)
+                .into(ivHead);
+    }
+
+
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMessageEvent(RealNameAutehrChange done) {
 
@@ -251,12 +265,8 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
                 change.setTotal_asset(mEntity.getTotal_asset()+"");
                 EventBus.getDefault().post(change);
 
-        ImageHeadChange  change1=new ImageHeadChange();
-        change1.setAvatar(mEntity.getAvatar());
-        EventBus.getDefault().post(change1);
 
 
-        EventBus.getDefault().post(change);
 
     }
 

app/src/main/java/com/sheep/gamegroup/view/activity/PersionInfoAct.java

@@ -12,6 +12,7 @@ import android.widget.TextView;
 import com.bumptech.glide.Glide;
 import com.lzy.imagepicker.bean.ImageItem;
 import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.event.ImageHeadChange;
 import com.sheep.gamegroup.event.UserNameChange;
 import com.sheep.gamegroup.model.entity.UserInfoEntity;
 
@@ -183,6 +184,15 @@ public class PersionInfoAct extends AbsChooseImageActivity {
     protected void onGetImage(ImageItem image) {
         GlideImageLoader.displayImage(this, ivHeadRight, image.path, R.drawable.logoin_head);
     }
+
+    @Override
+    protected void onGetNetImageUrl(String url) {
+        ImageHeadChange  imageHeadChange=new ImageHeadChange();
+        imageHeadChange.setAvatar(url);
+        EventBus.getDefault().post(imageHeadChange);
+
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();

app/src/main/java/com/sheep/jiuyan/samllsheep/base/AbsChooseImageActivity.java

@@ -49,11 +49,10 @@ public abstract class AbsChooseImageActivity extends BaseActivity implements UpF
             if (data != null && (requestCode == REQUEST_CODE_SELECT||requestCode == REQUEST_CODE_CAMERA)) {
                 ArrayList<ImageItem> images = (ArrayList<ImageItem>) data.getSerializableExtra(ImagePicker.EXTRA_RESULT_ITEMS);
                 if(images != null && !images.isEmpty() && (imageItem = images.get(0)) != null && !TextUtils.isEmpty(imageItem.path)) {
+                    onGetImage(imageItem);
                     if(isUpload){
                         AbsChooseImageActivity.this.dialogShowLoading = DialogShowLoading.showDialog(AbsChooseImageActivity.this);
                         UpFileUtils.upImage(new File(images.get(0).path), AbsChooseImageActivity.this);
-                    } else {
-                        onGetImage(imageItem);
                     }
                     return;
                 }
@@ -86,7 +85,7 @@ public abstract class AbsChooseImageActivity extends BaseActivity implements UpF
         }
         UploadResult uploadResult = JSON.parseObject(json, UploadResult.class);
         if(uploadResult != null){
-            String data = uploadResult.getData().getUrl();
+            final String data = uploadResult.getData().getUrl();
             dialogShowLoading.getTextView().setText("更新中");
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("avatar", data);
@@ -97,7 +96,7 @@ public abstract class AbsChooseImageActivity extends BaseActivity implements UpF
                 @Override
                 public void call(BaseMessage baseMessage) {
                     dialogShowLoading.getTextView().setText("完成");
-                    onGetImage(imageItem);
+                    onGetNetImageUrl(data);
                     dialogShowLoading.getAlertDialog().dismiss();
                 }
             }, new Action1<Throwable>() {
@@ -125,9 +124,10 @@ public abstract class AbsChooseImageActivity extends BaseActivity implements UpF
     public void Failure(String err) {
         onNotGetImage(err);
     }
-    protected abstract void onNotGetImage(String msg);
+    protected abstract void onNotGetImage(String msg);//失败后回调
 
-    protected abstract void onGetImage(ImageItem image);
+    protected abstract void onGetImage(ImageItem image);//获取图片成功后回调
+    protected abstract void onGetNetImageUrl(String url);//获取图片、上传成功并更新后回调
 
 }
 class Data{