zhanghaochen / ParentControl

Download as
Browse Code »

Commit fbcd5cb19fbe706bbc017dd72548e706c3271838

Authored by shixianjie
1 parent 24fb58525d
Exists in master

修改host和apiKey; 修复默认选中后图片没有默认保存导致的问题

Showing 3 changed files with 27 additions and 17 deletions   Show diff stats
app/src/main/java/com/hjx/parent/adapter/ImageAdapter.java
Diff comments   View file @fbcd5cb
... ... @@ -127,23 +127,33 @@ public class ImageAdapter extends RecyclerView.Adapter<ImageAdapter.ImageHolder>
127 127 rl_add.setBackgroundResource(R.drawable.bg_cut_unselect);
128 128 iv_state.setImageResource(R.mipmap.ic_add);
129 129 }
130   - rl_add.setOnClickListener(new View.OnClickListener() {
131   - @Override
132   - public void onClick(View v) {
133   - 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());
134   - if (imageBean.getCuts().get(finalI).isSelect()) {
135   - imageBean.getCuts().get(finalI).setSelect(false);
136   - rl_add.setBackgroundResource(R.drawable.bg_cut_unselect);
137   - iv_state.setImageResource(R.mipmap.ic_add);
138   - } else {
139   - imageBean.getCuts().get(finalI).setSelect(true);
140   - imageBean.getCuts().get(finalI).setBitmap(b);
141   - rl_add.setBackgroundResource(R.drawable.bg_cut_select);
142   - iv_state.setImageResource(R.mipmap.ic_selected);
  130 +
  131 + rl_add.setOnClickListener(v -> {
  132 + ImageBean.Cut cut = imageBean.getCuts().get(finalI);
  133 + if (cut.isSelect()) {
  134 + cut.setSelect(false);
  135 + rl_add.setBackgroundResource(R.drawable.bg_cut_unselect);
  136 + iv_state.setImageResource(R.mipmap.ic_add);
  137 + } else {
  138 + cut.setSelect(true);
  139 + rl_add.setBackgroundResource(R.drawable.bg_cut_select);
  140 + iv_state.setImageResource(R.mipmap.ic_selected);
  141 + if (cut.getBitmap() == null) {
  142 + 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());
  143 + cut.setBitmap(b);
143 144 }
144   - context.refreshNum();
145 145 }
  146 + context.refreshNum();
146 147 });
  148 + rl_add.postDelayed(() -> {
  149 + ImageBean.Cut cut = imageBean.getCuts().get(finalI);
  150 + if (cut.isSelect() && cut.getBitmap() == null) {
  151 + View v = rl_add;
  152 + 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());
  153 + cut.setBitmap(b);
  154 + }
  155 + }, 300);
  156 +
147 157 iv_edit.setOnClickListener(new View.OnClickListener() {
148 158 @Override
149 159 public void onClick(View v) {
... ...
... ... @@ -16,7 +16,7 @@ buildscript {
16 16  
17 17  
18 18 url = [
19   - server_url : "http://192.168.3.144:8088", //http 请求指令
  19 + server_url : "http://192.168.0.21:8088", //http 请求指令
20 20 server_url_online: "https://mgr.hjx.com", //http 请求指令
21 21 ]
22 22  
... ...
libs/common/build.gradle
Diff comments   View file @fbcd5cb
... ... @@ -20,8 +20,8 @@ android {
20 20  
21 21 buildConfigField("String", "APIKey", "\"oj9XT8AOeTeLkdqaEX7RJA0N\"")
22 22 buildConfigField("String", "SecretKey", "\"AfUFmACkfbd0RMuk11qbw1TW5LtxtJHK\"")
23   - buildConfigField("String", "APIKey1", "\"oj9XT8AOeTeLkdqaEX7RJA0N\"")
24   - buildConfigField("String", "SecretKey1", "\"AfUFmACkfbd0RMuk11qbw1TW5LtxtJHK\"")
  23 + buildConfigField("String", "APIKey1", "\"eCa3YzEjTBBiNjlXcNnjnldP\"")
  24 + buildConfigField("String", "SecretKey1", "\"KnZPmjF0ZzmxWV964mzmm6yuDljnETLt\"")
25 25 }
26 26  
27 27 buildTypes {
... ...