From e2741cdccbacff58f98349c235c6c546234e9e18 Mon Sep 17 00:00:00 2001 From: jia Date: Sat, 7 Dec 2024 17:45:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E5=83=8F=E4=B8=8A=E4=BC=A0=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ifish/activity/LookAtReportActivity.java | 8 ++-- .../activity/LookFishMonitorActivity.java | 8 ++-- .../java/com/ifish/activity/MineActivity.java | 41 ++++++++++--------- .../main/java/com/ifish/utils/AppUtil.java | 5 +-- 4 files changed, 29 insertions(+), 33 deletions(-) diff --git a/iFish7/src/main/java/com/ifish/activity/LookAtReportActivity.java b/iFish7/src/main/java/com/ifish/activity/LookAtReportActivity.java index 93b32bf34..29ba18fc1 100644 --- a/iFish7/src/main/java/com/ifish/activity/LookAtReportActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/LookAtReportActivity.java @@ -26,6 +26,7 @@ import com.ifish.basebean.LookReport; import com.ifish.baseclass.BaseActivity; import com.ifish.geewe.ImgScreenshotUtil; import com.ifish.utils.AnimationUtil; +import com.ifish.utils.AppUtil; import com.ifish.utils.Commons; import com.ifish.utils.Commons.LoginSPKey; import com.ifish.utils.Commons.NetWork; @@ -91,11 +92,8 @@ public class LookAtReportActivity extends BaseActivity { iv_camera = findMyViewById(R.id.iv_camera); iv_head = findMyViewById(R.id.iv_head); String wximg = SPUtil.getInstance(LookAtReportActivity.this).getString(Commons.LoginSPKey.WXIMAGE); - if (!TextUtils.isEmpty(wximg)) { - Picasso.with(LookAtReportActivity.this).load(wximg).error(R.drawable.ic_error).into(iv_head); - } else { - Picasso.with(LookAtReportActivity.this).load(HttpManager.HEAD_URL + Commons.USER.getUserImg()).error(R.drawable.ic_error).into(iv_head); - } + AppUtil.setHeader(this,iv_head,wximg); + try {//加载最后一帧摄像头的图片，获取错误则加载默认图片 cameraId = lookCamera.cameraId; File fileUpload = new File(ImgScreenshotUtil.getScreenshotImage(sp.getString(LoginSPKey.GeeWeUserId, ""), cameraId)); diff --git a/iFish7/src/main/java/com/ifish/activity/LookFishMonitorActivity.java b/iFish7/src/main/java/com/ifish/activity/LookFishMonitorActivity.java index e4a5516eb..3df0779c6 100644 --- a/iFish7/src/main/java/com/ifish/activity/LookFishMonitorActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/LookFishMonitorActivity.java @@ -52,6 +52,7 @@ import com.ifish.geewe.ImgScreenshotUtil; import com.ifish.geewe.VideoPlayNumber; import com.ifish.utils.ActivityManager; import com.ifish.utils.AnimationUtil; +import com.ifish.utils.AppUtil; import com.ifish.utils.Commons; import com.ifish.utils.Commons.LoginSPKey; import com.ifish.utils.HttpListener; @@ -436,11 +437,8 @@ public class LookFishMonitorActivity extends BaseGradeMonitorActivity implements et_content = (EditText) v.findViewById(R.id.et_content); iv_userImg = (ImageView) v.findViewById(R.id.iv_userImg); String wximg = SPUtil.getInstance(LookFishMonitorActivity.this).getString(Commons.LoginSPKey.WXIMAGE); - if (!TextUtils.isEmpty(wximg)) { - Picasso.with(getApplicationContext()).load(wximg).error(R.drawable.ic_error).into(iv_userImg); - } else { - Picasso.with(getApplicationContext()).load(HttpManager.HEAD_URL + Commons.USER.getUserImg()).error(R.drawable.ic_error).into(iv_userImg); - } + AppUtil.setHeader(this,iv_userImg,wximg); + iv_userType = (ImageView) v.findViewById(R.id.iv_userType); iv_reward = (ImageView) v.findViewById(R.id.iv_reward); tv_gradeNum = (TextView) v.findViewById(R.id.tv_gradeNum); diff --git a/iFish7/src/main/java/com/ifish/activity/MineActivity.java b/iFish7/src/main/java/com/ifish/activity/MineActivity.java index dcf6e6f20..cd06da8a8 100644 --- a/iFish7/src/main/java/com/ifish/activity/MineActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/MineActivity.java @@ -280,26 +280,27 @@ public class MineActivity extends BaseActivity { private void changeHead() { - final Dialog dialogHead = new Dialog(MineActivity.this, R.style.HOLOMyDialogs); - dialogHead.show(); - Window window = dialogHead.getWindow(); - window.setContentView(R.layout.dialog_cramer); - RelativeLayout rl_png = (RelativeLayout) window.findViewById(R.id.rl_man); - RelativeLayout rl_cramera = (RelativeLayout) window.findViewById(R.id.rl_woman); - rl_png.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - gallery(); - dialogHead.dismiss(); - } - }); - rl_cramera.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - camera(); - dialogHead.dismiss(); - } - }); + gallery(); +// final Dialog dialogHead = new Dialog(MineActivity.this, R.style.HOLOMyDialogs); +// dialogHead.show(); +// Window window = dialogHead.getWindow(); +// window.setContentView(R.layout.dialog_cramer); +// RelativeLayout rl_png = (RelativeLayout) window.findViewById(R.id.rl_man); +// RelativeLayout rl_cramera = (RelativeLayout) window.findViewById(R.id.rl_woman); +// rl_png.setOnClickListener(new OnClickListener() { +// @Override +// public void onClick(View v) { +// +// dialogHead.dismiss(); +// } +// }); +// rl_cramera.setOnClickListener(new OnClickListener() { +// @Override +// public void onClick(View v) { +// camera(); +// dialogHead.dismiss(); +// } +// }); } diff --git a/iFish7/src/main/java/com/ifish/utils/AppUtil.java b/iFish7/src/main/java/com/ifish/utils/AppUtil.java index 83d3c865d..2bc9e5f62 100644 --- a/iFish7/src/main/java/com/ifish/utils/AppUtil.java +++ b/iFish7/src/main/java/com/ifish/utils/AppUtil.java @@ -218,12 +218,11 @@ public class AppUtil { if (!TextUtils.isEmpty(userImg)){ Picasso.with(activity).invalidate(HttpManager.HEAD_URL + Commons.USER.getUserImg());//清除缓存 重新加载图片 Picasso.with(activity).load(HttpManager.HEAD_URL + Commons.USER.getUserImg()).error(R.drawable.ic_error).into(header); - }else { - if (!TextUtils.isEmpty(weixin)) { + }else if (!TextUtils.isEmpty(weixin)) { Picasso.with(activity).invalidate(weixin);//清除缓存 重新加载图片 Picasso.with(activity).load(weixin).error(R.drawable.ic_error).into(header); } - } + } }