diff --git a/baselib/src/main/res/drawable-xhdpi/ic_arrow_right_24.png b/baselib/src/main/res/drawable-xhdpi/ic_arrow_right_24.png new file mode 100644 index 0000000..18c08b0 Binary files /dev/null and b/baselib/src/main/res/drawable-xhdpi/ic_arrow_right_24.png differ diff --git a/baselib/src/main/res/drawable/sel_rectangle_btn_white_gray_no_radiu_2.xml b/baselib/src/main/res/drawable/sel_rectangle_btn_white_gray_no_radiu_2.xml new file mode 100755 index 0000000..c67b582 --- /dev/null +++ b/baselib/src/main/res/drawable/sel_rectangle_btn_white_gray_no_radiu_2.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/baselib/src/main/res/drawable/shp_rectangle_gray_df.xml b/baselib/src/main/res/drawable/shp_rectangle_gray_df.xml new file mode 100755 index 0000000..2dbdc46 --- /dev/null +++ b/baselib/src/main/res/drawable/shp_rectangle_gray_df.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/baselib/src/main/res/layout/item_main_func_title_num.xml b/baselib/src/main/res/layout/item_main_func_title_num.xml index 1b8d49c..7038e70 100755 --- a/baselib/src/main/res/layout/item_main_func_title_num.xml +++ b/baselib/src/main/res/layout/item_main_func_title_num.xml @@ -5,7 +5,7 @@ android:layout_height="wrap_content" android:layout_marginTop="5dp" android:layout_marginBottom="5dp" - android:background="@drawable/sel_rectangle_btn_white_gray_no_radius" + android:background="@drawable/sel_rectangle_btn_white_gray_no_radiu_2" android:clickable="true" android:clipChildren="true" android:focusable="true" diff --git a/baselib/src/main/res/values/colors.xml b/baselib/src/main/res/values/colors.xml index 31d5b63..da0ba61 100755 --- a/baselib/src/main/res/values/colors.xml +++ b/baselib/src/main/res/values/colors.xml @@ -163,6 +163,7 @@ #fbf8f1 #f0f0f0 #DFDFDF + #4EDFDFDF #efeff4 #F8F8F8 #F2F2F2 diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/meeting/MeetingApplyActivity.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/meeting/MeetingApplyActivity.java index 221be6e..054bfa6 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/meeting/MeetingApplyActivity.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/meeting/MeetingApplyActivity.java @@ -4,6 +4,8 @@ import android.app.AlertDialog; import android.app.ProgressDialog; import android.content.Intent; import android.graphics.Color; +import android.text.Editable; +import android.text.InputFilter; import android.text.TextUtils; import android.view.View; import android.widget.Button; @@ -32,13 +34,14 @@ import com.tenlionsoft.baselib.core.retrofit_net.BaseUrlApi; import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager; import com.tenlionsoft.baselib.core.retrofit_net.api.BaseApiService; import com.tenlionsoft.baselib.core.retrofit_net.conver.RxTransformer; +import com.tenlionsoft.baselib.core.widget.AstrictLengthFilter; import com.tenlionsoft.baselib.core.widget.base.AddFileAdapter; import com.tenlionsoft.baselib.core.widget.base.BaseActivity; +import com.tenlionsoft.baselib.interfaces.TextChange; 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.adapter.BasePersonShowAdapter; @@ -107,6 +110,8 @@ public class MeetingApplyActivity extends BaseActivity { ImageView mIvAddFile; @BindView(R2.id.tv_file_hint) TextView mTvFileHint; + @BindView(R2.id.tv_content_hint) + TextView mTvContentHint; private List mFileBeans = new ArrayList<>(); private AddFileAdapter mAddFileAdapter; @@ -123,6 +128,7 @@ public class MeetingApplyActivity extends BaseActivity { private List mJoinPerson; private BasePersonShowAdapter mPersonShowAdapter; + private final int mReasonMax = 140; @Override protected int setLayoutId() { @@ -193,6 +199,15 @@ public class MeetingApplyActivity extends BaseActivity { mIvAddFile.setOnClickListener(v -> checkManagePermission()); mBtnConfirm.setOnClickListener(v -> doConfirm()); setTouchDelegate(mIvAddFile, 30); + mEtContent.addTextChangedListener(new TextChange() { + @Override + public void afterTextChanged(Editable s) { + int length = s.toString().length(); + mTvContentHint.setText(length + "/" + mReasonMax); + } + }); + AstrictLengthFilter filter = new AstrictLengthFilter(mReasonMax); + mEtContent.setFilters(new InputFilter[]{filter}); } @Override @@ -235,14 +250,14 @@ public class MeetingApplyActivity extends BaseActivity { case 2: //判断时间大小 String start = mTvStartTime.getText().toString().trim(); - if(!TextUtils.isEmpty(start)){ + if (!TextUtils.isEmpty(start)) { int span = TimeUtils.compareDate(date, TimeUtils.string2Date(start)); if (span >= 0) { mTvEndTime.setText(TimeUtils.date2String(date)); } else { ToastUtils.show("结束时间须大于开始时间"); } - }else{ + } else { ToastUtils.show("请选择开始时间"); } break; diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/meeting/MeetingDetailActivity.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/meeting/MeetingDetailActivity.java index 806d97d..70b2d3b 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/meeting/MeetingDetailActivity.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/meeting/MeetingDetailActivity.java @@ -29,7 +29,6 @@ import com.tenlionsoft.baselib.core.widget.views.QrDialog; import com.tenlionsoft.baselib.utils.ExceptionHandler; import com.tenlionsoft.baselib.utils.FileUtils; 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.adapter.BasePersonShowAdapter; @@ -104,6 +103,7 @@ public class MeetingDetailActivity extends BaseActivity { public void initData() { mBind = ButterKnife.bind(this); mTvBaseTitle.setText("会议详情"); + mRlTitleBar.setBackgroundColor(getResources().getColor(R.color.gray_f8)); mId = getIntent().getStringExtra("id"); String type = getIntent().getStringExtra("type"); if ("mine".equals(type)) { diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/adapter/BasePersonShowAdapter.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/adapter/BasePersonShowAdapter.java index b9f3754..b5dbbdc 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/adapter/BasePersonShowAdapter.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/adapter/BasePersonShowAdapter.java @@ -9,7 +9,6 @@ import android.view.ViewGroup; import com.bumptech.glide.Glide; import com.tenlionsoft.baselib.core.widget.base.BaseRecyclerAdapter; import com.tenlionsoft.baselib.utils.ConvertUtils; -import com.tenlionsoft.baselib.utils.LogUtils; import com.tenlionsoft.baselib.utils.ScreenUtils; import com.tenlionsoft.oamodule.R; import com.tenlionsoft.oamodule.beans.MeetingAttachListBean; @@ -73,7 +72,7 @@ public class BasePersonShowAdapter extends BaseRecyclerAdapter @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginTop="5dp" - android:layout_marginBottom="105dp" + android:paddingBottom="105dp" android:scrollbars="none"> @@ -57,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" /> @@ -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" /> @@ -105,7 +108,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" /> @@ -129,7 +133,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" /> @@ -153,7 +158,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" /> @@ -177,7 +183,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" /> @@ -228,13 +236,13 @@ 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:background="@drawable/shp_rectangle_gray_df"> @@ -270,14 +278,14 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:text="会议内容" - android:textColor="@color/black" + android:textColor="@color/black_10" android:textSize="14sp" /> + + @@ -318,7 +335,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="5dp" - android:background="@drawable/shp_rectangle_gray" + android:background="@drawable/shp_rectangle_gray_df" android:orientation="vertical"> diff --git a/oamodule/src/main/res/layout/activity_meeting_center.xml b/oamodule/src/main/res/layout/activity_meeting_center.xml index 5f9a195..e62ae67 100644 --- a/oamodule/src/main/res/layout/activity_meeting_center.xml +++ b/oamodule/src/main/res/layout/activity_meeting_center.xml @@ -55,7 +55,7 @@ + android:textSize="@dimen/text_14" /> + android:textSize="@dimen/text_14" /> + android:textSize="@dimen/text_14" /> @@ -111,7 +111,7 @@ android:layout_centerVertical="true" android:layout_marginLeft="10dp" android:layout_marginRight="5dp" - android:src="@drawable/ic_icon_add" /> + android:src="@drawable/ic_add_icon_solid" /> @@ -121,50 +121,4 @@ android:id="@+id/vp_content" android:layout_width="match_parent" android:layout_height="match_parent" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/oamodule/src/main/res/layout/activity_meeting_detail.xml b/oamodule/src/main/res/layout/activity_meeting_detail.xml index 997d10f..308a7a6 100644 --- a/oamodule/src/main/res/layout/activity_meeting_detail.xml +++ b/oamodule/src/main/res/layout/activity_meeting_detail.xml @@ -4,18 +4,20 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/gray_f2" android:orientation="vertical" tools:context=".activity.car.ByCarAddActivity"> @@ -45,7 +47,7 @@ android:background="@null" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/text_80_gray" android:textSize="14sp" /> @@ -68,7 +70,7 @@ android:focusable="true" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/text_80_gray" android:textSize="14sp" /> @@ -91,7 +93,7 @@ android:focusable="true" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/text_80_gray" android:textSize="14sp" /> @@ -114,7 +116,7 @@ android:focusable="true" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/text_80_gray" android:textSize="14sp" /> @@ -137,7 +139,7 @@ android:focusable="true" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/text_80_gray" android:textSize="14sp" /> @@ -160,7 +162,7 @@ android:focusable="true" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/text_80_gray" android:textSize="14sp" /> @@ -191,7 +193,8 @@ android:drawablePadding="5dp" android:enabled="false" android:padding="5dp" - android:text="短信" /> + android:text="短信" + android:textColor="@color/col_blue_gray" /> + android:text="邮件" + android:textColor="@color/col_blue_gray" /> @@ -251,7 +255,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="5dp" - android:background="@drawable/shp_rectangle_gray"> + android:background="@drawable/shp_rectangle_gray_df"> - @@ -197,16 +195,14 @@ android:layout_gravity="center_vertical" android:layout_weight="1" android:clickable="true" + android:drawableRight="@drawable/ic_arrow_right_24" + android:drawablePadding="5dp" android:focusable="true" android:gravity="right" android:hint="请选择结束时间" android:textColor="@color/black" android:textSize="@dimen/text_14" /> - @@ -235,16 +231,14 @@ android:layout_gravity="center_vertical" android:layout_weight="1" android:clickable="true" + android:drawableRight="@drawable/ic_arrow_right_24" + android:drawablePadding="5dp" android:focusable="true" android:gravity="right" android:hint="请选择提醒时间" android:textColor="@color/black" android:textSize="14sp" /> - @@ -292,31 +286,28 @@ android:textSize="14sp" /> - + android:gravity="center_vertical"> + + android:textSize="@dimen/text_14" /> - - + diff --git a/oamodule/src/main/res/layout/activity_schedule_edit.xml b/oamodule/src/main/res/layout/activity_schedule_edit.xml index c06e582..52fb6c4 100644 --- a/oamodule/src/main/res/layout/activity_schedule_edit.xml +++ b/oamodule/src/main/res/layout/activity_schedule_edit.xml @@ -75,16 +75,14 @@ android:layout_gravity="center_vertical" android:layout_weight="1" android:clickable="true" + android:drawableRight="@drawable/ic_arrow_right_24" + android:drawablePadding="5dp" android:focusable="true" android:gravity="right|center_vertical" android:hint="请选择日程类型" android:textColor="@color/black" android:textSize="14sp" /> - @@ -171,16 +169,14 @@ android:layout_gravity="center_vertical" android:layout_weight="1" android:clickable="true" + android:drawableRight="@drawable/ic_arrow_right_24" + android:drawablePadding="5dp" android:focusable="true" android:gravity="right|center_vertical" android:hint="请选择开始时间" android:textColor="@color/black" android:textSize="14sp" /> - @@ -208,16 +204,14 @@ android:layout_gravity="center_vertical" android:layout_weight="1" android:clickable="true" + android:drawableRight="@drawable/ic_arrow_right_24" + android:drawablePadding="5dp" android:focusable="true" android:gravity="right|center_vertical" android:hint="请选择结束时间" android:textColor="@color/black" android:textSize="14sp" /> - @@ -246,16 +240,14 @@ android:layout_gravity="center_vertical" android:layout_weight="1" android:clickable="true" + android:drawableRight="@drawable/ic_arrow_right_24" + android:drawablePadding="5dp" android:focusable="true" android:gravity="right|center_vertical" android:hint="请选择提醒时间" android:textColor="@color/black" android:textSize="14sp" /> - @@ -316,16 +308,13 @@ android:layout_gravity="center_vertical" android:layout_weight="1" android:clickable="true" + android:drawableRight="@drawable/ic_arrow_right_24" + android:drawablePadding="5dp" android:focusable="true" android:gravity="right|center_vertical" android:hint="请选择紧急程度" android:textColor="@color/black" android:textSize="14sp" /> - - diff --git a/oamodule/src/main/res/layout/fragment_emcee_meeting.xml b/oamodule/src/main/res/layout/fragment_emcee_meeting.xml index 976d388..dd90794 100644 --- a/oamodule/src/main/res/layout/fragment_emcee_meeting.xml +++ b/oamodule/src/main/res/layout/fragment_emcee_meeting.xml @@ -9,9 +9,9 @@ android:id="@+id/srl_meeting" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginLeft="5dp" + android:layout_marginLeft="10dp" android:layout_marginTop="5dp" - android:layout_marginRight="5dp"> + android:layout_marginRight="10dp"> + android:layout_marginRight="10dp"> + android:layout_marginRight="10dp"> - - - - - - - - - - - - - - - - - + android:ellipsize="end" + android:maxLines="1" + android:textColor="@color/black" + android:textSize="@dimen/text_16" + tools:text="会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容" /> + android:layout_marginTop="3dp" + android:textSize="14sp" + tools:text="2022-22-22 12:12:12" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file