This commit is contained in:
2021-02-19 18:27:46 +08:00
parent 7a4ef531d1
commit 0124112260
10 changed files with 449 additions and 31 deletions

View File

@@ -0,0 +1,57 @@
import com.google.gson.Gson;
import com.google.gson.internal.LinkedTreeMap;
import com.google.gson.reflect.TypeToken;
import com.sl.house_property.MyApplication;
import com.sl.house_property.R;
import com.squareup.picasso.Picasso;
import org.json.JSONObject;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import java.lang.reflect.Type;
import java.util.ArrayList;
import adapter.BaseRecycleViewAdapter;
import entity.DiscoveryListEntity;
import tools.PicassoRoundTransform;
import utils.GetJsonDataUtil;
/**
* Time: 2021/2/19
* Author: jianbo
* Description:
*/
public class DateUtilsTest {
@Before//注解
public void setUp() throws Exception {
System.out.println("测试开始执行的代码在这里执行,可做初始化操作");
}
@After
public void tearDown() throws Exception {
System.out.println("测试结束后的执行代码在这里执行,可做释放资源操作");
}
/**
* 单元测试 测试 DateUtils.timeStampToString这个时间戳转换成日期时间字符串的方法是否通过
*/
@Test
public void timeStampToString() {
String JsonData = new GetJsonDataUtil().getJson(MyApplication.getContext(), "controlStatus.json");//获取assets目录下的json文件数据
Type type = new TypeToken<ArrayList<DiscoveryListEntity>>() {
}.getType();
// ArrayList<DiscoveryListEntity> o = new Gson().fromJson(JsonData, type);
}
}

View File

@@ -0,0 +1,254 @@
{
"avatar": "http://wy.dou1.net//uploads/66/e8/b1/b5/96/9796d6564893702fd1e29c.png",
"count": "120",
"fengmian": "http://wy.dou1.net//uploads/53/f1/a8/37/e3/9f163304364bf2ad9dc05a.png",
"info": [
{
"avatar": "http://wy.dou1.net//uploads/3a/50/57/cf/4d/309b807d2e7402407b0ae0.png",
"ctime": "2021-02-03 09:38:03",
"dis_content": [],
"goods_detail": "12336",
"goods_id": "132",
"is_like": 0,
"like": [],
"nickname": "1222",
"pic": [
"http://wy.dou1.net//uploads/ba/5c/62/80/4b/b97a3723bbde69b9f430e4.jpeg",
"http://wy.dou1.net//uploads/36/07/9f/49/bd/7a6b190f0d8e6ac92efecd.jpeg",
"http://wy.dou1.net//uploads/3a/72/30/83/df/5bab3feeadbbb3d528f999.jpeg",
"http://wy.dou1.net//uploads/c6/0c/de/6f/8f/31a9a353c00a5405f8bcab.jpeg",
"http://wy.dou1.net//uploads/97/ad/e0/f4/6a/457a9d71259908aa83bee9.jpeg",
"http://wy.dou1.net//uploads/a2/5b/3b/e8/7b/ee114f04774d15f59a402b.jpeg",
"http://wy.dou1.net//uploads/55/7f/07/57/de/09007b95f14a1b9a0c9c61.jpeg",
"http://wy.dou1.net//uploads/f7/cc/16/2b/28/7627b8bc98f21b875887a1.jpeg",
"http://wy.dou1.net//uploads/f5/94/81/f2/1e/fff2e7a2eddcadbba4c9e1.jpeg"
],
"thumb": "http://wy.dou1.net//uploads/fb/89/b7/68/78/169deaf3f08771a10f352f.jpeg",
"type": "2",
"userid": "20"
},
{
"avatar": "http://wy.dou1.net//uploads/66/e8/b1/b5/96/9796d6564893702fd1e29c.png",
"ctime": "2021-01-29 15:15:44",
"dis_content": [],
"goods_detail": "苹果",
"goods_id": "131",
"is_like": 0,
"like": [],
"nickname": "梦",
"pic": [
"http://wy.dou1.net//uploads/ea/04/6a/43/2e/620c791247c3d776c09922.jpeg"
],
"thumb": "http://wy.dou1.net//uploads/5b/c2/78/76/07/abb0c0b9defe4725fda6c0.jpeg",
"type": "2",
"userid": "1"
},
{
"avatar": "http://wy.dou1.net//uploads/66/e8/b1/b5/96/9796d6564893702fd1e29c.png",
"ctime": "2021-01-29 15:14:41",
"dis_content": [],
"goods_detail": "车厘子",
"goods_id": "130",
"is_like": 1,
"like": [
{
"nickname": "1222",
"userid": "20"
},
{
"nickname": "梦",
"userid": "1"
}
],
"nickname": "梦",
"pic": [
"http://wy.dou1.net//uploads/d7/1c/fa/9c/0b/1f93f2837be6b969b8c481.jpeg"
],
"thumb": "http://wy.dou1.net//uploads/5b/c2/78/76/07/abb0c0b9defe4725fda6c0.jpeg",
"type": "2",
"userid": "1"
},
{
"avatar": "http://wy.dou1.net//uploads/66/e8/b1/b5/96/9796d6564893702fd1e29c.png",
"ctime": "2021-01-28 22:00:23",
"dis_content": [],
"goods_detail": "非常好的",
"goods_id": "129",
"is_like": 1,
"like": [
{
"nickname": "梦",
"userid": "1"
}
],
"nickname": "梦",
"pic": [
"http://wy.dou1.net//uploads/e8/18/9b/bf/7f/295a692e1f99f2d49ed9d6.jpeg",
"http://wy.dou1.net//uploads/b7/a8/2a/6b/eb/fad2a8fc4713700fbdd0cd.jpeg",
"http://wy.dou1.net//uploads/28/8b/2a/8b/46/8a119d324e6372504e1b24.jpeg",
"http://wy.dou1.net//uploads/65/ba/fc/1b/46/13624d18f61700ad7e25fe.jpeg",
"http://wy.dou1.net//uploads/11/f5/de/dd/96/ebc6c14ef9b12831df2101.jpeg",
"http://wy.dou1.net//uploads/f4/20/f2/f8/82/c266cb5d0249e313455f4d.jpeg",
"http://wy.dou1.net//uploads/fd/bc/bf/33/38/2a0f3a8bc9038fb0a2083e.jpeg",
"http://wy.dou1.net//uploads/26/bb/60/53/82/fba3966fa81cf0be4bb412.jpeg",
"http://wy.dou1.net//uploads/16/86/16/29/88/71a6d16aadaf9d3f39553d.jpeg"
],
"thumb": "http://wy.dou1.net//uploads/fc/b9/55/72/08/5407b676a5b33114b615a3.jpeg",
"type": "2",
"userid": "1"
},
{
"avatar": "http://wy.dou1.net//uploads/66/e8/b1/b5/96/9796d6564893702fd1e29c.png",
"ctime": "2021-01-28 15:33:52",
"dis_content": [],
"goods_detail": "新品",
"goods_id": "128",
"is_like": 0,
"like": [],
"nickname": "梦",
"pic": [
"http://wy.dou1.net//uploads/f5/c3/af/34/41/5fa0f9a5e957c8b6c649be.jpeg",
"http://wy.dou1.net//uploads/12/1c/3e/bd/ce/284f8d998d4ea73efd508f.jpeg",
"http://wy.dou1.net//uploads/72/06/a3/c0/d9/99516d6cf6e11e1906e197.jpeg"
],
"thumb": "http://wy.dou1.net//uploads/89/07/b2/45/65/baa9cb69782c5d62cca5d5.jpeg",
"type": "2",
"userid": "1"
},
{
"avatar": "http://wy.dou1.net//uploads/3a/50/57/cf/4d/309b807d2e7402407b0ae0.png",
"ctime": "2021-01-28 15:20:33",
"dis_content": [
{
"contents": "啊啊啊",
"dis_id": "51",
"from_id": "1",
"nickname": "梦",
"reply": "",
"to_id": 0
},
{
"contents": "柯基",
"dis_id": "52",
"from_id": "1",
"nickname": "梦",
"reply": "",
"to_id": 0
},
{
"contents": "啊啊啊啊吧啊",
"dis_id": "54",
"from_id": "20",
"nickname": "1222",
"reply": "",
"to_id": 0
}
],
"goods_detail": "看你",
"goods_id": "127",
"is_like": 0,
"like": [],
"nickname": "1222",
"pic": "",
"thumb": "",
"type": "1",
"userid": "20"
},
{
"avatar": "http://wy.dou1.net//uploads/66/e8/b1/b5/96/9796d6564893702fd1e29c.png",
"ctime": "2021-01-28 15:04:00",
"dis_content": [
{
"contents": "ghj",
"dis_id": "50",
"from_id": "1",
"nickname": "梦",
"reply": "",
"to_id": 0
},
{
"contents": "柯基",
"dis_id": "52",
"from_id": "1",
"nickname": "梦",
"reply": "",
"to_id": 0
},
{
"contents": "啊啊啊啊吧啊",
"dis_id": "54",
"from_id": "20",
"nickname": "1222",
"reply": "",
"to_id": 0
}
],
"goods_detail": "123",
"goods_id": "126",
"is_like": 0,
"like": [],
"nickname": "梦",
"pic": [
"http://wy.dou1.net//uploads/2f/ae/a9/f3/be/0b091ffb0113d733c3ba44.jpeg",
"http://wy.dou1.net//uploads/8f/22/ab/d6/9d/da760f2f347dd988a8094c.jpeg"
],
"thumb": "",
"type": "1",
"userid": "1"
},
{
"avatar": "http://wy.dou1.net//uploads/66/e8/b1/b5/96/9796d6564893702fd1e29c.png",
"ctime": "2021-01-28 14:58:54",
"dis_content": [],
"goods_detail": "1",
"goods_id": "125",
"is_like": 0,
"like": [],
"nickname": "梦",
"pic": [
"http://wy.dou1.net//uploads/03/bf/0c/8a/7f/a2bcd35da74cc29306ab70.jpeg",
"http://wy.dou1.net//uploads/82/47/22/fc/70/384fab8c47bcef17436a4c.jpeg",
"http://wy.dou1.net//uploads/2f/ae/a9/f3/be/0b091ffb0113d733c3ba44.jpeg"
],
"thumb": "http://wy.dou1.net//uploads/8f/22/ab/d6/9d/da760f2f347dd988a8094c.jpeg",
"type": "2",
"userid": "1"
},
{
"avatar": "http://wy.dou1.net//uploads/66/e8/b1/b5/96/9796d6564893702fd1e29c.png",
"ctime": "2021-01-28 14:44:17",
"dis_content": [],
"goods_detail": "12345",
"goods_id": "124",
"is_like": 0,
"like": [],
"nickname": "梦",
"pic": [
"http://wy.dou1.net//uploads/ef/e4/06/a8/3b/22eb995bb08f309dbecf1a.png",
"http://wy.dou1.net//uploads/ef/e4/06/a8/3b/22eb995bb08f309dbecf1a.png"
],
"thumb": "http://wy.dou1.net//uploads/ef/e4/06/a8/3b/22eb995bb08f309dbecf1a.png",
"type": "2",
"userid": "1"
},
{
"avatar": "http://wy.dou1.net//uploads/66/e8/b1/b5/96/9796d6564893702fd1e29c.png",
"ctime": "2021-01-28 14:43:18",
"dis_content": [],
"goods_detail": "12345",
"goods_id": "123",
"is_like": 0,
"like": [],
"nickname": "梦",
"pic": [
"http://wy.dou1.net//uploads/ef/e4/06/a8/3b/22eb995bb08f309dbecf1a.png",
"http://wy.dou1.net//uploads/ef/e4/06/a8/3b/22eb995bb08f309dbecf1a.png"
],
"thumb": "http://wy.dou1.net//uploads/ef/e4/06/a8/3b/22eb995bb08f309dbecf1a.png",
"type": "2",
"userid": "1"
}
],
"page": "1",
"userid": "1"
}

View File

@@ -40,8 +40,13 @@ public class BaseRecycleViewAdapter<T1, T2 extends ViewDataBinding> extends Recy
}
public void setData(ArrayList<T1> list) {
this.list.clear();
this.list.addAll(list);
if (list==null){
this.list.clear();
}else {
this.list.clear();
this.list.addAll(list);
}
notifyDataSetChanged();
}

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() {

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);

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;
}
}

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 {

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);

View File

@@ -1,6 +1,7 @@
package entity;
import android.databinding.BaseObservable;
import android.support.annotation.Keep;
import java.io.Serializable;
import java.util.ArrayList;
@@ -11,7 +12,7 @@ public class DiscoveryListEntity extends BaseObservable implements Serializable
private String goods_detail;
private ArrayList<String> pic;
private String thumb;
private int type;
private String type;
private String ctime;
private String avatar;
private String nickname;
@@ -59,11 +60,11 @@ public class DiscoveryListEntity extends BaseObservable implements Serializable
this.thumb = thumb;
}
public int getType() {
public String getType() {
return type;
}
public void setType(int type) {
public void setType(String type) {
this.type = type;
}
@@ -114,7 +115,7 @@ public class DiscoveryListEntity extends BaseObservable implements Serializable
public void setLike(ArrayList<Like> like) {
this.like = like;
}
@Keep
public static class Dis_content extends BaseObservable implements Serializable {
private String nickname;

View File

@@ -0,0 +1,38 @@
package utils;
import android.content.Context;
import android.content.res.AssetManager;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
/**
* <读取Json文件的工具类>
*
* @author: 小嵩
* @date: 2017/3/16 16:22
*/
public class GetJsonDataUtil {
public String getJson(Context context,String fileName) {
StringBuilder stringBuilder = new StringBuilder();
try {
AssetManager assetManager = context.getAssets();
BufferedReader bf = new BufferedReader(new InputStreamReader(
assetManager.open(fileName)));
String line;
while ((line = bf.readLine()) != null) {
stringBuilder.append(line);
}
} catch (IOException e) {
e.printStackTrace();
}
return stringBuilder.toString();
}
}