Merge branch 'ui' into qa_1.1.2

This commit is contained in:
liujing
2020-08-19 12:23:31 +08:00
2 changed files with 7 additions and 7 deletions

View File

@@ -103,7 +103,7 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
String address = data.getUploadAddress();
String time = DateTimeUtils.getTimeText(data.getUploadTimestamp(),DateTimeUtils.MM_Yue_dd_Ri_HH_mm);
String likeNum = String.valueOf(data.getLikeNum());
String notLikeNum = String.valueOf(data.getNotLikeNum());
String notLikeNum = String.valueOf(data.getNotlikeNum());
if (poitype != null) {
((shareItemViewHolder) holder).caseStyleTextView.setText(EventTypeUtils.getPoiTypeStr(poitype));

View File

@@ -92,7 +92,7 @@ public class V2XShareEventItem extends BaseData implements Serializable {
", userName='" + userName + '\'' +
", userHead='" + userHead + '\'' +
", likeNum=" + likeNum +
", notLikeNum=" + notLikeNum +
", notlikeNum=" + notlikeNum +
", uploadType=" + uploadType +
", uploadUser='" + uploadUser + '\'' +
", imgUrl=" + imgUrl +
@@ -126,7 +126,7 @@ public class V2XShareEventItem extends BaseData implements Serializable {
private String userName;
private String userHead;
private Integer likeNum;
private int notLikeNum;
private int notlikeNum;
private Integer uploadType;
private String uploadUser;
private String imgUrl;
@@ -234,12 +234,12 @@ public class V2XShareEventItem extends BaseData implements Serializable {
this.likeNum = likeNum;
}
public int getNotLikeNum() {
return notLikeNum;
public int getNotlikeNum() {
return notlikeNum;
}
public void setNotLikeNum(int notLikeNum) {
this.notLikeNum = notLikeNum;
public void setNotlikeNum(int notlikeNum) {
this.notlikeNum = notlikeNum;
}
public Integer getUploadType() {