1
This commit is contained in:
@@ -12,6 +12,7 @@ import android.os.Bundle;
|
|||||||
import android.support.annotation.Nullable;
|
import android.support.annotation.Nullable;
|
||||||
import android.support.v4.content.ContextCompat;
|
import android.support.v4.content.ContextCompat;
|
||||||
import android.support.v7.widget.GridLayoutManager;
|
import android.support.v7.widget.GridLayoutManager;
|
||||||
|
import android.text.TextUtils;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
|
|
||||||
import com.gyf.immersionbar.ImmersionBar;
|
import com.gyf.immersionbar.ImmersionBar;
|
||||||
@@ -161,7 +162,7 @@ public class AddDiscoveryActivity extends BaseActivity<ActivityAddDiscoveryBindi
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
File file;
|
File file = null;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
|
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
|
||||||
@@ -253,16 +254,25 @@ public class AddDiscoveryActivity extends BaseActivity<ActivityAddDiscoveryBindi
|
|||||||
map.put("app", "Goods");
|
map.put("app", "Goods");
|
||||||
map.put("class", "AddGoodsInfo");
|
map.put("class", "AddGoodsInfo");
|
||||||
map.put("sign", Md5.md5("Goods" + "AddGoodsInfo" + Md5.secret));
|
map.put("sign", Md5.md5("Goods" + "AddGoodsInfo" + Md5.secret));
|
||||||
map.put("file_count", additionImageWrapper.getImageList().size() + "");
|
|
||||||
map.put("goods_detail", mDataBinding.etInfo.getText().toString().trim());
|
|
||||||
map.put("type", type + 1 + "");
|
map.put("type", type + 1 + "");
|
||||||
|
if (additionImageWrapper.getImageList().size() < 1) {
|
||||||
|
setToast("请添加图片或视频");
|
||||||
|
return;
|
||||||
|
}
|
||||||
for (int i = 0; i < additionImageWrapper.getImageList().size(); i++) {
|
for (int i = 0; i < additionImageWrapper.getImageList().size(); i++) {
|
||||||
if (additionImageWrapper.getImageList().get(i) != null) {
|
if (additionImageWrapper.getImageList().get(i) != null) {
|
||||||
map.put("pic" + i, additionImageWrapper.getImageList().get(i));
|
map.put("pic" + i, additionImageWrapper.getImageList().get(i));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
map.put("file_count", additionImageWrapper.getImageList().size() + "");
|
||||||
|
|
||||||
map.put("thumb", file);
|
String goodsDetail = mDataBinding.etInfo.getText().toString().trim();
|
||||||
|
if (TextUtils.isEmpty(goodsDetail)) {
|
||||||
|
setToast("请输入文字信息");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
map.put("goods_detail", goodsDetail);
|
||||||
if (type == 1) {
|
if (type == 1) {
|
||||||
if (goodsInfo.isEmpty()) {
|
if (goodsInfo.isEmpty()) {
|
||||||
setToast("请添加商品规格");
|
setToast("请添加商品规格");
|
||||||
@@ -274,6 +284,7 @@ public class AddDiscoveryActivity extends BaseActivity<ActivityAddDiscoveryBindi
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
map.put("thumb", file);
|
||||||
progressDialog.setMessage("提交中");
|
progressDialog.setMessage("提交中");
|
||||||
progressDialog.show();
|
progressDialog.show();
|
||||||
Map<String, RequestBody> params = retrofitHttpUpLoad.addParameter(map).bulider();
|
Map<String, RequestBody> params = retrofitHttpUpLoad.addParameter(map).bulider();
|
||||||
|
|||||||
@@ -118,7 +118,7 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
|
|||||||
public void onSelect(int position, String text) {
|
public void onSelect(int position, String text) {
|
||||||
Intent intent = new Intent(getContext(), AddDiscoveryActivity.class);
|
Intent intent = new Intent(getContext(), AddDiscoveryActivity.class);
|
||||||
intent.putExtra("type", position);
|
intent.putExtra("type", position);
|
||||||
startActivity(intent);
|
startActivityForResult(intent,14);
|
||||||
}
|
}
|
||||||
}).show();
|
}).show();
|
||||||
|
|
||||||
@@ -808,7 +808,10 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
|
|||||||
@Override
|
@Override
|
||||||
public void onActivityResult(int requestCode, int resultCode, Intent data) {
|
public void onActivityResult(int requestCode, int resultCode, Intent data) {
|
||||||
super.onActivityResult(requestCode, resultCode, data);
|
super.onActivityResult(requestCode, resultCode, data);
|
||||||
page = 1;
|
if (requestCode==14&&resultCode==200){
|
||||||
getlist(1);
|
page = 1;
|
||||||
|
getlist(1);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user