diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/calendar/CustomMonthView.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/calendar/CustomMonthView.java index 023fc50..d639a40 100644 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/calendar/CustomMonthView.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/calendar/CustomMonthView.java @@ -8,6 +8,7 @@ import android.text.TextUtils; import com.haibin.calendarview.Calendar; import com.haibin.calendarview.MonthView; +import com.tenlionsoft.baselib.utils.LogUtils; /** * 演示一个变态需求的月视图 @@ -117,7 +118,7 @@ public class CustomMonthView extends MonthView { if (isSelected) { mPointPaint.setColor(Color.WHITE); } else { - mPointPaint.setColor(Color.GRAY); + mPointPaint.setColor(Color.parseColor("#0052D9")); } canvas.drawCircle(x + mItemWidth / 2, y + mItemHeight - 3 * mPadding, mPointRadius, mPointPaint); @@ -133,11 +134,11 @@ public class CustomMonthView extends MonthView { if (calendar.isCurrentDay() && !isSelected) { canvas.drawCircle(cx, cy, mRadius, mCurrentDayPaint); } - + LogUtils.e("是否有Scheme==" + hasScheme); if (hasScheme) { // canvas.drawCircle(x + mItemWidth - mPadding - mCircleRadius / 2, y + mPadding + mCircleRadius, mCircleRadius, mSchemeBasicPaint); - mTextPaint.setColor(calendar.getSchemeColor()); - canvas.drawText(calendar.getScheme(), x + mItemWidth - mPadding - mCircleRadius, y + mPadding + mSchemeBaseLine, mTextPaint); +// mTextPaint.setColor(calendar.getSchemeColor()); +// canvas.drawText(calendar.getScheme(), x + mItemWidth - mPadding - mCircleRadius, y + mPadding + mSchemeBaseLine, mTextPaint); } //当然可以换成其它对应的画笔就不麻烦， diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/calendar/CustomWeekView.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/calendar/CustomWeekView.java index f69881d..2d9641e 100644 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/calendar/CustomWeekView.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/calendar/CustomWeekView.java @@ -78,7 +78,7 @@ public class CustomWeekView extends WeekView { mPointPaint.setAntiAlias(true); mPointPaint.setStyle(Paint.Style.FILL); mPointPaint.setTextAlign(Paint.Align.CENTER); - mPointPaint.setColor(Color.RED); + mPointPaint.setColor(Color.parseColor("#0052D9")); mCurrentDayPaint.setAntiAlias(true); @@ -121,7 +121,7 @@ public class CustomWeekView extends WeekView { if (isSelected) { mPointPaint.setColor(Color.WHITE); } else { - mPointPaint.setColor(Color.GRAY); + mPointPaint.setColor(Color.BLUE); } canvas.drawCircle(x + mItemWidth / 2, mItemHeight - 3 * mPadding, mPointRadius, mPointPaint); @@ -139,11 +139,12 @@ public class CustomWeekView extends WeekView { } if (hasScheme) { + //绘制文字 // canvas.drawCircle(x + mItemWidth - mPadding - mCircleRadius / 2, mPadding + mCircleRadius, mCircleRadius, mSchemeBasicPaint); - - mTextPaint.setColor(calendar.getSchemeColor()); - - canvas.drawText(calendar.getScheme(), x + mItemWidth - mPadding - mCircleRadius, mPadding + mSchemeBaseLine, mTextPaint); +// +// mTextPaint.setColor(calendar.getSchemeColor()); +// +// canvas.drawText(calendar.getScheme(), x + mItemWidth - mPadding - mCircleRadius, mPadding + mSchemeBaseLine, mTextPaint); } if (calendar.isWeekend() && calendar.isCurrentMonth()) { diff --git a/baselib/src/main/res/drawable-xhdpi/ic_arrow_right_60.png b/baselib/src/main/res/drawable-xhdpi/ic_arrow_right_60.png new file mode 100644 index 0000000..b29c2ff Binary files /dev/null and b/baselib/src/main/res/drawable-xhdpi/ic_arrow_right_60.png differ diff --git a/baselib/src/main/res/drawable-xhdpi/ic_off_normal.png b/baselib/src/main/res/drawable-xhdpi/ic_off_normal.png new file mode 100644 index 0000000..89e76bb Binary files /dev/null and b/baselib/src/main/res/drawable-xhdpi/ic_off_normal.png differ diff --git a/baselib/src/main/res/drawable-xhdpi/ic_on_sel.png b/baselib/src/main/res/drawable-xhdpi/ic_on_sel.png new file mode 100644 index 0000000..4ea4a05 Binary files /dev/null and b/baselib/src/main/res/drawable-xhdpi/ic_on_sel.png differ diff --git a/baselib/src/main/res/drawable/shape_btn_nomal_gray_deep_round.xml b/baselib/src/main/res/drawable/shape_btn_nomal_gray_deep_round.xml index b824ce4..9836ee3 100755 --- a/baselib/src/main/res/drawable/shape_btn_nomal_gray_deep_round.xml +++ b/baselib/src/main/res/drawable/shape_btn_nomal_gray_deep_round.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/baselib/src/main/res/drawable/switch_ios_track_selector.xml b/baselib/src/main/res/drawable/switch_ios_track_selector.xml index 1a459e3..497d160 100755 --- a/baselib/src/main/res/drawable/switch_ios_track_selector.xml +++ b/baselib/src/main/res/drawable/switch_ios_track_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/baselib/src/main/res/layout/layout_base_search_cancel.xml b/baselib/src/main/res/layout/layout_base_search_cancel.xml index 855e8ab..67609eb 100644 --- a/baselib/src/main/res/layout/layout_base_search_cancel.xml +++ b/baselib/src/main/res/layout/layout_base_search_cancel.xml @@ -11,20 +11,36 @@ android:paddingBottom="3dp"> - + android:gravity="center_vertical" + android:orientation="horizontal" + android:padding="7dp"> + + + + + \ No newline at end of file diff --git a/baselib/src/main/res/values/colors.xml b/baselib/src/main/res/values/colors.xml index 7fea7d2..31d5b63 100755 --- a/baselib/src/main/res/values/colors.xml +++ b/baselib/src/main/res/values/colors.xml @@ -44,7 +44,7 @@ #bb8E8E8E #535353 #7C7C7C - #00A6FE + #3F86FF #3300A6FE #00BEF7 #808080 @@ -69,6 +69,7 @@ #FF84A9 #000000 + #101010 #AA000000 #FBFBFB diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/schedule/ScheduleAddActivity.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/schedule/ScheduleAddActivity.java index 84d0e34..d64a4f7 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/schedule/ScheduleAddActivity.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/schedule/ScheduleAddActivity.java @@ -5,7 +5,6 @@ import android.graphics.Color; import android.text.TextUtils; import android.widget.Button; import android.widget.CheckBox; -import android.widget.CompoundButton; import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; @@ -27,7 +26,6 @@ import com.tenlionsoft.baselib.utils.ExceptionHandler; import com.tenlionsoft.baselib.utils.LogUtils; import com.tenlionsoft.baselib.utils.TimeUtils; import com.tenlionsoft.baselib.utils.UIUtil; -import com.tenlionsoft.baselib.utils.UserLgUtils; import com.tenlionsoft.oamodule.R; import com.tenlionsoft.oamodule.R2; import com.tenlionsoft.oamodule.beans.SaveScheduleBean; @@ -101,7 +99,8 @@ public class ScheduleAddActivity extends BaseActivity { @Override public void initData() { ButterKnife.bind(this); - mTvBaseTitle.setText("日程添加"); + mTvBaseTitle.setText("新建日程"); + mRlTitleBar.setBackgroundColor(mActivity.getResources().getColor(R.color.gray_f8)); refreshView(STATE_LOAD_SUCCESS); initView(); } @@ -188,16 +187,16 @@ public class ScheduleAddActivity extends BaseActivity { case 2: //判断时间大小 String start = mTvStartTime.getText().toString().trim(); - if(!TextUtils.isEmpty(start)){ - int span = TimeUtils.compareDate(date, TimeUtils.string2Date(start)); - if (span >= 0) { - mTvEndTime.setText(TimeUtils.date2String(date)); - } else { - ToastUtils.show("结束时间须大于开始时间"); - } - }else{ - ToastUtils.show("请选择开始时间"); - } + if (!TextUtils.isEmpty(start)) { + int span = TimeUtils.compareDate(date, TimeUtils.string2Date(start)); + if (span >= 0) { + mTvEndTime.setText(TimeUtils.date2String(date)); + } else { + ToastUtils.show("结束时间须大于开始时间"); + } + } else { + ToastUtils.show("请选择开始时间"); + } break; } }) diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/schedule/ScheduleDetailActivity.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/schedule/ScheduleDetailActivity.java index 6066612..ea1ded3 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/schedule/ScheduleDetailActivity.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/schedule/ScheduleDetailActivity.java @@ -75,6 +75,7 @@ public class ScheduleDetailActivity extends BaseActivity { public void initData() { ButterKnife.bind(this); mTvBaseTitle.setText("详情"); + mRlTitleBar.setBackgroundColor(getResources().getColor(R.color.gray_f8)); mId = getIntent().getStringExtra("id"); if (TextUtils.isEmpty(mId)) { ToastUtils.show("数据有误"); diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/schedule/ScheduleEditActivity.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/schedule/ScheduleEditActivity.java index a5df2cf..02623e6 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/schedule/ScheduleEditActivity.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/schedule/ScheduleEditActivity.java @@ -97,6 +97,7 @@ public class ScheduleEditActivity extends BaseActivity { public void initData() { ButterKnife.bind(this); mTvBaseTitle.setText("日程编辑"); + mRlTitleBar.setBackgroundColor(getResources().getColor(R.color.gray_f8)); mId = getIntent().getStringExtra("id"); initView(); if (TextUtils.isEmpty(mId)) { diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/schedule/ScheduleSearchActivity.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/schedule/ScheduleSearchActivity.java index 9abd158..183e47b 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/schedule/ScheduleSearchActivity.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/schedule/ScheduleSearchActivity.java @@ -75,6 +75,7 @@ public class ScheduleSearchActivity extends BaseActivity { @Override public void initData() { mBind = ButterKnife.bind(this); + mRlTitleBar.setBackgroundColor(getResources().getColor(R.color.gray_f8)); refreshView(STATE_LOAD_SUCCESS); mTvBaseTitle.setText("日程搜索"); initView(); diff --git a/oamodule/src/main/res/layout/activity_schedule.xml b/oamodule/src/main/res/layout/activity_schedule.xml index b352727..be7c854 100644 --- a/oamodule/src/main/res/layout/activity_schedule.xml +++ b/oamodule/src/main/res/layout/activity_schedule.xml @@ -90,106 +90,123 @@ android:layout_marginLeft="10dp" android:layout_marginRight="10dp" android:background="@color/white" - android:gravity="center_vertical" - android:orientation="horizontal" - android:padding="5dp"> + android:orientation="vertical"> - + + + android:orientation="horizontal" + android:padding="7dp"> - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + android:layout_marginRight="10dp" + android:background="#E7E7E7" /> @@ -208,8 +225,8 @@ android:id="@+id/calendarView" android:layout_width="match_parent" android:layout_height="wrap_content" - app:current_day_lunar_text_color="#ff0000" - app:current_day_text_color="#ff0000" + app:current_day_lunar_text_color="#8C8C8C" + app:current_day_text_color="#8C8C8C" app:current_month_lunar_text_color="#8C8C8C" app:current_month_text_color="#333333" app:lunar_text_size="10sp" @@ -228,12 +245,12 @@ app:scheme_text="" app:scheme_text_color="#333" app:scheme_theme_color="#8C8C8C" - app:selected_lunar_text_color="#8C8C8C" - app:selected_text_color="#8C8C8C" + app:selected_lunar_text_color="#2158F9" + app:selected_text_color="#2158F9" app:selected_theme_color="#00000000" app:week_background="#ffffff" app:week_bar_height="46dp" - app:week_line_background="#00000000" + app:week_line_background="#FFFFFF" app:week_line_margin="16dp" app:week_start_with="sun" app:week_text_color="#111111" diff --git a/oamodule/src/main/res/layout/activity_schedule_add.xml b/oamodule/src/main/res/layout/activity_schedule_add.xml index 837cdbd..e2c1b1b 100644 --- a/oamodule/src/main/res/layout/activity_schedule_add.xml +++ b/oamodule/src/main/res/layout/activity_schedule_add.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/gray_f0" + android:background="@color/gray_f2" android:orientation="vertical"> + android:textColor="@color/black_10" + android:textSize="@dimen/text_14" /> + android:textSize="@dimen/text_14" /> @@ -56,7 +56,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:text="日程类型" - android:textColor="@color/black" + android:textColor="@color/black_10" android:textSize="14sp" /> + android:text="站内" + android:textColor="@color/col_blue_gray" /> + android:text="短信" + android:textColor="@color/col_blue_gray" /> + android:text="邮件" + android:textColor="@color/col_blue_gray" /> @@ -141,21 +144,34 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:text="开始时间" - android:textColor="@color/black" + android:textColor="@color/black_10" android:textSize="14sp" /> - + android:gravity="center_vertical" + android:orientation="horizontal"> + + + + + @@ -165,21 +181,33 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:text="结束时间" - android:textColor="@color/black" + android:textColor="@color/black_10" android:textSize="14sp" /> - + android:gravity="center_vertical" + android:orientation="horizontal"> + + + + + @@ -190,21 +218,34 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:text="提前提醒" - android:textColor="@color/black" + android:textColor="@color/black_10" android:textSize="14sp" /> - + android:gravity="center_vertical" + android:orientation="horizontal"> + + + + + @@ -214,7 +255,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:text="是否公开" - android:textColor="@color/black" + android:textColor="@color/black_10" android:textSize="14sp" /> - + android:gravity="center_vertical" + android:orientation="horizontal"> + + + + + + diff --git a/oamodule/src/main/res/layout/activity_schedule_detail.xml b/oamodule/src/main/res/layout/activity_schedule_detail.xml index be00f8f..bce2393 100644 --- a/oamodule/src/main/res/layout/activity_schedule_detail.xml +++ b/oamodule/src/main/res/layout/activity_schedule_detail.xml @@ -3,18 +3,20 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/gray_f2" android:orientation="vertical"> @@ -33,7 +35,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:text="日程内容" - android:textColor="@color/black" + android:textColor="@color/black_10" android:textSize="14sp" /> + android:text="站内" + android:textColor="@color/col_blue_gray" /> + android:text="短信" + android:textColor="@color/col_blue_gray" /> + android:text="邮件" + android:textColor="@color/col_blue_gray" /> @@ -137,7 +142,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:text="开始时间" - android:textColor="@color/black" + android:textColor="@color/black_10" android:textSize="14sp" /> @@ -58,30 +60,33 @@ android:textColor="@color/black" android:textSize="14sp" /> - -