admin/HouseProperty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

d

Browse Source
This commit is contained in:
jianbo
2021-02-19 18:27:46 +08:00
parent 7a4ef531d1
commit 0124112260
10 changed files with 449 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/sl/house_property/MainFragment.java
View File

@@ -629,7 +629,7 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
public void onClick(final View v) {
final CommentDialog commentDialog = new CommentDialog(baseActivity);
commentDialog.setShowBug(discoveryListEntity.getType() == 2);
commentDialog.setShowBug(discoveryListEntity.getType().equals("2"));
commentDialog.setPraise(discoveryListEntity.getIs_like() == 1);
final int mBottomY = getCoordinateY(homeGridAdapterItemBinding.ivComment) + homeGridAdapterItemBinding.ivComment.getHeight();
commentDialog.setOnCommentOperateListener(new CommentDialog.OnCommentOperateListener() {

3
app/src/main/java/com/sl/house_property/MyApplication.java
View File

@@ -33,6 +33,9 @@ public class MyApplication extends Application{
public static boolean mainonce;
*/
public static Context getContext() {
return context;
}
@Override
protected void attachBaseContext(Context base) {
super.attachBaseContext(base);

50
app/src/main/java/com/sl/house_property/discovery/DiscoverEntity.java Normal file
View File

@@ -0,0 +1,50 @@
package com.sl.house_property.discovery;
import java.util.ArrayList;
import java.util.List;
import entity.DiscoveryListEntity;
/**
* Time: 2021/2/19
* Author: jianbo
* Description:
*/
class DiscoverEntity {
private String avatar;
private String count;
private String fengmian;
private ArrayList<DiscoveryListEntity> info;
public List<DiscoveryListEntity> getInfo() {
return info;
}
public void setInfo(ArrayList<DiscoveryListEntity> info) {
this.info = info;
}
public String getFengmian() {
return fengmian;
}
public void setFengmian(String fengmian) {
this.fengmian = fengmian;
}
public String getCount() {
return count;
}
public void setCount(String count) {
this.count = count;
}
public String getAvatar() {
return avatar;
}
public void setAvatar(String avatar) {
this.avatar = avatar;
}
}

56
app/src/main/java/com/sl/house_property/discovery/DiscoveryFragment.java
View File

@@ -45,6 +45,7 @@ import org.json.JSONObject;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import adapter.BaseRecycleViewAdapter;
@@ -62,6 +63,7 @@ import tools.Config;
import tools.PicassoRoundTransform;
import utils.CommonUtils;
import utils.DateUtils;
import utils.GetJsonDataUtil;
import utils.KeyboardUtil;
import utils.Md5;
import utils.UtilHelpers;
@@ -371,7 +373,7 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
@Override
public void onClick(final View v) {
final CommentDialog commentDialog = new CommentDialog(baseActivity);
commentDialog.setShowBug(discoveryListEntity.getType() == 2);
commentDialog.setShowBug(discoveryListEntity.getType().equals("2"));
commentDialog.setPraise(discoveryListEntity.getIs_like() == 1);
final int mBottomY = getCoordinateY(homeGridAdapterItemBinding.ivComment) + homeGridAdapterItemBinding.ivComment.getHeight();
commentDialog.setOnCommentOperateListener(new CommentDialog.OnCommentOperateListener() {
@@ -569,39 +571,47 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
if (resultcode.status == 0) {
// intRecycleView();
Gson gs = new Gson();
LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
String s = gs.toJson(adta);
try {
JSONObject jsonObject = new JSONObject(s);
org.json.JSONArray array = jsonObject.getJSONArray("info");
Type type = new TypeToken<ArrayList<DiscoveryListEntity>>() {
}.getType();
if (page == 1) {
String fengmian = jsonObject.getString("fengmian");
String avatar = jsonObject.getString("avatar");
Picasso.with(getActivity()).load(fengmian)
.placeholder(R.mipmap.icon_default_rectangle)
.into(target);
Picasso.with(getActivity()).load(avatar)
.placeholder(R.mipmap.icon_default_rectangle)
.transform(new PicassoRoundTransform())
.into(mDataBinding.head);
LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
String s = gs.toJson(adta);
ArrayList<DiscoveryListEntity> o = new Gson().fromJson(array.toString(), type);
// String s = new GetJsonDataUtil().getJson(getActivity(), "controlStatus.json");//获取assets目录下的json文件数据
try {
DiscoverEntity discoverEntity = gs.fromJson(s, DiscoverEntity.class);
// JSONObject jsonObject = new JSONObject(s);
// org.json.JSONArray array = jsonObject.getJSONArray("info");
// Type type = new TypeToken<ArrayList<DiscoveryListEntity>>() {
// }.getType();
if (page == 1) {
String fengmian = discoverEntity.getFengmian();
String avatar = discoverEntity.getAvatar();
if (!TextUtils.isEmpty(fengmian)){
Picasso.with(getActivity()).load(fengmian)
.placeholder(R.mipmap.icon_default_rectangle)
.into(target);
}
if (!TextUtils.isEmpty(avatar)){
Picasso.with(getActivity()).load(avatar)
.placeholder(R.mipmap.icon_default_rectangle)
.transform(new PicassoRoundTransform())
.into(mDataBinding.head);
}
List<DiscoveryListEntity> info = discoverEntity.getInfo();
discoveryListEntities.clear();
discoveryListEntities.addAll(o);
discoveryListEntities.addAll(info);
BaseRecycleViewAdapter baseRecycleViewAdapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
baseRecycleViewAdapter.setData(discoveryListEntities);
page++;
} else {
ArrayList<DiscoveryListEntity> o = new Gson().fromJson(array.toString(), type);
discoveryListEntities.addAll(o);
// ArrayList<DiscoveryListEntity> o = new Gson().fromJson(array.toString(), type);
List<DiscoveryListEntity> info = discoverEntity.getInfo();
discoveryListEntities.addAll(info);
BaseRecycleViewAdapter baseRecycleViewAdapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
baseRecycleViewAdapter.setData(discoveryListEntities);
// Log.e("sizi", discoveryListEntities.size() + "");
// int count = jsonObject.getInt("count");
if (o.isEmpty()) {
if (info.isEmpty()) {
mDataBinding.dw.finishLoadMoreWithNoMoreData();
} else {

2
app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java
View File

@@ -334,7 +334,7 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
@Override
public void onClick(final View v) {
final CommentDialog commentDialog = new CommentDialog(getContext());
commentDialog.setShowBug(discoveryListEntity.getType() == 2);
commentDialog.setShowBug(discoveryListEntity.getType().equals("2"));
commentDialog.setPraise(discoveryListEntity.getIs_like() == 1);
// commentDialog.setShowBug(discoveryListEntity.getType() == 2);
commentDialog.setPraise(discoveryListEntity.getIs_like() == 1);