diff --git a/app/src/main/java/com/hjx/parent/adapter/ImageAdapter.java b/app/src/main/java/com/hjx/parent/adapter/ImageAdapter.java index 1b22866..9f1f3fc 100644 --- a/app/src/main/java/com/hjx/parent/adapter/ImageAdapter.java +++ b/app/src/main/java/com/hjx/parent/adapter/ImageAdapter.java @@ -127,23 +127,33 @@ public class ImageAdapter extends RecyclerView.Adapter rl_add.setBackgroundResource(R.drawable.bg_cut_unselect); iv_state.setImageResource(R.mipmap.ic_add); } - rl_add.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Bitmap b = Bitmap.createBitmap(bitmap, v.getLeft() * bitmap.getWidth() / holder.binding.ivPic.getWidth(), v.getTop() * bitmap.getHeight() / holder.binding.ivPic.getHeight(), (v.getRight() - v.getLeft()) * bitmap.getWidth() / holder.binding.ivPic.getWidth(), (v.getBottom() - v.getTop()) * bitmap.getHeight() / holder.binding.ivPic.getHeight()); - if (imageBean.getCuts().get(finalI).isSelect()) { - imageBean.getCuts().get(finalI).setSelect(false); - rl_add.setBackgroundResource(R.drawable.bg_cut_unselect); - iv_state.setImageResource(R.mipmap.ic_add); - } else { - imageBean.getCuts().get(finalI).setSelect(true); - imageBean.getCuts().get(finalI).setBitmap(b); - rl_add.setBackgroundResource(R.drawable.bg_cut_select); - iv_state.setImageResource(R.mipmap.ic_selected); + + rl_add.setOnClickListener(v -> { + ImageBean.Cut cut = imageBean.getCuts().get(finalI); + if (cut.isSelect()) { + cut.setSelect(false); + rl_add.setBackgroundResource(R.drawable.bg_cut_unselect); + iv_state.setImageResource(R.mipmap.ic_add); + } else { + cut.setSelect(true); + rl_add.setBackgroundResource(R.drawable.bg_cut_select); + iv_state.setImageResource(R.mipmap.ic_selected); + if (cut.getBitmap() == null) { + Bitmap b = Bitmap.createBitmap(bitmap, v.getLeft() * bitmap.getWidth() / holder.binding.ivPic.getWidth(), v.getTop() * bitmap.getHeight() / holder.binding.ivPic.getHeight(), (v.getRight() - v.getLeft()) * bitmap.getWidth() / holder.binding.ivPic.getWidth(), (v.getBottom() - v.getTop()) * bitmap.getHeight() / holder.binding.ivPic.getHeight()); + cut.setBitmap(b); } - context.refreshNum(); } + context.refreshNum(); }); + rl_add.postDelayed(() -> { + ImageBean.Cut cut = imageBean.getCuts().get(finalI); + if (cut.isSelect() && cut.getBitmap() == null) { + View v = rl_add; + Bitmap b = Bitmap.createBitmap(bitmap, v.getLeft() * bitmap.getWidth() / holder.binding.ivPic.getWidth(), v.getTop() * bitmap.getHeight() / holder.binding.ivPic.getHeight(), (v.getRight() - v.getLeft()) * bitmap.getWidth() / holder.binding.ivPic.getWidth(), (v.getBottom() - v.getTop()) * bitmap.getHeight() / holder.binding.ivPic.getHeight()); + cut.setBitmap(b); + } + }, 300); + iv_edit.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/build.gradle b/build.gradle index 4230664..8410272 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ buildscript { url = [ - server_url : "http://192.168.3.144:8088", //http 请求指令 + server_url : "http://192.168.0.21:8088", //http 请求指令 server_url_online: "https://mgr.hjx.com", //http 请求指令 ] diff --git a/libs/common/build.gradle b/libs/common/build.gradle index 666b6e1..0e88e31 100644 --- a/libs/common/build.gradle +++ b/libs/common/build.gradle @@ -20,8 +20,8 @@ android { buildConfigField("String", "APIKey", "\"oj9XT8AOeTeLkdqaEX7RJA0N\"") buildConfigField("String", "SecretKey", "\"AfUFmACkfbd0RMuk11qbw1TW5LtxtJHK\"") - buildConfigField("String", "APIKey1", "\"oj9XT8AOeTeLkdqaEX7RJA0N\"") - buildConfigField("String", "SecretKey1", "\"AfUFmACkfbd0RMuk11qbw1TW5LtxtJHK\"") + buildConfigField("String", "APIKey1", "\"eCa3YzEjTBBiNjlXcNnjnldP\"") + buildConfigField("String", "SecretKey1", "\"KnZPmjF0ZzmxWV964mzmm6yuDljnETLt\"") } buildTypes {