This commit is contained in:
jinyuer
2021-01-28 14:59:30 +08:00
parent 89945347ae
commit 6bd2b76fee
9 changed files with 106 additions and 70 deletions

View File

@@ -28,6 +28,7 @@ import com.zhihu.matisse.engine.impl.PicassoEngine;
import com.zhihu.matisse.internal.entity.CaptureStrategy;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -40,9 +41,11 @@ import http.FileUpLoad.retrofit.HttpStaticApi;
import http.FileUpLoad.retrofit.RetrofitCallBack;
import http.FileUpLoad.retrofit.RetrofitHttpUpLoad;
import my_loader.Resultcode;
import okhttp3.MediaType;
import okhttp3.RequestBody;
import retrofit2.Response;
import tools.Config;
import top.zibin.luban.Luban;
import utils.Md5;
public class AddDiscoveryActivity extends BaseActivity<ActivityAddDiscoveryBinding> {
@@ -230,19 +233,31 @@ public class AddDiscoveryActivity extends BaseActivity<ActivityAddDiscoveryBindi
} else if (requestCode == REQUEST_CODE_SELECT_PICTURE && resultCode == RESULT_OK && data != null) {
List<String> strings = Matisse.obtainPathResult(data);
ArrayList<File> files = new ArrayList<>();
files.addAll(additionImageWrapper.getImageList());
for (int i = 0; i < strings.size(); i++) {
files.add(new File(strings.get(i)));
ArrayList<File> files = new ArrayList<>(additionImageWrapper.getImageList());
try {
List<File> list = Luban.with(AddDiscoveryActivity.this).load(strings)
.ignoreBy(100).setTargetDir(getCacheDir().getAbsolutePath()).get();
files.addAll(list);
} catch (IOException e) {
e.printStackTrace();
}
additionImageWrapper.setData(files);
} else if (requestCode == 411 && resultCode == RESULT_OK && data != null) {
List<String> strings = Matisse.obtainPathResult(data);
if (!strings.isEmpty()) {
file = new File(strings.get(0));
Bitmap bitmap = BitmapFactory.decodeFile(file.toString());
mDataBinding.tvCover.setBackground(new BitmapDrawable(getResources(), bitmap));
mDataBinding.tvCover.setText("");
try {
List<File> list = Luban.with(AddDiscoveryActivity.this).load(strings).ignoreBy(100).setTargetDir(getCacheDir().getAbsolutePath()).get();
if (null != list && list.size() > 0) {
file = list.get(0);
Bitmap bitmap = BitmapFactory.decodeFile(file.toString());
mDataBinding.tvCover.setBackground(new BitmapDrawable(getResources(), bitmap));
mDataBinding.tvCover.setText("");
}
} catch (IOException e) {
e.printStackTrace();
}
}
}
}
@@ -317,54 +332,76 @@ public class AddDiscoveryActivity extends BaseActivity<ActivityAddDiscoveryBindi
private void submit() {
RetrofitHttpUpLoad retrofitHttpUpLoad = RetrofitHttpUpLoad.getInstance();
retrofitHttpUpLoad.clear();
Map<String, Object> map = new HashMap<>();
// Map<String, Object> map = new HashMap<>();
RegisterUser user =
Config.getInstance(this).getUser();
Map<String, RequestBody> map = new HashMap<>();
if (user != null) {
map.put("userid", user.getUserid());
map.put("userid", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), user.getUserid()));
} else {
map.put("userid", 0 + "");
}
map.put("app", "Goods");
map.put("class", "AddGoodsInfo");
map.put("sign", Md5.md5("Goods" + "AddGoodsInfo" + Md5.secret));
map.put("userid", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), 0 + ""));
}
Log.e("userId", user.getUserid());
map.put("app", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), "Goods"));
map.put("class", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), "AddGoodsInfo"));
map.put("sign", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), Md5.md5("Goods" + "AddGoodsInfo" + Md5.secret)));
Log.e("sign", Md5.md5("Goods" + "AddGoodsInfo" + Md5.secret));
map.put("type", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), type + 1 + ""));
map.put("type", type + 1 + "");
if (type == 1) {
if (additionImageWrapper.getImageList().size() < 1) {
setToast("请添加图片或视频");
return;
}
}
for (int i = 0; i < additionImageWrapper.getImageList().size(); i++) {
if (additionImageWrapper.getImageList().get(i) != null) {
map.put("pic" + i, additionImageWrapper.getImageList().get(i));
}
}
map.put("file_count", additionImageWrapper.getImageList().size() + "");
String goodsDetail = mDataBinding.etInfo.getText().toString().trim();
if (TextUtils.isEmpty(goodsDetail)) {
setToast("请输入文字信息");
return;
}
map.put("goods_detail", goodsDetail);
map.put("goods_detail", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), goodsDetail));
Log.e("goods_detail", goodsDetail);
if (type == 1) {
if (goodsInfo.isEmpty()) {
setToast("请添加商品规格");
return;
}
map.put("property", goodsInfo);
map.put("property", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), goodsInfo));
Log.e("property", goodsInfo);
if (file == null || !file.isFile()) {
setToast("请上传商品封面图");
return;
}
}
map.put("thumb", file);
for (int i = 0; i < additionImageWrapper.getImageList().size(); i++) {
map.put("pic" + i + "\"; filename=\"" + additionImageWrapper.getImageList().get(i).getName() + "", RequestBody.create(MediaType.get("multipart/form-data;charset=UTF-8"), additionImageWrapper.getImageList().get(i)));
Log.e("xxxx", additionImageWrapper.getImageList().get(i).getName());
}
if (file!=null){
map.put("pic"+ additionImageWrapper.getImageList().size()+ "\"; filename=\"" + file.getName() + "", RequestBody.create(MediaType.get("multipart/form-data;charset=UTF-8"), file));
map.put("file_count", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), additionImageWrapper.getImageList().size()+1 + ""));
}else {
map.put("file_count", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), additionImageWrapper.getImageList().size() + ""));
}
// params.put(key + "\"; filename=\"" + ((File) o).getName() + "", requestBody);
progressDialog.setMessage("提交中");
progressDialog.show();
Map<String, RequestBody> params = retrofitHttpUpLoad.addParameter(map).bulider();
retrofitHttpUpLoad.addToEnqueue(retrofitHttpUpLoad.mHttpService.upLoadAgree(ApiConfig.BASE_URL, params),
// Map<String, RequestBody> params = retrofitHttpUpLoad.addParameter(map).bulider();
retrofitHttpUpLoad.addToEnqueue(retrofitHttpUpLoad.mHttpService.upLoadAgree(ApiConfig.BASE_URL, map),
new RetrofitCallBack() {
@Override
public void onResponse(Response response, int method) {

View File

@@ -405,7 +405,8 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
}
}
});
new XPopup.Builder(baseActivity).hasShadowBg(false).atView(homeGridAdapterItemBinding.ivComment).asCustom(commentDialog)
new XPopup.Builder(baseActivity).hasShadowBg(false).atView(homeGridAdapterItemBinding.ivComment)
.asCustom(commentDialog)
.show();
}