图片详情增加下载原图,答案详情对接新的图片显示规则
This commit is contained in:
kehaoyuan
@ -14,6 +14,7 @@ import android.support.annotation.Nullable;
|
||||
import android.support.v4.content.ContextCompat;
|
||||
import android.support.v4.view.PagerAdapter;
|
||||
import android.support.v4.view.ViewPager.OnPageChangeListener;
|
||||
import android.text.TextUtils;
|
||||
import android.util.DisplayMetrics;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
@ -26,7 +27,6 @@ import com.facebook.common.executors.CallerThreadExecutor;
|
||||
import com.facebook.common.references.CloseableReference;
|
||||
import com.facebook.datasource.DataSource;
|
||||
import com.facebook.drawee.backends.pipeline.Fresco;
|
||||
import com.facebook.drawee.drawable.ScalingUtils;
|
||||
import com.facebook.drawee.interfaces.DraweeController;
|
||||
import com.facebook.imagepipeline.core.ImagePipeline;
|
||||
import com.facebook.imagepipeline.datasource.BaseBitmapDataSubscriber;
|
||||
@ -38,11 +38,13 @@ import com.gh.common.util.DisplayUtils;
|
||||
import com.gh.common.util.EntranceUtils;
|
||||
import com.gh.common.util.ImageUtils;
|
||||
import com.gh.common.util.MessageShareUtils;
|
||||
import com.gh.common.util.NetworkUtils;
|
||||
import com.gh.common.view.EmptyDrawable;
|
||||
import com.gh.common.view.Gh_RelativeLayout;
|
||||
import com.gh.common.view.Gh_RelativeLayout.OnSingleTapListener;
|
||||
import com.gh.common.view.Gh_ViewPager;
|
||||
import com.gh.common.view.ZoomSimpleDraweeView;
|
||||
import com.gh.gamecenter.entity.ImageInfo;
|
||||
import com.gh.gamecenter.entity.ImageInfoEntity;
|
||||
import com.gh.gamecenter.retrofit.Response;
|
||||
import com.gh.gamecenter.retrofit.RetrofitManager;
|
||||
import com.lightgame.utils.Utils;
|
||||
@ -81,7 +83,7 @@ public class ViewImageActivity extends BaseActivity implements OnPageChangeListe
|
||||
|
||||
private ViewImageAdapter adapter;
|
||||
|
||||
private ImagePipeline imagePipeline;
|
||||
private ImagePipeline mImagePipeline;
|
||||
|
||||
private static final String KEY_URLS = "urls";
|
||||
private static final String KEY_CURRENT = "current";
|
||||
@ -89,11 +91,10 @@ public class ViewImageActivity extends BaseActivity implements OnPageChangeListe
|
||||
|
||||
private ArrayList<String> urls;
|
||||
private HashSet<Integer> mViewedSet; // 让调用者知道该图片是否被看过了
|
||||
private Map<String, ImageInfo> mImageInfoMap;
|
||||
|
||||
private String scaleType;
|
||||
private Map<String, ImageInfoEntity> mImageInfoMap;
|
||||
|
||||
private int width;
|
||||
private int mLimitWidth;
|
||||
|
||||
private boolean isOrientation;
|
||||
|
||||
@ -101,7 +102,6 @@ public class ViewImageActivity extends BaseActivity implements OnPageChangeListe
|
||||
Intent checkIntent = new Intent(context, ViewImageActivity.class);
|
||||
checkIntent.putExtra(KEY_URLS, list);
|
||||
checkIntent.putExtra(KEY_CURRENT, position);
|
||||
checkIntent.putExtra(KEY_SCALETYPE, "FIT_CENTER");
|
||||
checkIntent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance);
|
||||
return checkIntent;
|
||||
}
|
||||
@ -124,7 +124,6 @@ public class ViewImageActivity extends BaseActivity implements OnPageChangeListe
|
||||
if (extras != null) {
|
||||
urls = extras.getStringArrayList(KEY_URLS);
|
||||
current = extras.getInt(KEY_CURRENT, 0);
|
||||
scaleType = extras.getString(KEY_SCALETYPE);
|
||||
}
|
||||
|
||||
if (savedInstanceState != null) {
|
||||
@ -132,12 +131,18 @@ public class ViewImageActivity extends BaseActivity implements OnPageChangeListe
|
||||
isOrientation = savedInstanceState.getBoolean("isOrientation");
|
||||
}
|
||||
|
||||
imagePipeline = Fresco.getImagePipeline();
|
||||
mImagePipeline = Fresco.getImagePipeline();
|
||||
|
||||
// init slide
|
||||
DisplayMetrics outMetrics = new DisplayMetrics();
|
||||
getWindowManager().getDefaultDisplay().getMetrics(outMetrics);
|
||||
width = outMetrics.widthPixels / urls.size();
|
||||
int widthPixels = outMetrics.widthPixels;
|
||||
if (NetworkUtils.isWifiConnected(this)) {
|
||||
mLimitWidth = widthPixels * 2;
|
||||
} else {
|
||||
mLimitWidth = widthPixels;
|
||||
}
|
||||
width = widthPixels / urls.size();
|
||||
rparams = new RelativeLayout.LayoutParams(width, DisplayUtils.dip2px(getApplicationContext(), 1));
|
||||
rparams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
|
||||
rparams.bottomMargin = DisplayUtils.dip2px(getApplicationContext(), 10);
|
||||
@ -155,6 +160,31 @@ public class ViewImageActivity extends BaseActivity implements OnPageChangeListe
|
||||
} else if (this.getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
|
||||
isOrientation = false;// 竖屏
|
||||
}
|
||||
|
||||
mProgressHint.setOnClickListener(v -> {
|
||||
int position = mViewPager.getCurrentItem();
|
||||
Object object = mViewPager.findViewWithTag(position);
|
||||
if (object != null) {
|
||||
RelativeLayout view = (RelativeLayout) object;
|
||||
final ZoomSimpleDraweeView draweeView = view.findViewById(R.id.viewimage_iv_show);
|
||||
draweeView.getHierarchy().setProgressBarImage(new EmptyDrawable(progress -> {
|
||||
if (position == mViewPager.getCurrentItem()) { // 防止下载过程中切换图片
|
||||
int percent = progress / 100;
|
||||
if (percent < 100) {
|
||||
mProgressHint.setText((percent + "%"));
|
||||
} else {
|
||||
mProgressHint.setText("已完成");
|
||||
mBaseHandler.postDelayed(() -> {
|
||||
if (position == mViewPager.getCurrentItem()) { // 防止等待过程中切换图片
|
||||
mProgressHint.setVisibility(View.GONE);
|
||||
}
|
||||
}, 500);
|
||||
}
|
||||
}
|
||||
}));
|
||||
draweeView.setImageURI(urls.get(position));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -178,10 +208,10 @@ public class ViewImageActivity extends BaseActivity implements OnPageChangeListe
|
||||
mSlideLine.setLayoutParams(rparams);
|
||||
mProgressHint.setVisibility(View.GONE);
|
||||
} else {
|
||||
ImageInfo imageInfo = mImageInfoMap.get(urls.get(position));
|
||||
if (imageInfo != null && imageInfo.getFileSize() != null) {
|
||||
ImageInfoEntity imageInfoEntity = mImageInfoMap.get(urls.get(position));
|
||||
if (imageInfoEntity != null && imageInfoEntity.getFileSize() != null) {
|
||||
String size = String.format(Locale.CHINA, "%.1fM",
|
||||
Integer.valueOf(imageInfo.getFileSize().getValue()) / 1024F/1024F);
|
||||
Integer.valueOf(imageInfoEntity.getFileSize().getValue()) / 1024F / 1024F);
|
||||
mProgressHint.setVisibility(View.VISIBLE);
|
||||
mProgressHint.setText(("查看原图(" + size + ")"));
|
||||
}
|
||||
@ -212,18 +242,21 @@ public class ViewImageActivity extends BaseActivity implements OnPageChangeListe
|
||||
|
||||
}
|
||||
|
||||
private void loadImageInfo(int position) {
|
||||
private void loadImageInfo(int position, int width) {
|
||||
String url = urls.get(position);
|
||||
RetrofitManager.getInstance(this)
|
||||
.getApi().getImageInfo(url + "?x-oss-process=image/info")
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(new Response<ImageInfo>() {
|
||||
.subscribe(new Response<ImageInfoEntity>() {
|
||||
@Override
|
||||
public void onResponse(@Nullable ImageInfo response) {
|
||||
mImageInfoMap.put(url, response);
|
||||
if (position == mViewPager.getCurrentItem()) {
|
||||
onPageScrolled(position, 0, 0); // 刷新下载原图提示按钮
|
||||
public void onResponse(@Nullable ImageInfoEntity response) {
|
||||
if (response != null && response.getImageWidth() != null &&
|
||||
Integer.valueOf(response.getImageWidth().getValue()) > width) {
|
||||
mImageInfoMap.put(url, response);
|
||||
if (position == mViewPager.getCurrentItem()) {
|
||||
onPageScrolled(position, 0, 0); // 刷新下载原图提示按钮
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
@ -256,15 +289,18 @@ public class ViewImageActivity extends BaseActivity implements OnPageChangeListe
|
||||
@Override
|
||||
public Object instantiateItem(ViewGroup container, int position) {
|
||||
String url = urls.get(position);
|
||||
if (mImageInfoMap.get(url) == null) loadImageInfo(position);
|
||||
|
||||
Gh_RelativeLayout view = (Gh_RelativeLayout) View.inflate(container.getContext(), R.layout.viewimage_normal_item, null);
|
||||
ZoomSimpleDraweeView imageView = view.findViewById(R.id.viewimage_iv_show);
|
||||
|
||||
loadImage(url, imageView);
|
||||
|
||||
if (scaleType != null || isOrientation) {
|
||||
imageView.getHierarchy().setActualImageScaleType(ScalingUtils.ScaleType.FIT_CENTER);
|
||||
if (mImagePipeline.isInBitmapMemoryCache(Uri.parse(url))) {
|
||||
loadImage(url, imageView);
|
||||
} else {
|
||||
ImageUtils.addLimitWidthAndLoad(imageView, url, mLimitWidth, imageInfo -> {
|
||||
if (imageInfo != null && mImageInfoMap.get(url) == null) {
|
||||
loadImageInfo(position, imageInfo.getWidth()); // 加载图片参数,目的是用户显示原文按钮
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
//单点退出
|
||||
@ -306,27 +342,26 @@ public class ViewImageActivity extends BaseActivity implements OnPageChangeListe
|
||||
}
|
||||
|
||||
private void findImageBM() {
|
||||
String key = urls.get(mViewPager.getCurrentItem());
|
||||
String hdKey = "http://image.ghzs666.com/pic/hq" + key.substring(key.lastIndexOf("/"));
|
||||
ImagePipeline imagePipeline = Fresco.getImagePipeline();
|
||||
String curUrl;
|
||||
String url = urls.get(mViewPager.getCurrentItem());
|
||||
String limitUrl = ImageUtils.addLimitWidth(urls.get(mViewPager.getCurrentItem()), mLimitWidth);
|
||||
String targetUrl = null;
|
||||
|
||||
if (imagePipeline.isInBitmapMemoryCache(Uri.parse(hdKey))) {
|
||||
curUrl = hdKey;
|
||||
} else if (imagePipeline.isInBitmapMemoryCache(Uri.parse(key))) {
|
||||
curUrl = key;
|
||||
} else {
|
||||
return;
|
||||
if (mImagePipeline.isInBitmapMemoryCache(Uri.parse(url))) {
|
||||
targetUrl = url;
|
||||
} else if (mImagePipeline.isInBitmapMemoryCache(Uri.parse(limitUrl))) {
|
||||
targetUrl = limitUrl;
|
||||
}
|
||||
|
||||
if (TextUtils.isEmpty(targetUrl)) return;
|
||||
|
||||
ImageRequest imageRequest = ImageRequestBuilder
|
||||
.newBuilderWithSource(Uri.parse(key))
|
||||
.newBuilderWithSource(Uri.parse(targetUrl))
|
||||
.setProgressiveRenderingEnabled(true)
|
||||
.build();
|
||||
|
||||
DataSource<CloseableReference<CloseableImage>>
|
||||
dataSource = imagePipeline.fetchDecodedImage(imageRequest, ViewImageActivity.this);
|
||||
final String finalCurUrl = curUrl;
|
||||
dataSource = mImagePipeline.fetchDecodedImage(imageRequest, ViewImageActivity.this);
|
||||
final String finalCurUrl = targetUrl;
|
||||
dataSource.subscribe(new BaseBitmapDataSubscriber() {
|
||||
@Override
|
||||
protected void onNewResultImpl(Bitmap bitmap) {
|
||||
|
||||
Reference in New Issue
Block a user