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-31 09:43:06 +08:00
parent 95f6b96c4e
commit 6b8f2f075d
21 changed files with 226 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 857 B

5
baselib/src/main/res/drawable/sel_rectangle_btn_white_gray_no_radiu_2.xml Executable file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/shp_rectangle_gray_no_f" android:state_pressed="true" />
<item android:drawable="@drawable/shape_btn_white_nl" android:state_pressed="false" />
</selector>

6
baselib/src/main/res/drawable/shp_rectangle_gray_df.xml Executable file
View File

@ -0,0 +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_4edf" />
<corners android:radius="3dp" />
</shape>

2
baselib/src/main/res/layout/item_main_func_title_num.xml
View File

@ -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"

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

@ -163,6 +163,7 @@
<color name="gray_f1">#fbf8f1</color>
<color name="gray_f0">#f0f0f0</color>
<color name="gray_df">#DFDFDF</color>
<color name="gray_4edf">#4EDFDFDF</color>
<color name="gray_ef">#efeff4</color>
<color name="gray_f8">#F8F8F8</color>
<color name="gray_f2">#F2F2F2</color>

21
oamodule/src/main/java/com/tenlionsoft/oamodule/activity/meeting/MeetingApplyActivity.java
View File

@ -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<AddFileBean> mFileBeans = new ArrayList<>();
private AddFileAdapter mAddFileAdapter;
@ -123,6 +128,7 @@ public class MeetingApplyActivity extends BaseActivity {
private List<MeetingAttachListBean> 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;

2
oamodule/src/main/java/com/tenlionsoft/oamodule/activity/meeting/MeetingDetailActivity.java
View File

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

3
oamodule/src/main/java/com/tenlionsoft/oamodule/adapter/BasePersonShowAdapter.java
View File

@ -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<MeetingAttachList
}
} else {
h.mIvSign.setVisibility(View.GONE);
h.mTvName.setVisibility(View.GONE);
h.mTvName.setVisibility(View.INVISIBLE);
h.mIvDel.setVisibility(View.GONE);
Glide.with(mContext)
.load(R.drawable.ic_file_add)

10
oamodule/src/main/java/com/tenlionsoft/oamodule/adapter/MeetingMineApplyAdapter.java
View File

@ -32,10 +32,10 @@ public class MeetingMineApplyAdapter extends BaseRecyclerAdapter<MeetingRoomReco
@Override
public void bindHolder(MeetingRoomRecordHolder h, int i) {
MeetingRoomRecordBean bean = mData.get(i);
h.mTvStartTime.setText("开始时间:"+bean.getMeetingStartTime());
h.mTvEndTime.setText("结束时间:"+bean.getMeetingEndTime());
h.mTvName.setText("会议室:"+bean.getMeetingRoomName());
h.mTvTitle.setText("会议标题:"+bean.getMeetingTitle());
h.mTvEmcee.setText("主持人:"+bean.getMeetingHostUserName());
h.mTvStartTime.setText(bean.getMeetingStartTime());
// h.mTvEndTime.setText("结束时间:"+bean.getMeetingEndTime());
// h.mTvName.setText("会议室:"+bean.getMeetingRoomName());
h.mTvTitle.setText(bean.getMeetingTitle());
// h.mTvEmcee.setText("主持人:"+bean.getMeetingHostUserName());
}
}

10
oamodule/src/main/java/com/tenlionsoft/oamodule/adapter/MeetingMineJoinEmceeAdapter.java
View File

@ -33,10 +33,10 @@ public class MeetingMineJoinEmceeAdapter extends BaseRecyclerAdapter<MineJoinMee
@Override
public void bindHolder(MeetingRoomRecordHolder h, int i) {
MineJoinMeetingListBean.RowsBean bean = mData.get(i);
h.mTvStartTime.setText("开始时间:"+bean.getMeetingDTO().getMeetingStartTime());
h.mTvEndTime.setText("结束时间:"+bean.getMeetingDTO().getMeetingEndTime());
h.mTvName.setText("会议室:"+bean.getMeetingDTO().getMeetingRoomName());
h.mTvTitle.setText("会议标题:"+bean.getMeetingDTO().getMeetingTitle());
h.mTvEmcee.setText("主持人:"+bean.getMeetingDTO().getMeetingHostUserName());
h.mTvStartTime.setText(bean.getMeetingDTO().getMeetingStartTime());
// h.mTvEndTime.setText("结束时间:"+bean.getMeetingDTO().getMeetingEndTime());
// h.mTvName.setText("会议室:"+bean.getMeetingDTO().getMeetingRoomName());
h.mTvTitle.setText(bean.getMeetingDTO().getMeetingTitle());
// h.mTvEmcee.setText("主持人:"+bean.getMeetingDTO().getMeetingHostUserName());
}
}

10
oamodule/src/main/java/com/tenlionsoft/oamodule/adapter/MeetingRoomRecordAdapter.java
View File

@ -32,10 +32,10 @@ public class MeetingRoomRecordAdapter extends BaseRecyclerAdapter<MeetingRoomRec
@Override
public void bindHolder(MeetingRoomRecordHolder h, int i) {
MeetingRoomRecordBean bean = mData.get(i);
h.mTvStartTime.setText("开始时间:"+bean.getMeetingStartTime());
h.mTvEndTime.setText("结束时间:"+bean.getMeetingEndTime());
h.mTvName.setText("会议室:"+bean.getMeetingRoomName());
h.mTvTitle.setText("会议标题:"+bean.getMeetingTitle());
h.mTvEmcee.setText("主持人:"+bean.getMeetingHostUserName());
h.mTvStartTime.setText(bean.getMeetingStartTime());
// h.mTvEndTime.setText("结束时间:"+bean.getMeetingEndTime());
// h.mTvName.setText("会议室:"+bean.getMeetingRoomName());
h.mTvTitle.setText(bean.getMeetingTitle());
// h.mTvEmcee.setText("主持人:"+bean.getMeetingHostUserName());
}
}

16
oamodule/src/main/java/com/tenlionsoft/oamodule/holder/MeetingRoomRecordHolder.java
View File

@ -22,16 +22,16 @@ import butterknife.ButterKnife;
public class MeetingRoomRecordHolder extends BaseViewHolder {
@BindView(R2.id.tv_start_time)
public TextView mTvStartTime;
@BindView(R2.id.tv_end_time)
public TextView mTvEndTime;
@BindView(R2.id.tv_name)
public TextView mTvName;
// @BindView(R2.id.tv_end_time)
// public TextView mTvEndTime;
// @BindView(R2.id.tv_name)
// public TextView mTvName;
@BindView(R2.id.tv_title)
public TextView mTvTitle;
@BindView(R2.id.tv_emcee)
public TextView mTvEmcee;
@BindView(R2.id.tv_state)
public TextView mTvState;
// @BindView(R2.id.tv_emcee)
// public TextView mTvEmcee;
// @BindView(R2.id.tv_state)
// public TextView mTvState;
public MeetingRoomRecordHolder(@NonNull @NotNull View itemView) {
super(itemView);

74
oamodule/src/main/res/layout/activity_meeting_apply.xml
View File

@ -4,7 +4,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:orientation="vertical"
tools:context=".activity.car.ByCarAddActivity">
@ -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">
<LinearLayout
@ -36,7 +36,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" />
<EditText
@ -47,6 +47,7 @@
android:background="@null"
android:gravity="right"
android:hint="请输入会议标题"
android:textColor="@color/text_80_gray"
android:textSize="14sp" />
</LinearLayout>
@ -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" />
<TextView
@ -66,11 +67,12 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_right"
android:drawableRight="@drawable/ic_arrow_right_24"
android:drawablePadding="5dp"
android:focusable="true"
android:gravity="right"
android:hint="请选择会议类型"
android:textColor="@color/black"
android:textColor="@color/text_80_gray"
android:textSize="14sp" />
</LinearLayout>
@ -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" />
<TextView
@ -90,11 +92,12 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_right"
android:drawableRight="@drawable/ic_arrow_right_24"
android:drawablePadding="5dp"
android:focusable="true"
android:gravity="right"
android:hint="请选择会议主持人"
android:textColor="@color/black"
android:textColor="@color/text_80_gray"
android:textSize="14sp" />
</LinearLayout>
@ -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" />
<TextView
@ -114,11 +117,12 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_right"
android:drawableRight="@drawable/ic_arrow_right_24"
android:drawablePadding="5dp"
android:focusable="true"
android:gravity="right"
android:hint="请选择会议开始时间"
android:textColor="@color/black"
android:textColor="@color/text_80_gray"
android:textSize="14sp" />
</LinearLayout>
@ -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" />
<TextView
@ -138,11 +142,12 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_right"
android:drawableRight="@drawable/ic_arrow_right_24"
android:drawablePadding="5dp"
android:focusable="true"
android:gravity="right"
android:hint="请选择会议结束时间"
android:textColor="@color/black"
android:textColor="@color/text_80_gray"
android:textSize="14sp" />
</LinearLayout>
@ -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" />
<TextView
@ -162,11 +167,12 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_right"
android:drawableRight="@drawable/ic_arrow_right_24"
android:drawablePadding="5dp"
android:focusable="true"
android:gravity="right"
android:hint="请选择会议室"
android:textColor="@color/black"
android:textColor="@color/text_80_gray"
android:textSize="14sp" />
</LinearLayout>
@ -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" />
<LinearLayout
@ -196,7 +202,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"
@ -207,7 +214,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>
@ -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" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shp_rectangle_gray">
android:background="@drawable/shp_rectangle_gray_df">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rlv_join"
@ -246,7 +254,7 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:itemCount="50"
tools:itemCount="1"
tools:layoutManager="GridLayoutManager"
tools:listitem="@layout/item_person_base_show"
tools:spanCount="5" />
@ -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" />
<LinearLayout
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">
<EditText
@ -290,8 +298,17 @@
android:hint="请输入会议内容"
android:minLines="3"
android:padding="5dp"
android:textColor="@color/black"
android:textColor="@color/black_10"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_content_hint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:gravity="right"
android:text="0/140"
android:textSize="@dimen/text_12" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
@ -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">
<androidx.recyclerview.widget.RecyclerView
@ -352,6 +369,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:orientation="horizontal"
android:padding="10dp">

64
oamodule/src/main/res/layout/activity_meeting_center.xml
View File

@ -55,7 +55,7 @@
<RadioButton
android:id="@+id/rb_join"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="32dp"
android:layout_weight="1"
android:background="@drawable/switch_custom_gray_white_left"
android:button="@null"
@ -66,14 +66,14 @@
android:paddingRight="10dp"
android:paddingBottom="5dp"
android:text="我参加的"
android:textStyle="bold" />
android:textSize="@dimen/text_14" />
<RadioButton
android:id="@+id/rb_emcee"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="32dp"
android:layout_weight="1"
android:background="@drawable/switch_custom_gray_white_left"
android:background="@drawable/switch_custom_gray_white_center"
android:button="@null"
android:gravity="center"
android:paddingLeft="10dp"
@ -81,14 +81,14 @@
android:paddingRight="10dp"
android:paddingBottom="5dp"
android:text="我主持的"
android:textStyle="bold" />
android:textSize="@dimen/text_14" />
<RadioButton
android:id="@+id/rb_apply"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="32dp"
android:layout_weight="1"
android:background="@drawable/switch_custom_gray_white_left"
android:background="@drawable/switch_custom_gray_white_right"
android:button="@null"
android:gravity="center"
android:paddingLeft="10dp"
@ -96,7 +96,7 @@
android:paddingRight="10dp"
android:paddingBottom="5dp"
android:text="我发起的"
android:textStyle="bold" />
android:textSize="@dimen/text_14" />
</RadioGroup>
@ -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" />
</RelativeLayout>
@ -121,50 +121,4 @@
android:id="@+id/vp_content"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<!-- <RelativeLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:layout_marginTop="5dp">-->
<!-- <com.scwang.smart.refresh.layout.SmartRefreshLayout-->
<!-- android:id="@+id/srl_content"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent">-->
<!-- <androidx.recyclerview.widget.RecyclerView-->
<!-- android:id="@+id/rlv_content"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent" />-->
<!-- </com.scwang.smart.refresh.layout.SmartRefreshLayout>-->
<!-- <LinearLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:gravity="center"-->
<!-- android:orientation="vertical">-->
<!-- <ProgressBar-->
<!-- android:id="@+id/pb_loading"-->
<!-- android:layout_width="50dp"-->
<!-- android:layout_height="50dp"-->
<!-- android:indeterminateBehavior="repeat"-->
<!-- android:indeterminateDrawable="@drawable/anim_loading" />-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_empty_data"-->
<!-- android:layout_width="100dp"-->
<!-- android:layout_height="100dp"-->
<!-- android:layout_centerInParent="true" />-->
<!-- <TextView-->
<!-- android:id="@+id/tv_error_hint"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="10dp"-->
<!-- android:clickable="true"-->
<!-- android:textColor="@color/black"-->
<!-- tools:text="加载数据失败" />-->
<!-- </LinearLayout>-->
<!-- </RelativeLayout>-->
</LinearLayout>

28
oamodule/src/main/res/layout/activity_meeting_detail.xml
View File

@ -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">
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="5dp"
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">
@ -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" />
</LinearLayout>
@ -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" />
</LinearLayout>
@ -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" />
</LinearLayout>
@ -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" />
</LinearLayout>
@ -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" />
</LinearLayout>
@ -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" />
</LinearLayout>
@ -191,7 +193,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"
@ -203,7 +206,8 @@
android:drawablePadding="5dp"
android:enabled="false"
android:padding="5dp"
android:text="邮件" />
android:text="邮件"
android:textColor="@color/col_blue_gray" />
</LinearLayout>
</LinearLayout>
@ -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">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rlv_join"
@ -296,7 +300,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">
<TextView
@ -338,7 +342,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">
<androidx.recyclerview.widget.RecyclerView

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

@ -161,16 +161,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" />
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_arrow_right_60" />
</LinearLayout>
</LinearLayout>
@ -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" />
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_arrow_right_60" />
</LinearLayout>
</LinearLayout>
@ -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" />
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_arrow_right_60" />
</LinearLayout>
</LinearLayout>
@ -292,31 +286,28 @@
android:textSize="14sp" />
<LinearLayout
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_level"
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:layout_centerVertical="true"
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" />
android:textSize="@dimen/text_14" />
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_arrow_right_60" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>

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

@ -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" />
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_arrow_right_60" />
</LinearLayout>
</LinearLayout>
@ -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" />
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_arrow_right_60" />
</LinearLayout>
</LinearLayout>
@ -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" />
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_arrow_right_60" />
</LinearLayout>
</LinearLayout>
@ -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" />
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_arrow_right_60" />
</LinearLayout>
</LinearLayout>
@ -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" />
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_arrow_right_60" />
</LinearLayout>
</LinearLayout>

4
oamodule/src/main/res/layout/fragment_emcee_meeting.xml
View File

@ -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">
<RelativeLayout
android:layout_width="match_parent"

4
oamodule/src/main/res/layout/fragment_join_meeting.xml
View File

@ -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">
<RelativeLayout
android:layout_width="match_parent"

4
oamodule/src/main/res/layout/fragment_mine_apply_meeting.xml
View File

@ -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">
<RelativeLayout
android:layout_width="match_parent"

125
oamodule/src/main/res/layout/item_meeting_room_record.xml
View File

@ -3,70 +3,81 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:background="@drawable/shp_rectangle_white_5"
android:orientation="horizontal"
android:layout_marginLeft="13dp"
android:layout_marginTop="10dp"
android:layout_marginRight="13dp"
android:layout_marginBottom="10dp"
android:orientation="vertical"
android:padding="5dp">
<LinearLayout
android:layout_width="0dp"
<TextView
android:id="@+id/tv_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/tv_start_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textSize="14sp"
android:textStyle="bold"
tools:text="2022-22-22 12:12:12" />
<TextView
android:id="@+id/tv_end_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textSize="14sp"
android:textStyle="bold"
tools:text="2022-22-22 12:12:12" />
</LinearLayout>
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="会议室名称" />
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="会议标题" />
<TextView
android:id="@+id/tv_emcee"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:text="主持人" />
</LinearLayout>
android:ellipsize="end"
android:maxLines="1"
android:textColor="@color/black"
android:textSize="@dimen/text_16"
tools:text="会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容" />
<TextView
android:id="@+id/tv_state"
android:id="@+id/tv_start_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shp_status_blue"
android:gravity="center"
android:textColor="@color/text_blue"
tools:text="状态" />
android:layout_marginTop="3dp"
android:textSize="14sp"
tools:text="2022-22-22 12:12:12" />
<!-- <LinearLayout-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_weight="1"-->
<!-- android:orientation="vertical">-->
<!-- <LinearLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:orientation="vertical">-->
<!-- <TextView-->
<!-- android:id="@+id/tv_end_time"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:textColor="@color/black"-->
<!-- android:textSize="14sp"-->
<!-- android:textStyle="bold"-->
<!-- tools:text="2022-22-22 12:12:12" />-->
<!-- </LinearLayout>-->
<!-- <TextView-->
<!-- android:id="@+id/tv_name"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- tools:text="会议室名称" />-->
<!-- <TextView-->
<!-- android:id="@+id/tv_title"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- tools:text="会议标题" />-->
<!-- <TextView-->
<!-- android:id="@+id/tv_emcee"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- tools:text="主持人" />-->
<!-- </LinearLayout>-->
<!-- <TextView-->
<!-- android:id="@+id/tv_state"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:background="@drawable/shp_status_blue"-->
<!-- android:gravity="center"-->
<!-- android:textColor="@color/text_blue"-->
<!-- tools:text="状态" />-->
</LinearLayout>