diff --git a/app/src/main/java/cc/niushuai/dididone/biz/BizGlobal.java b/app/src/main/java/cc/niushuai/dididone/biz/BizGlobal.java index 3527e33..0d6c080 100644 --- a/app/src/main/java/cc/niushuai/dididone/biz/BizGlobal.java +++ b/app/src/main/java/cc/niushuai/dididone/biz/BizGlobal.java @@ -113,7 +113,8 @@ public class BizGlobal { RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, 175); layoutParams.setMargins(25, 20, 25, 15); - itemLayout.setId(IntSnowflake.next_id()); + int itemLayoutViewId = IntSnowflake.next_id(); + itemLayout.setId(itemLayoutViewId); itemLayout.setLayoutParams(layoutParams); itemLayout.setPadding(15, 15, 15, 5); itemLayout.setBackgroundResource(R.drawable.bg_miui10); @@ -132,19 +133,35 @@ public class BizGlobal { itemLayout.addView(iconView); + // 打卡项名称 RelativeLayout.LayoutParams projectLayout = new RelativeLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT); projectLayout.setMargins(20, 5, 0, 0); projectLayout.addRule(RelativeLayout.RIGHT_OF, iconViewId); int projectNameViewId = IntSnowflake.next_id(); + // 打卡项名称文本view TextView projectTextView = getTextView(context, projectNameViewId, record.getName(), projectLayout, R.color._333333, 16, Gravity.CENTER_VERTICAL); itemLayout.addView(projectTextView); - RelativeLayout.LayoutParams dateLayout = new RelativeLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT); - dateLayout.setMargins(20, 25, 0, 0); - dateLayout.addRule(RelativeLayout.RIGHT_OF, iconViewId); - dateLayout.addRule(RelativeLayout.BELOW, projectNameViewId); - TextView dateTextView = getTextView(context, IntSnowflake.next_id(), DateUtil.date(record.getCreateDate()).toString(DatePattern.NORM_DATETIME_PATTERN), dateLayout, R.color._666666, 12, Gravity.TOP); - itemLayout.addView(dateTextView); + // 打卡时间 + RelativeLayout.LayoutParams checkDateLayout = new RelativeLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT); + checkDateLayout.setMargins(20, 25, 0, 0); + checkDateLayout.addRule(RelativeLayout.RIGHT_OF, iconViewId); + checkDateLayout.addRule(RelativeLayout.BELOW, projectNameViewId); + int checkDateViewId = IntSnowflake.next_id(); + // 打卡时间文本view + TextView checkDateTextView = getTextView(context, checkDateViewId, DateUtil.date(record.getCheckDate()).toString(DatePattern.NORM_DATE_PATTERN), checkDateLayout, R.color._666666, 12, Gravity.TOP); + itemLayout.addView(checkDateTextView); + + // 创建时间 + RelativeLayout.LayoutParams createDateLayout = new RelativeLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT); + createDateLayout.setMargins(20, 25, 0, 0); + createDateLayout.addRule(RelativeLayout.RIGHT_OF, checkDateViewId); + createDateLayout.addRule(RelativeLayout.BELOW, projectNameViewId); + createDateLayout.addRule(RelativeLayout.ALIGN_PARENT_RIGHT); + int createDateViewId = IntSnowflake.next_id(); + // 创建时间文本view + TextView createDateTextView = getTextView(context, createDateViewId, DateUtil.date(record.getCreateDate()).toString(DatePattern.NORM_DATETIME_PATTERN), createDateLayout, R.color._666666, 12, Gravity.RIGHT); + itemLayout.addView(createDateTextView); return itemLayout; }