Skip to content

Commit fba4b6e

Browse files
committed
update RxDialogDate
1 parent 3e0b0f8 commit fba4b6e

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

RxUI/src/main/java/com/tamsiree/rxui/view/dialog/RxDialogDate.java

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class RxDialogDate extends RxDialog {
3737
private int curMonth;
3838
private int curDay;
3939
private TextView mTvSure;
40-
private TextView mTvCancle;
40+
private TextView mTvCancel;
4141
private CheckBox mCheckBoxDay;
4242
private Calendar mCalendar;
4343
private LinearLayout llType;
@@ -53,22 +53,19 @@ public class RxDialogDate extends RxDialog {
5353

5454
public RxDialogDate(Context mContext) {
5555
super(mContext);
56-
// TODO Auto-generated constructor stub
5756
this.mContext = mContext;
5857
build();
5958
}
6059

6160
public RxDialogDate(Context mContext, int beginYear) {
6261
super(mContext);
63-
// TODO Auto-generated constructor stub
6462
this.mContext = mContext;
6563
this.beginYear = beginYear;
6664
build();
6765
}
6866

6967
public RxDialogDate(Context mContext, int beginYear, int endYear) {
7068
super(mContext);
71-
// TODO Auto-generated constructor stub
7269
this.mContext = mContext;
7370
this.beginYear = beginYear;
7471
this.endYear = endYear;
@@ -77,7 +74,6 @@ public RxDialogDate(Context mContext, int beginYear, int endYear) {
7774

7875
public RxDialogDate(Context mContext, DateFormat dateFormat) {
7976
super(mContext);
80-
// TODO Auto-generated constructor stub
8177
this.mContext = mContext;
8278
build();
8379
this.mDateFormat = dateFormat;
@@ -88,11 +84,11 @@ public String getDateCN() {
8884
String dateCN;
8985
switch (mDateFormat) {
9086
case 年月:
91-
dateCN = curYear + "年" + mMonths[curMonth] + "月";
87+
dateCN = getSelectorYear() + "年" + getSelectorMonth() + "月";
9288
break;
9389
case 年月日:
9490
default:
95-
dateCN = curYear + "年" + mMonths[curMonth] + "月" + mDays[curDay] + "日";
91+
dateCN = getSelectorYear() + "年" + getSelectorMonth() + "月" + getSelectorDay() + "日";
9692
break;
9793
}
9894

@@ -117,12 +113,12 @@ public void setDateFormat(DateFormat dateFormat) {
117113
switch (dateFormat) {
118114
case 年月:
119115
llType.setVisibility(View.VISIBLE);
120-
mCheckBoxDay.setChecked(true);
116+
mCheckBoxDay.setChecked(false);
121117
break;
122118
case 年月日:
123119
default:
124120
llType.setVisibility(View.INVISIBLE);
125-
mCheckBoxDay.setChecked(false);
121+
mCheckBoxDay.setChecked(true);
126122
break;
127123
}
128124
}
@@ -185,7 +181,7 @@ public void onChanged(WheelView wheel, int oldValue, int newValue) {
185181
mDayView.setShadowColor(0xFFDADCDB, 0x88DADCDB, 0x00DADCDB);
186182

187183
mTvSure = dialogView1.findViewById(R.id.tv_sure);
188-
mTvCancle = dialogView1.findViewById(R.id.tv_cancel);
184+
mTvCancel = dialogView1.findViewById(R.id.tv_cancel);
189185
llType = dialogView1.findViewById(R.id.ll_month_type);
190186

191187
mCheckBoxDay = dialogView1.findViewById(R.id.checkBox_day);
@@ -251,7 +247,7 @@ public TextView getSureView() {
251247
}
252248

253249
public TextView getCancleView() {
254-
return mTvCancle;
250+
return mTvCancel;
255251
}
256252

257253

0 commit comments

Comments
 (0)