Commit 988020e9 by 罗翻

预约2018年月份比当前月份小的时间会提示时间不合法,比如选20188年9月10号

parent 829a3239
package com.dayu.bigfish.activity;
import android.app.Activity;
import android.app.DatePickerDialog;
import android.app.TimePickerDialog;
import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.view.View;
import android.widget.Button;
import android.widget.DatePicker;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.TimePicker;
import com.bigkoo.pickerview.TimePickerView;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.bean.BaseBean;
import com.dayu.bigfish.eventbus.AgainUpDoorText;
import com.dayu.bigfish.eventbus.UpdataTime;
import com.dayu.bigfish.utils.DateUtils;
import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.ToastUtils;
import com.dayu.bigfish.utils.UtilsDate;
import com.dayu.bigfish.views.CustomProgressDialog;
import com.google.gson.Gson;
import com.lzy.okgo.OkGo;
......@@ -45,8 +41,7 @@ import butterknife.OnClick;
import okhttp3.Call;
import okhttp3.Response;
import static cn.finalteam.toolsfinal.DateUtils.calendar;
import static cn.finalteam.toolsfinal.DateUtils.getTime;
import static com.dayu.bigfish.utils.UtilsDate.LONG_TIME_FORMAT_TWO;
/**
* 修改预约上门时间
......@@ -91,9 +86,7 @@ public class AgainUpDoorActivity extends Activity {
private DateUtils dateUtils = new DateUtils();
private List myList;
private int finshPosition;
private int myYears;
private int myMonths;
private int myToday;
private boolean mIsToday;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
......@@ -109,7 +102,7 @@ public class AgainUpDoorActivity extends Activity {
public void initData() {
Intent intent = getIntent();
String value = intent.getStringExtra("orderId");
finshPosition = intent.getIntExtra("position",0);
finshPosition = intent.getIntExtra("position", 0);
System.out.println("ding订单id为------>" + value);
orderId = Integer.parseInt(value);
}
......@@ -126,17 +119,16 @@ public class AgainUpDoorActivity extends Activity {
@Override
public void onTimeSelect(Date date2, View v) {//选中事件回调
String time = getTime(date2);
myYears = Integer.parseInt(getTimeYear(date2));
myMonths = Integer.parseInt(getTimeMonth(date2));
myToday = Integer.parseInt(getTimetoday(date2));
int sysYear = (int) myList.get(0);
int sysMoths = (int) myList.get(1);
int sysToday = (int) myList.get(2);
if (myYears < sysYear || myMonths < sysMoths || myToday < sysToday) {
if (UtilsDate.dayDiff(UtilsDate.getNowDate(), date2) >= 0) {
textDateValue.setText(time);
} else {
ToastUtils.showShortToast("请选择合法的时间");
return;
}else {
textDateValue.setText(time);
}
if (UtilsDate.dayDiff(UtilsDate.getNowDate(), date2) == 0) {
mIsToday = true;
} else {
mIsToday = false;
}
}
})
......@@ -168,10 +160,16 @@ public class AgainUpDoorActivity extends Activity {
TimePickerView pvTime2 = new TimePickerView.Builder(AgainUpDoorActivity.this, new TimePickerView.OnTimeSelectListener() {
@Override
public void onTimeSelect(Date date2, View v) {//选中事件回调
String time = getTimes(date2);
String nowtime = UtilsDate.getCurrDate(LONG_TIME_FORMAT_TWO);
String time = UtilsDate.dateToString(date2, LONG_TIME_FORMAT_TWO);
if (mIsToday && UtilsDate.stringtoDate(nowtime, LONG_TIME_FORMAT_TWO).getTime() - UtilsDate.stringtoDate(time, LONG_TIME_FORMAT_TWO).getTime() >= 0) {
ToastUtils.showShortToast("请选择合法的时间");
return;
} else {
ToastUtils.showShortToast(time);
textTimeValue.setText(time);
}
}
})
.setType(TimePickerView.Type.HOURS_MINS)//默认全部显示
.setCancelText("取消")//取消按钮文字
......@@ -207,23 +205,23 @@ public class AgainUpDoorActivity extends Activity {
ToastUtils.showShortToast("正在提交数据......");
// updataSubscribeTimePresenter.post(orderId, "2017-11-11 24:24:00", edValue);
//initNetWork(orderId, "2017-18-23 15:34:00", edValue);
String time= dateUtils.stringTimeTo(textDateValue.getText().toString());
String timeValue = time+textTimeValue.getText().toString()+":00";
initNetWork(orderId, timeValue, edValue,token);
String time = dateUtils.stringTimeTo(textDateValue.getText().toString());
String timeValue = time + textTimeValue.getText().toString() + ":00";
initNetWork(orderId, timeValue, edValue, token);
}
break;
}
}
public void initNetWork(int orderId, String doorTime, String doorComment,String token) {
public void initNetWork(int orderId, String doorTime, String doorComment, String token) {
OkGo.post(Constants.ORDER_DOOR)
.tag(this)
.params("orderId", orderId)
//params("doorTime", calendar.getTime().toString())
.params("doorTime", doorTime)
.params("doorComment", doorComment)
.headers("token",token)
.headers("token", token)
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
......@@ -268,6 +266,7 @@ public class AgainUpDoorActivity extends Activity {
SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日");
return format.format(date);
}
public String getTimeYear(Date date) {//可根据需要自行截取数据显示
SimpleDateFormat format = new SimpleDateFormat("yyyy");
return format.format(date);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment