This commit is contained in:
jinyuer
2021-03-24 16:51:01 +08:00
parent 098faaf3ac
commit 45f7fcaccf
2 changed files with 50 additions and 17 deletions

View File

@@ -89,7 +89,7 @@ public class HistoryRecordActivitytwo extends BaseActivity<LayoutHistoryRecordtw
finish();
}
});
strings = new String[2];
strings = new String[1];
strings[0] = "说说";
// strings[1] = "商品";
fragments = new ArrayList<>();
@@ -99,6 +99,7 @@ public class HistoryRecordActivitytwo extends BaseActivity<LayoutHistoryRecordtw
MyViewPagerAdapter myViewPagerAdapter = new MyViewPagerAdapter(getSupportFragmentManager());
mDataBinding.fl.setAdapter(myViewPagerAdapter);
mDataBinding.tb.setupWithViewPager(mDataBinding.fl);
mDataBinding.fl.setCurrentItem(0);
// mDataBinding.tv1.setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View v) {

View File

@@ -111,6 +111,8 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
((HistoryRecordActivity) getActivity()).registerMyOnTouchListener(this);
}else if (getActivity() instanceof LikeActivity){
((LikeActivity) getActivity()).registerMyOnTouchListener(this);
}else if (getActivity() instanceof HistoryRecordActivitytwo){
((HistoryRecordActivitytwo) getActivity()).registerMyOnTouchListener(this);
}
}
@@ -418,6 +420,11 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
mDataBinding.llComment.setVisibility(View.GONE);
comment(discoveryListEntities.get(commentPosition).getGoods_id(), commentPosition, "", mDataBinding.etComment.getText().toString());
}else if (getActivity() instanceof HistoryRecordActivitytwo){
CommonUtils.hideSoftInput(getContext(), mDataBinding.etComment);
mDataBinding.llComment.setVisibility(View.GONE);
comment(discoveryListEntities.get(commentPosition).getGoods_id(), commentPosition, "", mDataBinding.etComment.getText().toString());
}
}
@@ -725,26 +732,50 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
Gson gs = new Gson();
LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
String s = gs.toJson(adta);
JSONObject jsonObject = null;
try {
JSONObject jsonObject = new JSONObject(s);
org.json.JSONArray array = jsonObject.getJSONArray("info");
Type type = new TypeToken<ArrayList<DiscoveryListEntity>>() {
jsonObject = new JSONObject(s);
} catch (JSONException e) {
e.printStackTrace();
}
org.json.JSONArray array = null;
try {
array = jsonObject.getJSONArray("info");
} catch (JSONException e) {
e.printStackTrace();
}
Type type = new TypeToken<ArrayList<DiscoveryListEntity>>() {
}.getType();
if (page == 1) {
if (num == 1) {
mDataBinding.rl1.setVisibility(View.GONE);
} else {
mDataBinding.rl1.setVisibility(View.VISIBLE);
String fengmian = jsonObject.getString("fengmian");
String avatar = jsonObject.getString("avatar");
String fengmian = null;
try {
fengmian = jsonObject.getString("fengmian");
} catch (JSONException e) {
e.printStackTrace();
}
String avatar = null;
try {
avatar = jsonObject.getString("avatar");
} catch (JSONException e) {
e.printStackTrace();
}
if (!TextUtils.isEmpty(fengmian)){
Picasso.with(context).load(fengmian)
.placeholder(R.mipmap.icon_default_rectangle)
.into(target);
}
if (!TextUtils.isEmpty(avatar)){
Picasso.with(context).load(avatar)
.placeholder(R.mipmap.icon_default_rectangle)
.transform(new PicassoRoundTransform())
.into(mDataBinding.head);
}
Picasso.with(context).load(fengmian)
.placeholder(R.mipmap.icon_default_rectangle)
.into(target);
Picasso.with(context).load(avatar)
.placeholder(R.mipmap.icon_default_rectangle)
.transform(new PicassoRoundTransform())
.into(mDataBinding.head);
}
ArrayList<DiscoveryListEntity> o = new Gson().fromJson(array.toString(), type);
@@ -771,19 +802,20 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
}
} catch (Exception e) {
e.fillInStackTrace();
}
}else {
Log.e("xxxxx","fffff");
}
}
}, new Action1<Throwable>() {
@Override
public void call(Throwable throwable) {
throwable.printStackTrace();
progressDialog.dismiss();
mDataBinding.dw.finishRefresh();
mDataBinding.dw.finishLoadMore();
Toast.makeText(context, getString(R.string.getdatafailure), Toast.LENGTH_SHORT).show();
throwable.printStackTrace();
}
});