gaojian/oasystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

日程管理页面修改

Browse Source
This commit is contained in:
adam 2022-05-30 16:13:32 +08:00
parent 8489d04bb7
commit 95f6b96c4e
19 changed files with 441 additions and 268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
baselib/src/main/java/com/tenlionsoft/baselib/core/widget/calendar/CustomMonthView.java
View File

@ -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);
}
//当然可以换成其它对应的画笔就不麻烦，

13
baselib/src/main/java/com/tenlionsoft/baselib/core/widget/calendar/CustomWeekView.java
View File

@ -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()) {

BIN
baselib/src/main/res/drawable-xhdpi/ic_arrow_right_60.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 207 B

BIN
baselib/src/main/res/drawable-xhdpi/ic_off_normal.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
baselib/src/main/res/drawable-xhdpi/ic_on_sel.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

2
baselib/src/main/res/drawable/shape_btn_nomal_gray_deep_round.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/gray_10" />
<solid android:color="#B5B5B5" />
<corners android:radius="3dp" />
</shape>

4
baselib/src/main/res/drawable/switch_ios_track_selector.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ic_on" android:state_checked="true" />
<item android:drawable="@drawable/ic_off" android:state_checked="false" />
<item android:drawable="@drawable/ic_on_sel" android:state_checked="true" />
<item android:drawable="@drawable/ic_off_normal" android:state_checked="false" />
</selector>

30
baselib/src/main/res/layout/layout_base_search_cancel.xml
View File

@ -11,20 +11,36 @@
android:paddingBottom="3dp">
<EditText
android:id="@+id/et_base_search_cancel"
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_white_5"
android:drawableLeft="@drawable/ic_search_icon_gray"
android:drawablePadding="5dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="7dp">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:scaleType="fitXY"
android:src="@drawable/ic_search_icon_gray_title" />
<EditText
android:id="@+id/et_base_search_cancel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:layout_weight="1"
android:background="@null"
android:gravity="center_vertical"
android:hint="搜索"
android:imeOptions="actionSearch"
android:padding="7dp"
android:singleLine="true"
android:textSize="14sp" />
android:textSize="@dimen/text_14" />
</LinearLayout>
<TextView
android:id="@+id/tv_base_search_cancel"
@ -33,6 +49,6 @@
android:clickable="true"
android:focusable="true"
android:text="取消"
android:textColor="@color/gray_text"
android:textColor="#717296"
android:textSize="@dimen/text_16" />
</LinearLayout>

3
baselib/src/main/res/values/colors.xml
View File

@ -44,7 +44,7 @@
<color name="text_gray_tr">#bb8E8E8E</color>
<color name="text_gray01">#535353</color>
<color name="text_gray02">#7C7C7C</color>
<color name="text_blue">#00A6FE</color>
<color name="text_blue">#3F86FF</color>
<color name="text_blue_tr">#3300A6FE</color>
<color name="blue_line">#00BEF7</color>
<color name="text_80_gray">#808080</color>
@ -69,6 +69,7 @@
<color name="pink">#FF84A9</color>
<!-- 黑色 -->
<color name="black">#000000</color>
<color name="black_10">#101010</color>
<color name="black_30">#AA000000</color>
<!--考勤详情表格颜色-->
<color name="gray_line">#FBFBFB</color>

5
oamodule/src/main/java/com/tenlionsoft/oamodule/activity/schedule/ScheduleAddActivity.java
View File

@ -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();
}

1
oamodule/src/main/java/com/tenlionsoft/oamodule/activity/schedule/ScheduleDetailActivity.java
View File

@ -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("数据有误");

1
oamodule/src/main/java/com/tenlionsoft/oamodule/activity/schedule/ScheduleEditActivity.java
View File

@ -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)) {

1
oamodule/src/main/java/com/tenlionsoft/oamodule/activity/schedule/ScheduleSearchActivity.java
View File

@ -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();

29
oamodule/src/main/res/layout/activity_schedule.xml
View File

@ -90,9 +90,18 @@
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/white"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="5dp">
android:paddingLeft="10dp"
android:paddingTop="15dp"
android:paddingRight="10dp"
android:paddingBottom="15dp">
<LinearLayout
android:layout_width="0dp"
@ -192,6 +201,14 @@
</RadioGroup>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="#E7E7E7" />
</LinearLayout>
<com.haibin.calendarview.CalendarLayout
android:id="@+id/calendarLayout"
@ -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"

101
oamodule/src/main/res/layout/activity_schedule_add.xml
View File

@ -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">
<androidx.core.widget.NestedScrollView
@ -34,8 +34,8 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="日程内容"
android:textColor="@color/black"
android:textSize="14sp" />
android:textColor="@color/black_10"
android:textSize="@dimen/text_14" />
<EditText
android:id="@+id/et_content"
@ -45,7 +45,7 @@
android:background="@null"
android:gravity="right"
android:hint="请输入日程内容"
android:textSize="14sp" />
android:textSize="@dimen/text_14" />
</LinearLayout>
@ -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" />
<TextView
@ -88,7 +88,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" />
<LinearLayout
@ -107,7 +107,8 @@
android:drawableLeft="@drawable/sel_checkbox_blue_gray"
android:drawablePadding="5dp"
android:padding="5dp"
android:text="站内" />
android:text="站内"
android:textColor="@color/col_blue_gray" />
<CheckBox
android:id="@+id/cb_notice_msg"
@ -119,7 +120,8 @@
android:drawableLeft="@drawable/sel_checkbox_blue_gray"
android:drawablePadding="5dp"
android:padding="5dp"
android:text="短信" />
android:text="短信"
android:textColor="@color/col_blue_gray" />
<CheckBox
android:id="@+id/cb_notice_email"
@ -130,7 +132,8 @@
android:drawableLeft="@drawable/sel_checkbox_blue_gray"
android:drawablePadding="5dp"
android:padding="5dp"
android:text="邮件" />
android:text="邮件"
android:textColor="@color/col_blue_gray" />
</LinearLayout>
</LinearLayout>
@ -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" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_start_time"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_right"
android:focusable="true"
android:gravity="right"
android:hint="请选择开始时间"
android:textColor="@color/black"
android:textSize="14sp" />
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_arrow_right_60" />
</LinearLayout>
</LinearLayout>
<LinearLayout style="@style/item_hor_content">
@ -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" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_end_time"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_right"
android:focusable="true"
android:gravity="right"
android:hint="请选择结束时间"
android:textColor="@color/black"
android:textSize="14sp" />
android:textSize="@dimen/text_14" />
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_arrow_right_60" />
</LinearLayout>
</LinearLayout>
@ -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" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_awoke"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_right"
android:focusable="true"
android:gravity="right"
android:hint="请选择提醒时间"
android:textColor="@color/black"
android:textSize="14sp" />
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_arrow_right_60" />
</LinearLayout>
</LinearLayout>
<LinearLayout style="@style/item_hor_content">
@ -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" />
<LinearLayout
@ -247,21 +288,35 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="紧急程度"
android:textColor="@color/black"
android:textColor="@color/black_10"
android:textSize="14sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_level"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_right"
android:focusable="true"
android:gravity="right"
android:hint="请选择紧急程度"
android:textColor="@color/black"
android:textSize="14sp" />
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_arrow_right_60" />
</LinearLayout>
</LinearLayout>

29
oamodule/src/main/res/layout/activity_schedule_detail.xml
View File

@ -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">
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="5dp"
android:layout_marginBottom="50dp"
android:scrollbars="none">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_f0"
android:background="@color/gray_f8"
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" />
<TextView
@ -56,7 +58,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" />
<TextView
@ -81,7 +83,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" />
<LinearLayout
@ -101,7 +103,8 @@
android:drawablePadding="5dp"
android:enabled="false"
android:padding="5dp"
android:text="站内" />
android:text="站内"
android:textColor="@color/col_blue_gray" />
<CheckBox
android:id="@+id/cb_notice_msg"
@ -114,7 +117,8 @@
android:drawablePadding="5dp"
android:enabled="false"
android:padding="5dp"
android:text="短信" />
android:text="短信"
android:textColor="@color/col_blue_gray" />
<CheckBox
android:id="@+id/cb_notice_email"
@ -126,7 +130,8 @@
android:drawablePadding="5dp"
android:enabled="false"
android:padding="5dp"
android:text="邮件" />
android:text="邮件"
android:textColor="@color/col_blue_gray" />
</LinearLayout>
</LinearLayout>
@ -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" />
<TextView
@ -160,7 +165,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" />
<TextView
@ -184,7 +189,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" />
<TextView
@ -207,7 +212,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" />
<LinearLayout
@ -241,7 +246,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" />
<TextView

146
oamodule/src/main/res/layout/activity_schedule_edit.xml
View File

@ -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">
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="5dp"
android:layout_marginBottom="50dp"
android:scrollbars="none">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_f0"
android:background="@color/gray_f8"
android:orientation="vertical">
@ -58,6 +60,14 @@
android:textColor="@color/black"
android:textSize="14sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_type"
android:layout_width="0dp"
@ -65,23 +75,18 @@
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_right"
android:focusable="true"
android:gravity="right"
android:gravity="right|center_vertical"
android:hint="请选择日程类型"
android:textColor="@color/black"
android:textSize="14sp" />
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/sel_btn_submit"
android:minWidth="0dp"
android:minHeight="0dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:text="新增"
android:textColor="@color/white" />
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_arrow_right_60" />
</LinearLayout>
</LinearLayout>
<LinearLayout style="@style/item_hor_content">
@ -105,26 +110,40 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:background="@drawable/shape_rectangle_white_gray_border"
android:button="@null"
android:drawableLeft="@drawable/sel_check_item_cir"
android:text="站内" />
android:drawableLeft="@drawable/sel_checkbox_blue_gray"
android:drawablePadding="5dp"
android:padding="5dp"
android:text="站内"
android:textColor="@color/col_blue_gray" />
<CheckBox
android:id="@+id/cb_notice_msg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:background="@drawable/shape_rectangle_white_gray_border"
android:button="@null"
android:drawableLeft="@drawable/sel_check_item_cir"
android:text="短信" />
android:drawableLeft="@drawable/sel_checkbox_blue_gray"
android:drawablePadding="5dp"
android:padding="5dp"
android:text="短信"
android:textColor="@color/col_blue_gray" />
<CheckBox
android:id="@+id/cb_notice_email"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_rectangle_white_gray_border"
android:button="@null"
android:drawableLeft="@drawable/sel_check_item_cir"
android:text="邮件" />
android:drawableLeft="@drawable/sel_checkbox_blue_gray"
android:drawablePadding="5dp"
android:padding="5dp"
android:text="邮件"
android:textColor="@color/col_blue_gray" />
</LinearLayout>
</LinearLayout>
@ -138,18 +157,31 @@
android:textColor="@color/black"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_start_time"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_start_time"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_right"
android:focusable="true"
android:gravity="right"
android:gravity="right|center_vertical"
android:hint="请选择开始时间"
android:textColor="@color/black"
android:textSize="14sp" />
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_arrow_right_60" />
</LinearLayout>
</LinearLayout>
<LinearLayout style="@style/item_hor_content">
@ -162,18 +194,31 @@
android:textColor="@color/black"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_end_time"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_end_time"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_right"
android:focusable="true"
android:gravity="right"
android:gravity="right|center_vertical"
android:hint="请选择结束时间"
android:textColor="@color/black"
android:textSize="14sp" />
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_arrow_right_60" />
</LinearLayout>
</LinearLayout>
@ -187,18 +232,31 @@
android:textColor="@color/black"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_awoke"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_awoke"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_right"
android:focusable="true"
android:gravity="right"
android:gravity="right|center_vertical"
android:hint="请选择提醒时间"
android:textColor="@color/black"
android:textSize="14sp" />
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_arrow_right_60" />
</LinearLayout>
</LinearLayout>
<LinearLayout style="@style/item_hor_content">
@ -244,18 +302,31 @@
android:textColor="@color/black"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_level"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_level"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_right"
android:focusable="true"
android:gravity="right"
android:gravity="right|center_vertical"
android:hint="请选择紧急程度"
android:textColor="@color/black"
android:textSize="14sp" />
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_arrow_right_60" />
</LinearLayout>
</LinearLayout>
@ -270,5 +341,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:text="保存编辑" />
android:layout_margin="10dp"
android:background="@drawable/sel_btn_submit_no_size"
android:text="保存编辑"
android:textColor="@color/col_white_gray_press" />
</RelativeLayout>

2
oamodule/src/main/res/layout/activity_schedule_search.xml
View File

@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_f0"
android:background="@color/gray_f2"
android:paddingTop="10dp"
tools:context=".activity.schedule.ScheduleSearchActivity">

1
oamodule/src/main/res/layout/item_schedule.xml
View File

@ -11,6 +11,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="5dp">