报名页面性别，出生日期选择控件修改

韩亚云
1 parent 18c99e74
Showing 8 changed files with 859 additions and 3 deletions
build.gradle
moudle_pedometer/build.gradle
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RegistrationInfoView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RegistrationInfoFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/DateTimeUtil.java
moudle_pedometer/src/main/res/layout/fragment_registration_info.xml
moudle_pedometer/src/main/res/layout/wheel_view.xml
@@ -94,5 +94,6 @@ ext {
     cnlive_baiduMap="0.0.3"
     eventBus = "3.1.1"
     easypermissions = '1.0.0'
+    TimePickerDialog = '1.0.1'
 }
@@ -104,6 +104,7 @@ dependencies {
     implementation "org.greenrobot:eventbus:$rootProject.eventBus"
     //EasyPermission
     implementation "pub.devrel:easypermissions:$rootProject.easypermissions"
+    implementation "com.jzxiang.pickerview:TimePickerDialog:$rootProject.TimePickerDialog"
     implementation 'com.sothree.slidinguppanel:library:3.4.0'
@@ -5,15 +5,28 @@ import android.view.View;
 import com.cnlive.moudle.pedometer.ui.activity.RunRaceDetailActivity;
 import com.cnlive.moudle.pedometer.ui.fragment.RegistrationInfoFragment;
+import com.cnlive.moudle.pedometer.utils.DateTimeUtil;
+import com.cnlive.strike.ui.widget.BottomMenuDialog;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
+import com.jzxiang.pickerview.TimePickerDialog;
+import com.jzxiang.pickerview.data.Type;
+import com.jzxiang.pickerview.listener.OnDateSetListener;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+import static com.baidu.mapapi.BMapManager.getContext;
 /**
  * Created by hanyayun 019/05/29.
  */
-public class RegistrationInfoView implements MvpView {
+public class RegistrationInfoView implements MvpView, OnDateSetListener {
     RegistrationInfoFragment fragment;
+    private BottomMenuDialog sex;
     public RegistrationInfoView(RegistrationInfoFragment fragment) {
         this.fragment = fragment;
@@ -26,15 +39,57 @@ public class RegistrationInfoView implements MvpView {
         fragment.binding.topbar.setTitle("填写报名信息");
         fragment.binding.commitInfo.setOnClickListener(v -> fragment.commitInfo());
         fragment.binding.toLineDetail.setOnClickListener(v ->goLineDetail());
+        sex = new BottomMenuDialog.Builder(fragment.getActivity())
+                .addMenu("男", new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        sex.dismiss();
+                        fragment.binding.sexText.setText("性别（非必填） 男");
+                    }
+                }).addMenu("女", new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        sex.dismiss();
+                        fragment.binding.sexText.setText("性别（非必填） 女");
+                    }
+                }).create(fragment.getActivity());
         fragment.binding.chooseSex.setOnClickListener(v -> {
-
+            sex.show();
         });
         fragment.binding.chooseBirthday.setOnClickListener(v -> {
-
+            fragment.pickerDialog = new TimePickerDialog.Builder()
+                    .setCallBack(this)
+                    .setCancelStringId("取消")
+                    .setSureStringId("确定")
+                    .setTitleStringId("")
+                    .setCyclic(false)
+                    .setCurrentMillseconds(System.currentTimeMillis())
+                    .setMinMillseconds(getStringToDate())
+                    .setThemeColor(getContext().getResources().getColor(R.color.green))
+                    .setType(Type.YEAR_MONTH_DAY)
+                    .setWheelItemTextSize(12)
+                    .build();
+            fragment.pickerDialog.show(fragment.getFragmentManager(), "all");
         });
     }
+
+    private long getStringToDate() {
+//        DateTimeUtil.currentDateParserLong()
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.YEAR, -50);
+
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        Date date = new Date();
+        try {
+            date = dateFormat.parse(calendar.get(Calendar.YEAR) + "-1-1");
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return date.getTime();
+    }
+
     public void toResult(){
         fragment.binding.registerLy.setVisibility(View.GONE);
         fragment.binding.resultLy.setVisibility(View.VISIBLE);
@@ -46,4 +101,10 @@ public class RegistrationInfoView implements MvpView {
         fragment.getActivity().setResult(1002, intent);
         fragment.getActivity().finish();
     }
+
+    @Override
+    public void onDateSet(TimePickerDialog timePickerView, long millseconds) {
+//        生日（非必填） 未选择
+        fragment.binding.birthday.setText("生日（非必填） 未选择:"+DateTimeUtil.formatDateTime(millseconds, "yyyy年MM月dd日"));
+    }
 }
@@ -45,6 +45,7 @@ import com.cnlive.moudle.pedometer.ui.activity.PedometerMainActivity;
 import com.cnlive.moudle.pedometer.ui.activity.RaceRecordActivity;
 import com.cnlive.moudle.pedometer.ui.activity.RegistrationInfoActivity;
 import com.cnlive.moudle.pedometer.ui.activity.RunningMapActivity;
+import com.cnlive.moudle.pedometer.ui.activity.TakePartActivity;
 import com.cnlive.moudle.pedometer.ui.fragment.RunMainFragment;
 import com.cnlive.moudle.pedometer.ui.fragment.RunRaceDetailFragment;
 import com.cnlive.moudle.pedometer.utils.BitmapUtil;
@@ -224,6 +225,10 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         fragment.binding.includePersonScore.findViewById(R.id.check_all_cord).setOnClickListener(v -> {
             RaceRecordActivity.newInstance(fragment.getActivity());
         });
+
+        fragment.binding.includeStreet.fiveJoinPerson.setOnClickListener(v ->{
+            TakePartActivity.newInstance(fragment.getActivity());
+        });
     }
     private void initMap() {
@@ -14,6 +14,7 @@ import com.cnlive.moudle.pedometer.frame.presenter.RegistrationInfoPresenter;
 import com.cnlive.moudle.pedometer.frame.view.RegistrationInfoView;
 import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentRegistrationInfoBinding;
+import com.jzxiang.pickerview.TimePickerDialog;
 /**
  * Created by hanyayun 019/05/29.
@@ -21,6 +22,7 @@ import com.example.moudle_pedometer.databinding.FragmentRegistrationInfoBinding;
 public class RegistrationInfoFragment extends MvpBindingFragment<RegistrationInfoView, RegistrationInfoPresenter,Object, FragmentRegistrationInfoBinding> {
+    public TimePickerDialog pickerDialog;
     public static RegistrationInfoFragment newInstance() {
         RegistrationInfoFragment fragment = new RegistrationInfoFragment();
         return fragment;
+package com.cnlive.moudle.pedometer.utils;
+
+import android.annotation.SuppressLint;
+import android.util.Log;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.ParsePosition;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * 时间、日期工具类
+ * Created by fanji on 2017/7/19.
+ */
+
+public class DateTimeUtil {
+
+    static SimpleDateFormat format;
+
+    /**
+     * 日期格式：yyyy-MM-dd HH:mm:ss
+     **/
+    public static final String DF_YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
+
+    /**
+     * 日期格式：yyyy-MM-dd HH:mm
+     **/
+    public static final String DF_YYYY_MM_DD_HH_MM = "yyyy-MM-dd HH:mm";
+    //  yyyy-MM-dd-HH-mm
+
+    /**
+     * 日期格式：yyyy-MM-dd
+     **/
+    public static final String DF_YYYY_MM_DD = "yyyy-MM-dd";
+
+    /**
+     * 日期格式：HH:mm:ss
+     **/
+    public static final String DF_HH_MM_SS = "HH:mm:ss";
+
+    /**
+     * 日期格式：HH:mm
+     **/
+    public static final String DF_HH_MM = "HH:mm";
+
+    private final static long minute = 60 * 1000;// 1分钟
+    private final static long hour = 60 * minute;// 1小时
+    private final static long day = 24 * hour;// 1天
+    private final static long month = 31 * day;// 月
+    private final static long year = 12 * month;// 年
+
+
+    public DateTimeUtil() {
+
+    }
+
+    /**
+     * 将日期格式化成友好的字符串：几分钟前、几小时前、几天前、几月前、几年前、刚刚
+     *
+     * @param date
+     * @return
+     */
+    public static String formatFriendly(Date date) {
+        if (date == null) {
+            return null;
+        }
+        long diff = new Date().getTime() - date.getTime();
+        long r = 0;
+        if (diff > year) {
+            r = (diff / year);
+            return r + "年前";
+        }
+        if (diff > month) {
+            r = (diff / month);
+            return r + "个月前";
+        }
+        if (diff > day) {
+            r = (diff / day);
+            return r + "天前";
+        }
+        if (diff > hour) {
+            r = (diff / hour);
+            return r + "个小时前";
+        }
+        if (diff > minute) {
+            r = (diff / minute);
+            return r + "分钟前";
+        }
+        return "刚刚";
+    }
+
+    /**
+     * 生活圈模仿微信时间展示样式
+     *
+     * @param date
+     * @return
+     */
+    public static String formatNewFriendly(Date date) {
+        if (date == null) {
+            return null;
+        }
+        long diff = new Date().getTime() - date.getTime();
+        long r = 0;
+        if (diff > day) {
+            r = (diff / day);
+            if (r==1){
+                return"昨天";
+            }else {
+                return r + "天前";
+            }
+        }
+        if (diff > hour) {
+            r = (diff / hour);
+            return r + "小时前";
+        }
+        if (diff > minute) {
+            r = (diff / minute);
+            return r + "分钟前";
+        }
+        return "1分钟前";
+    }
+
+    /**
+     * 将日期以yyyy-MM-dd HH:mm:ss格式化
+     *
+     * @param dateL 日期
+     * @return
+     */
+    @SuppressLint("SimpleDateFormat")
+    public static String formatDateTime(long dateL) {
+        SimpleDateFormat sdf = new SimpleDateFormat(DF_YYYY_MM_DD_HH_MM_SS);
+        Date date = new Date(dateL);
+        return sdf.format(date);
+    }
+
+    /**
+     * 将日期以yyyy-MM-dd HH:mm:ss格式化
+     *
+     * @param dateL 日期
+     * @return
+     */
+    @SuppressLint("SimpleDateFormat")
+    public static String formatDateTime(long dateL, String pattern) {
+        SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+        Date date = new Date(dateL);
+        return sdf.format(date);
+    }
+
+
+    /**
+     * 将日期以yyyy-MM-dd HH:mm:ss格式化
+     *
+     * @param date     日期
+     * @param formater
+     * @return
+     */
+    @SuppressLint("SimpleDateFormat")
+    public static String formatDateTime(Date date, String formater) {
+        SimpleDateFormat sdf = new SimpleDateFormat(formater);
+        return sdf.format(date);
+    }
+
+    /**
+     * 将日期字符串转成日期
+     *
+     * @param strDate 字符串日期
+     * @return java.util.date日期类型
+     */
+    @SuppressLint("SimpleDateFormat")
+    public static Date parseDate(String strDate) {
+        DateFormat dateFormat = new SimpleDateFormat(DF_YYYY_MM_DD_HH_MM_SS);
+        Date returnDate = null;
+        try {
+            returnDate = dateFormat.parse(strDate);
+        } catch (ParseException e) {
+
+        }
+        return returnDate;
+
+    }
+
+    /**
+     * 获取系统当前日期
+     *
+     * @return
+     */
+    public static Date gainCurrentDate() {
+        return new Date();
+    }
+
+    /**
+     * 验证日期是否比当前日期早
+     *
+     * @param target1 比较时间1
+     * @param target2 比较时间2
+     * @return true 则代表target1比target2晚或等于target2，否则比target2早
+     */
+    public static boolean compareDate(Date target1, Date target2) {
+        boolean flag = false;
+        try {
+            String target1DateTime = formatDateTime(target1, DF_YYYY_MM_DD_HH_MM_SS);
+            String target2DateTime = formatDateTime(target2, DF_YYYY_MM_DD_HH_MM_SS);
+            if (target1DateTime.compareTo(target2DateTime) <= 0) {
+                flag = true;
+            }
+        } catch (Exception e) {
+            System.out.println("比较失败，原因：" + e.getMessage());
+        }
+        return flag;
+    }
+
+    /**
+     * 对日期进行增加操作
+     *
+     * @param target 需要进行运算的日期
+     * @param hour   小时
+     * @return
+     */
+    public static Date addDateTime(Date target, double hour) {
+        if (null == target || hour < 0) {
+            return target;
+        }
+
+        return new Date(target.getTime() + (long) (hour * 60 * 60 * 1000));
+    }
+
+    /**
+     * 对日期进行相减操作
+     *
+     * @param target 需要进行运算的日期
+     * @param hour   小时
+     * @return
+     */
+    public static Date subDateTime(Date target, double hour) {
+        if (null == target || hour < 0) {
+            return target;
+        }
+
+        return new Date(target.getTime() - (long) (hour * 60 * 60 * 1000));
+    }
+
+    /**
+     * 获取系统时间的方法:月/日 时:分:秒
+     */
+    public static String getFormateDate() {
+        Calendar calendar = Calendar.getInstance();
+        int month = (calendar.get(Calendar.MONTH) + 1);
+        int day = calendar.get(Calendar.DAY_OF_MONTH);
+        int hour = calendar.get(Calendar.HOUR_OF_DAY);
+        int minute = calendar.get(Calendar.MINUTE);
+        int second = calendar.get(Calendar.SECOND);
+
+        String systemTime = (month < 10 ? "0" + month : month) + "/" + (day < 10 ? "0" + day : day) + "  " + (hour < 10 ? "0" + hour : hour) + ":" + (minute < 10 ? "0" + minute : minute) + ":" + (second < 10 ? "0" + second : second);
+        return systemTime;
+    }
+
+    /**
+     * 获取系统时间的方法:时:分:秒
+     */
+    public static String getHourAndMinute() {
+        Calendar calendar = Calendar.getInstance();
+        int hour = calendar.get(Calendar.HOUR_OF_DAY);
+        int minute = calendar.get(Calendar.MINUTE);
+        return (hour < 10 ? "0" + hour : hour) + ":" + (minute < 10 ? "0" + minute : minute);
+    }
+
+    /**
+     * 获取分钟
+     */
+    public static int getMinute() {
+        Calendar calendar = Calendar.getInstance();
+        int hour = calendar.get(Calendar.HOUR_OF_DAY);
+        int minute = calendar.get(Calendar.MINUTE);
+        return minute;
+    }
+
+    /**
+     * 获取系统时间的方法:时
+     */
+    public static String getHour() {
+        Calendar calendar = Calendar.getInstance();
+        int hour = calendar.get(Calendar.HOUR_OF_DAY);
+        return ((hour < 10 ? "0" + hour : hour) + "");
+    }
+
+    /**
+     * 将2017-07-10 00:00:00 换2017-07-10
+     *
+     * @param strDate
+     * @return
+     */
+    public static String strFormatStr(String strDate) {
+        if (strDate.equals("")) {
+            return "";
+        }
+        return dateToStr(strToDate(strDate));
+    }
+
+    /**
+     * 2015-01-07 15:05:34
+     *
+     * @param strDate
+     * @return
+     */
+    @SuppressLint("SimpleDateFormat")
+    public static Date strToDateHHMMSS(String strDate) {
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        ParsePosition pos = new ParsePosition(0);
+        Date strtodate = formatter.parse(strDate, pos);
+        return strtodate;
+    }
+
+    /**
+     * 2015-01-07 15:05
+     *
+     * @param strDate
+     * @return
+     */
+    @SuppressLint("SimpleDateFormat")
+    public static Date strToDateHHMM(String strDate) {
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        ParsePosition pos = new ParsePosition(0);
+        Date strtodate = formatter.parse(strDate, pos);
+        return strtodate;
+    }
+
+    /**
+     * 2015-01-07
+     *
+     * @param strDate
+     * @return
+     */
+    @SuppressLint("SimpleDateFormat")
+    public static Date strToDate(String strDate) {
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+        ParsePosition pos = new ParsePosition(0);
+        Date strtodate = formatter.parse(strDate, pos);
+        return strtodate;
+    }
+
+    /**
+     * 2015.01.07
+     *
+     * @param strDate
+     * @return
+     */
+    @SuppressLint("SimpleDateFormat")
+    public static Date strToDateDorp(String strDate) {
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy.MM.dd");
+        ParsePosition pos = new ParsePosition(0);
+        Date strtodate = formatter.parse(strDate, pos);
+        return strtodate;
+    }
+
+    @SuppressLint("SimpleDateFormat")
+    public static String dateToStr(Date dateDate) {
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+        String dateString = formatter.format(dateDate);
+        return dateString;
+    }
+
+    /**
+     * 传入一个String转化为long
+     */
+    @SuppressLint("SimpleDateFormat")
+    public static Long stringParserLong(String param) throws ParseException {
+        format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return format.parse(param).getTime();
+    }
+
+    /**
+     * 传入一个String转化为long
+     */
+    @SuppressLint("SimpleDateFormat")
+    public static Long stringParserLong1(String param) throws ParseException {
+        format = new SimpleDateFormat("yyyyMMddHHmmss");
+        return format.parse(param).getTime();
+    }
+
+    /**
+     * 当前时间转换为long
+     */
+    @SuppressLint("SimpleDateFormat")
+    public static Long currentDateParserLong() throws ParseException {
+        format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return format.parse(format.format(Calendar.getInstance().getTime())).getTime();
+    }
+
+    /**
+     * 当前时间 如: 2013-04-22 10:37:00
+     */
+    @SuppressLint("SimpleDateFormat")
+    public static String getCurrentDate() {
+        format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        return format.format(Calendar.getInstance().getTime());
+    }
+
+    /**
+     * 当前时间 如: 10:37
+     */
+    @SuppressLint("SimpleDateFormat")
+    public static String getCurrentDateHHMM() {
+        format = new SimpleDateFormat("HH:mm");
+        return format.format(Calendar.getInstance().getTime());
+    }
+
+    /**
+     * 当前时间 如: 10:37
+     *
+     * @throws ParseException
+     */
+    @SuppressLint("SimpleDateFormat")
+    public static String getCurrentDateHHMMSS() {
+        format = new SimpleDateFormat("HH:mm:ss");
+        return format.format(Calendar.getInstance().getTime());
+    }
+
+    /**
+     * 当前时间 如: 20130422
+     */
+    @SuppressLint("SimpleDateFormat")
+    public static String getCurrentDateString() {
+        format = new SimpleDateFormat("yyyyMMddHHmm");
+        return format.format(Calendar.getInstance().getTime());
+    }
+
+    /**
+     * 当前时间 如: 2013-04-22
+     */
+    @SuppressLint("SimpleDateFormat")
+    public static String getCurrentTime() {
+        format = new SimpleDateFormat("yyyy-MM-dd");
+        return format.format(Calendar.getInstance().getTime());
+    }
+
+    @SuppressLint("SimpleDateFormat")
+    public static String getSWAHDate() {
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return format.format(Calendar.getInstance().getTime());
+    }
+
+    @SuppressLint("SimpleDateFormat")
+    public static Long stringToLongD(String param) throws ParseException {
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        return format.parse(param.substring(0, param.length() - 4)).getTime();
+    }
+
+    @SuppressLint("SimpleDateFormat")
+    public static Long stringToLong(String param) throws ParseException {
+        SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmm");
+        return format.parse(param).getTime();
+    }
+
+    /**
+     * 获取两个日期之间的间隔天数
+     *
+     * @return
+     */
+    @SuppressLint("SimpleDateFormat")
+    public static int getGapCount(Date startDate, Date endDate) {
+        Calendar fromCalendar = Calendar.getInstance();
+        fromCalendar.setTime(startDate);
+        fromCalendar.set(Calendar.HOUR_OF_DAY, 0);
+        fromCalendar.set(Calendar.MINUTE, 0);
+        fromCalendar.set(Calendar.SECOND, 0);
+        fromCalendar.set(Calendar.MILLISECOND, 0);
+
+        Calendar toCalendar = Calendar.getInstance();
+        toCalendar.setTime(endDate);
+        toCalendar.set(Calendar.HOUR_OF_DAY, 0);
+        toCalendar.set(Calendar.MINUTE, 0);
+        toCalendar.set(Calendar.SECOND, 0);
+        toCalendar.set(Calendar.MILLISECOND, 0);
+
+        return (int) ((toCalendar.getTime().getTime() - fromCalendar.getTime().getTime()) / (1000 * 60 * 60 * 24));
+    }
+
+    /**
+     * 日期转换成Java字符串
+     *
+     * @param date
+     * @return str
+     */
+    @SuppressLint("SimpleDateFormat")
+    public static String DateToStr(Date date) {
+
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String str = format.format(date);
+        return str;
+    }
+
+    /**
+     * 字符串转换成日期
+     *
+     * @param str
+     * @return date
+     */
+    @SuppressLint("SimpleDateFormat")
+    public static Date StrToDate(String str) {
+
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        Date date = null;
+        try {
+            date = format.parse(str);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return date;
+    }
+
+    /**
+     * 字符串转换成日期
+     *
+     * @param str
+     * @return date
+     */
+    @SuppressLint("SimpleDateFormat")
+    public static Date StrToDateDrop(String str) {
+
+        SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd");
+        Date date = null;
+        try {
+            date = format.parse(str);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return date;
+    }
+
+    /**
+     * @param time
+     * @return
+     */
+    @SuppressLint("SimpleDateFormat")
+    public static long getLongTime(String time) {
+        long ct = 0;
+        try {
+            format = new SimpleDateFormat("HH:mm:ss");
+            ct = format.parse(time).getTime();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return ct;
+    }
+
+    /**
+     * 判断两日期是否同一天
+     *
+     * @param str1
+     * @param str2
+     * @return
+     */
+    @SuppressLint("SimpleDateFormat")
+    public static boolean isSameDay(String str1, String str2) {
+
+        Date day1 = null, day2 = null;
+        day1 = DateTimeUtil.strToDate(str1);
+        day2 = DateTimeUtil.strToDate(str2);
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
+        String ds1 = sdf.format(day1);
+
+        String ds2 = sdf.format(day2);
+
+        if (ds1.equals(ds2)) {
+            return true;
+        } else {
+            return false;
+        }
+
+    }
+
+    /**
+     * 获取两个日期的时间差
+     */
+    @SuppressLint("SimpleDateFormat")
+    public static int getTimeInterval(String date) {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        int interval = 0;
+        try {
+            Date currentTime = new Date();// 获取现在的时间
+            Date beginTime = dateFormat.parse(date);
+            interval = (int) ((beginTime.getTime() - currentTime.getTime()) / (1000));// 时间差
+            // 单位秒
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return interval;
+    }
+
+    /**
+     * 获取两个日期的时间差 yyyy.MM.dd HH.mm.ss
+     */
+    @SuppressLint("SimpleDateFormat")
+    public static int getInterval(String bDate, String eDate) {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy.MM.dd");
+        int interval = 0;
+        try {
+            Date currentTime = dateFormat.parse(eDate);// 获取现在的时间
+            Date beginTime = dateFormat.parse(bDate);
+            interval = (int) ((beginTime.getTime() - currentTime.getTime()));// 时间差
+            // 单位秒
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return interval;
+    }
+
+    /**
+     * 两个时间之差 求出一个long Time
+     *
+     * @param date
+     * @return
+     */
+    @SuppressLint("SimpleDateFormat")
+    public static long getTime(String date) {
+
+        DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        long diff = 0;
+        try {
+            Date currentTime = new Date();// 获取现在的时间
+            Date getdate = df.parse(date);
+            diff = getdate.getTime() - currentTime.getTime();
+
+        } catch (Exception e) {
+        }
+        return diff;
+    }
+
+
+    /**
+     * 日期转换成Java字符串
+     *
+     * @param DATE1
+     * @param DATE2
+     * @return
+     */
+    @SuppressLint("SimpleDateFormat")
+    public static int compare_date(String DATE1, String DATE2) {
+        DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+        try {
+            Date dt1 = df.parse(DATE1);
+            Date dt2 = df.parse(DATE2);
+            if (dt1.getTime() >= dt2.getTime()) {
+                return 1;
+            } else if (dt1.getTime() < dt2.getTime()) {
+                return -1;
+            } else {
+                return 0;
+            }
+        } catch (Exception exception) {
+            exception.printStackTrace();
+        }
+        return 0;
+    }
+
+    /**
+     * 传入时间 算出星期几
+     *
+     * @param str  2014年1月3日
+     * @param days 1:2014年1月4日 类推
+     * @return
+     */
+    @SuppressLint("SimpleDateFormat")
+    public static String formatDate(String str, int days) {
+
+        String dateStr = "";
+        try {
+            DateFormat df = DateFormat.getDateInstance(DateFormat.LONG);
+            Date date = df.parse(str);
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            Calendar c = Calendar.getInstance();
+            Date d = dateFormat.parse(dateFormat.format(date));
+            c.setTime(d);
+            c.add(Calendar.DAY_OF_MONTH, days);
+            switch (c.get(Calendar.DAY_OF_WEEK) - 1) {
+                case 0:
+                    dateStr = "周日";
+                    break;
+                case 1:
+                    dateStr = "周一";
+                    break;
+                case 2:
+                    dateStr = "周二";
+                    break;
+                case 3:
+                    dateStr = "周三";
+                    break;
+                case 4:
+                    dateStr = "周四";
+                    break;
+                case 5:
+                    dateStr = "周五";
+                    break;
+                case 6:
+                    dateStr = "周六";
+                    break;
+                default:
+                    break;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return dateStr;
+    }
+
+    /**
+     * 根据提供的年月日获取该月份的第一天
+     */
+    public static String getSupportBeginDayofMonth(int year, int monthOfYear) {
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.YEAR, year);
+        cal.set(Calendar.MONTH, monthOfYear - 1);
+        cal.set(Calendar.DAY_OF_MONTH, 1);
+        cal.set(Calendar.HOUR_OF_DAY, 0);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.SECOND, 0);
+
+        cal.set(Calendar.DAY_OF_MONTH, 1);
+        return cal.getTimeInMillis() + "";
+    }
+
+    /**
+     * 根据提供的年月获取该月份的最后一天
+     *
+     * @return
+     */
+    public static String getSupportEndDayofMonth(int year, int monthOfYear) {
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.YEAR, year);
+        cal.set(Calendar.MONTH, monthOfYear);
+        cal.set(Calendar.DAY_OF_MONTH, 1);
+        cal.set(Calendar.HOUR_OF_DAY, 23);
+        cal.set(Calendar.MINUTE, 59);
+        cal.set(Calendar.SECOND, 59);
+
+        cal.add(Calendar.DAY_OF_MONTH, -1);
+        return cal.getTimeInMillis() + "";
+    }
+
+    public static String getYear(long millseconds) {
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+        Date date = new Date(millseconds);
+        return sdf.format(date).substring(0, 4);
+    }
+
+    public static String getMonth(long millseconds) {
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+        Date date = new Date(millseconds);
+        return sdf.format(date).substring(4, 6);
+    }
+
+    public static String formatFriendly(String timeStr) {
+        String time = "";
+        try {
+            time = DateTimeUtil.formatFriendly(new Date(Long.valueOf(timeStr) * 1000L));
+        } catch (Exception e) {
+            Log.e("FriendCircleMessage", "Time format exception.", e);
+        }
+        return time;
+    }
+
+}
@@ -20,6 +20,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@id/topbar"
+            android:layout_marginTop="20dp"
             android:orientation="vertical">
             <LinearLayout
@@ -67,6 +68,7 @@
                 android:padding="10dp">
                 <TextView
+                    android:id="@+id/sex_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="性别（非必填） 未选择"
@@ -80,6 +82,7 @@
                 android:padding="10dp">
                 <TextView
+                    android:id="@+id/birthday"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="生日（非必填） 未选择"
@@ -125,5 +128,6 @@
         </LinearLayout>
+
     </RelativeLayout>
 </layout>
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.cnlive.moudle.pedometer.utils.WheelView
+        android:id="@+id/wheelview"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:ignore="MissingConstraints" />
+</android.support.constraint.ConstraintLayout>
 \ No newline at end of file