Merge branch 'dev' of gitlab.ghzhushou.com:halo/assistant-android into 3.1

This commit is contained in:
kehaoyuan
2017-11-23 20:07:25 +08:00
6 changed files with 71 additions and 54 deletions

View File

@ -110,22 +110,14 @@ public class ViewImageActivity extends Activity implements OnPageChangeListener
Object object = mViewimageVp.findViewWithTag(position);
if (object != null) {
RelativeLayout view = (RelativeLayout) object;
final ZoomSimpleDraweeView imageView = (ZoomSimpleDraweeView) view.findViewById(R.id.viewimage_iv_show);
final ProgressBarCircularIndeterminate progressBar = (ProgressBarCircularIndeterminate) view.findViewById(R.id.viewimage_pb_loading);
final ZoomSimpleDraweeView imageView = view.findViewById(R.id.viewimage_iv_show);
final ProgressBarCircularIndeterminate progressBar = view.findViewById(R.id.viewimage_pb_loading);
progressBar.setVisibility(View.VISIBLE);
ImageUtils.Companion.getInstance().display(imageView, newUrls.get(position), urls.get(position),
new BaseControllerListener<ImageInfo>() {
@Override
public void onFinalImageSet(String id, ImageInfo imageInfo, Animatable animatable) {
progressBar.setVisibility(View.GONE);
// if (imageInfo == null){
// return;
// }
// ImageInfo imageInfo1 = (ImageInfo) imageInfo;
// int height = imageInfo1.getHeight();
// int width = imageInfo1.getWidth();
// float index = (float) height / (float) width;
// imageView.setImagePro(index);
}
});
}