raomeng 8 年之前
父節點
當前提交
bdcb7bb64c

+ 9 - 10
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/datainquiry/adapter/DataInquirySchemeConditionAdapter.java

@@ -16,8 +16,9 @@ import android.widget.TextView;
 
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.bean.SchemeConditionBean;
+import com.xzjmyk.pm.activity.util.CalendarUtils;
 import com.xzjmyk.pm.activity.view.MyGridView;
-import com.xzjmyk.pm.activity.view.wheel.DatePicker;
+import com.xzjmyk.pm.activity.view.wheel.OASigninPicker;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -310,16 +311,14 @@ public class DataInquirySchemeConditionAdapter extends BaseAdapter {
     }
 
     private void showDateDialog(final TextView tv) {
-        DatePicker picker = new DatePicker((Activity) context);
-        picker.setRange(1950, 2030);
-        picker.setSelectedItem(
-                Calendar.getInstance().get(Calendar.YEAR),
-                Calendar.getInstance().get(Calendar.MONTH) + 1,
-                Calendar.getInstance().get(Calendar.DAY_OF_MONTH));
-        picker.setOnDatePickListener(new DatePicker.OnYearMonthDayPickListener() {
+        OASigninPicker picker = new OASigninPicker((Activity) context);
+        picker.setRange(CalendarUtils.getCurrentYear(), CalendarUtils.getCurrentMonth(), CalendarUtils.getCurrentDate());
+        picker.setSelectedItem(CalendarUtils.getCurrentYear(), CalendarUtils.getCurrentMonth(), CalendarUtils.getCurrentDate());
+        picker.setOnDateTimePickListener(new OASigninPicker.OnDateTimePickListener() {
             @Override
-            public void onDatePicked(String year, String month, String day) {
-                tv.setText(year + "-" + month + "-" + day);
+            public void setTime(String year, String month, String day) {
+                String time = year + "-" + month + "-" + day;
+                tv.setText(time);
             }
         });
         picker.show();

+ 9 - 10
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/datainquiry/adapter/ReportQueryConditionAdapter.java

@@ -16,8 +16,9 @@ import android.widget.TextView;
 
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.bean.ReportConditionBean;
+import com.xzjmyk.pm.activity.util.CalendarUtils;
 import com.xzjmyk.pm.activity.view.MyGridView;
-import com.xzjmyk.pm.activity.view.wheel.DatePicker;
+import com.xzjmyk.pm.activity.view.wheel.OASigninPicker;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -310,16 +311,14 @@ public class ReportQueryConditionAdapter extends BaseAdapter {
     }
 
     private void showDateDialog(final TextView tv) {
-        DatePicker picker = new DatePicker((Activity) context);
-        picker.setRange(1950, 2030);
-        picker.setSelectedItem(
-                Calendar.getInstance().get(Calendar.YEAR),
-                Calendar.getInstance().get(Calendar.MONTH) + 1,
-                Calendar.getInstance().get(Calendar.DAY_OF_MONTH));
-        picker.setOnDatePickListener(new DatePicker.OnYearMonthDayPickListener() {
+        OASigninPicker picker = new OASigninPicker((Activity) context);
+        picker.setRange(CalendarUtils.getCurrentYear(), CalendarUtils.getCurrentMonth(), CalendarUtils.getCurrentDate());
+        picker.setSelectedItem(CalendarUtils.getCurrentYear(), CalendarUtils.getCurrentMonth(), CalendarUtils.getCurrentDate());
+        picker.setOnDateTimePickListener(new OASigninPicker.OnDateTimePickListener() {
             @Override
-            public void onDatePicked(String year, String month, String day) {
-                tv.setText(year + "-" + month + "-" + day);
+            public void setTime(String year, String month, String day) {
+                String time = year + "-" + month + "-" + day;
+                tv.setText(time);
             }
         });
         picker.show();