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 11:04:35 +08:00
parent c23695be6c
commit e54f61b0ae
7 changed files with 86 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
baselib/src/main/res/color/col_gray_black.xml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/black_10" android:state_pressed="true" />
<item android:color="@color/black_10" android:state_checked="true" />
<item android:color="@color/black_10" android:state_selected="true" />
<item android:color="@color/gray_text" android:state_pressed="false" />
<item android:color="@color/gray_text" android:state_checked="false" />
<item android:color="@color/gray_text" android:state_selected="false" />
</selector>

21
oamodule/src/main/java/com/tenlionsoft/oamodule/activity/supervise/ApplySuperviseActivity.java
View File

@ -3,6 +3,8 @@ package com.tenlionsoft.oamodule.activity.supervise;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.Intent; import android.content.Intent;
import android.graphics.Color; import android.graphics.Color;
import android.text.Editable;
import android.text.InputFilter;
import android.text.TextUtils; import android.text.TextUtils;
import android.widget.Button; import android.widget.Button;
import android.widget.CheckBox; import android.widget.CheckBox;
@ -21,11 +23,12 @@ import com.tenlionsoft.baselib.constant.PathConfig;
import com.tenlionsoft.baselib.core.beans.BaseSuccessBean; import com.tenlionsoft.baselib.core.beans.BaseSuccessBean;
import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager; import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager;
import com.tenlionsoft.baselib.core.retrofit_net.conver.RxTransformer; import com.tenlionsoft.baselib.core.retrofit_net.conver.RxTransformer;
import com.tenlionsoft.baselib.core.widget.AstrictLengthFilter;
import com.tenlionsoft.baselib.core.widget.base.BaseActivity; 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.ExceptionHandler;
import com.tenlionsoft.baselib.utils.TimeUtils; import com.tenlionsoft.baselib.utils.TimeUtils;
import com.tenlionsoft.baselib.utils.UIUtil; import com.tenlionsoft.baselib.utils.UIUtil;
import com.tenlionsoft.baselib.utils.UserLgUtils;
import com.tenlionsoft.oamodule.R; import com.tenlionsoft.oamodule.R;
import com.tenlionsoft.oamodule.R2; import com.tenlionsoft.oamodule.R2;
import com.tenlionsoft.oamodule.beans.SaveSuperviseBean; import com.tenlionsoft.oamodule.beans.SaveSuperviseBean;
@ -66,14 +69,14 @@ public class ApplySuperviseActivity extends BaseActivity {
TextView mTvUsers; TextView mTvUsers;
@BindView(R2.id.et_request) @BindView(R2.id.et_request)
EditText mEtRequest; EditText mEtRequest;
@BindView(R2.id.tv_request_num)
TextView mTvRequestNum;
@BindView(R2.id.cb_notice_msg) @BindView(R2.id.cb_notice_msg)
CheckBox mCbNoticeMsg; CheckBox mCbNoticeMsg;
@BindView(R2.id.cb_notice_email) @BindView(R2.id.cb_notice_email)
CheckBox mCbNoticeEmail; CheckBox mCbNoticeEmail;
@BindView(R2.id.btn_confirm) @BindView(R2.id.btn_confirm)
Button mBtnConfirm; Button mBtnConfirm;
@BindView(R2.id.tv_content_hint)
TextView mTvContentHint;
private OptionsPickerView<SuperviseTypeBean> mTypePicker; private OptionsPickerView<SuperviseTypeBean> mTypePicker;
@ -83,6 +86,8 @@ public class ApplySuperviseActivity extends BaseActivity {
private String mUserNames; private String mUserNames;
private SuperviseRelevanceOptionsListBean.RowsBean mSelRelevance; private SuperviseRelevanceOptionsListBean.RowsBean mSelRelevance;
private final int mReasonMax = 140;
@Override @Override
protected int setLayoutId() { protected int setLayoutId() {
return R.layout.activity_apply_supervise; return R.layout.activity_apply_supervise;
@ -92,6 +97,7 @@ public class ApplySuperviseActivity extends BaseActivity {
public void initData() { public void initData() {
ButterKnife.bind(this); ButterKnife.bind(this);
mTvBaseTitle.setText("发起督办"); mTvBaseTitle.setText("发起督办");
mRlTitleBar.setBackgroundColor(getResources().getColor(R.color.gray_f8));
refreshView(STATE_LOAD_SUCCESS); refreshView(STATE_LOAD_SUCCESS);
initViews(); initViews();
} }
@ -118,6 +124,15 @@ public class ApplySuperviseActivity extends BaseActivity {
.withBoolean("isSingle", false) .withBoolean("isSingle", false)
.navigation(mActivity, 13)); .navigation(mActivity, 13));
mBtnConfirm.setOnClickListener(v -> doConfirm()); mBtnConfirm.setOnClickListener(v -> doConfirm());
mEtRequest.addTextChangedListener(new TextChange() {
@Override
public void afterTextChanged(Editable s) {
int length = s.toString().length();
mTvContentHint.setText(length + "/" + mReasonMax);
}
});
AstrictLengthFilter filter = new AstrictLengthFilter(mReasonMax);
mEtRequest.setFilters(new InputFilter[]{filter});
} }
/** /**

2
oamodule/src/main/java/com/tenlionsoft/oamodule/activity/supervise/SuperviseDetailActivity.java
View File

@ -12,7 +12,6 @@ import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager;
import com.tenlionsoft.baselib.core.retrofit_net.conver.RxTransformer; import com.tenlionsoft.baselib.core.retrofit_net.conver.RxTransformer;
import com.tenlionsoft.baselib.core.widget.base.BaseActivity; import com.tenlionsoft.baselib.core.widget.base.BaseActivity;
import com.tenlionsoft.baselib.utils.ExceptionHandler; import com.tenlionsoft.baselib.utils.ExceptionHandler;
import com.tenlionsoft.baselib.utils.UserLgUtils;
import com.tenlionsoft.oamodule.R; import com.tenlionsoft.oamodule.R;
import com.tenlionsoft.oamodule.R2; import com.tenlionsoft.oamodule.R2;
import com.tenlionsoft.oamodule.beans.SuperviseBean; import com.tenlionsoft.oamodule.beans.SuperviseBean;
@ -67,6 +66,7 @@ public class SuperviseDetailActivity extends BaseActivity {
public void initData() { public void initData() {
ButterKnife.bind(this); ButterKnife.bind(this);
mTvBaseTitle.setText("督办详情"); mTvBaseTitle.setText("督办详情");
mRlTitleBar.setBackgroundColor(getResources().getColor(R.color.gray_f8));
mId = getIntent().getStringExtra("id"); mId = getIntent().getStringExtra("id");
mUserId = getIntent().getStringExtra("userId"); mUserId = getIntent().getStringExtra("userId");
if (!TextUtils.isEmpty(mUserId)) { if (!TextUtils.isEmpty(mUserId)) {

46
oamodule/src/main/res/layout/activity_apply_supervise.xml
View File

@ -1,9 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/gray_f0" android:background="@color/gray_f2"
android:orientation="vertical"> android:orientation="vertical">
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
@ -16,13 +15,13 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/gray_f8"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/gray_f8"
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="10dp" android:paddingTop="10dp"
android:paddingBottom="10dp"> android:paddingBottom="10dp">
@ -65,7 +64,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:clickable="true" android:clickable="true"
android:drawableRight="@drawable/ic_arrow_right" android:drawableRight="@drawable/ic_arrow_right_24"
android:drawablePadding="5dp"
android:focusable="true" android:focusable="true"
android:gravity="right" android:gravity="right"
android:hint="请选择督办类型" android:hint="请选择督办类型"
@ -89,7 +89,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:clickable="true" android:clickable="true"
android:drawableRight="@drawable/ic_arrow_right" android:drawableRight="@drawable/ic_arrow_right_24"
android:drawablePadding="5dp"
android:focusable="true" android:focusable="true"
android:gravity="right" android:gravity="right"
android:hint="前选择督办时限" android:hint="前选择督办时限"
@ -114,7 +115,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:clickable="true" android:clickable="true"
android:drawableRight="@drawable/ic_arrow_right" android:drawableRight="@drawable/ic_arrow_right_24"
android:drawablePadding="5dp"
android:focusable="true" android:focusable="true"
android:gravity="right" android:gravity="right"
android:hint="请选择关联事项" android:hint="请选择关联事项"
@ -138,7 +140,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:clickable="true" android:clickable="true"
android:drawableRight="@drawable/ic_arrow_right" android:drawableRight="@drawable/ic_arrow_right_24"
android:drawablePadding="5dp"
android:focusable="true" android:focusable="true"
android:gravity="right" android:gravity="right"
android:hint="请选择督办人员" android:hint="请选择督办人员"
@ -153,8 +156,10 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:background="@color/gray_f8"
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="5dp" android:paddingTop="10dp"
android:paddingBottom="10dp"> android:paddingBottom="10dp">
<LinearLayout style="@style/item_ver"> <LinearLayout style="@style/item_ver">
@ -170,8 +175,8 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginTop="10dp"
android:background="@drawable/shp_rectangle_gray" android:background="@drawable/shp_rectangle_gray_df"
android:orientation="vertical"> android:orientation="vertical">
<EditText <EditText
@ -183,18 +188,19 @@
android:gravity="left" android:gravity="left"
android:hint="请输入督办内容" android:hint="请输入督办内容"
android:minLines="3" android:minLines="3"
android:padding="5dp" android:padding="10dp"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="14sp" /> android:textSize="@dimen/text_14" />
<TextView <TextView
android:id="@+id/tv_request_num" android:id="@+id/tv_content_hint"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="right" android:layout_gravity="right"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp"
tools:text="0/140" /> android:text="0/140"
android:textSize="@dimen/text_14" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@ -203,9 +209,9 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:layout_marginTop="8dp"
android:paddingTop="10dp" android:background="@color/gray_f8"
android:paddingBottom="10dp"> android:orientation="vertical">
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
@ -233,7 +239,8 @@
android:drawableLeft="@drawable/sel_checkbox_blue_gray" android:drawableLeft="@drawable/sel_checkbox_blue_gray"
android:drawablePadding="5dp" android:drawablePadding="5dp"
android:padding="5dp" android:padding="5dp"
android:text="短信" /> android:text="短信"
android:textColor="@color/col_blue_gray" />
<CheckBox <CheckBox
android:id="@+id/cb_notice_email" android:id="@+id/cb_notice_email"
@ -244,7 +251,8 @@
android:drawableLeft="@drawable/sel_checkbox_blue_gray" android:drawableLeft="@drawable/sel_checkbox_blue_gray"
android:drawablePadding="5dp" android:drawablePadding="5dp"
android:padding="5dp" android:padding="5dp"
android:text="邮件" /> android:text="邮件"
android:textColor="@color/col_blue_gray" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

19
oamodule/src/main/res/layout/activity_supervise.xml
View File

@ -66,14 +66,14 @@
android:paddingRight="10dp" android:paddingRight="10dp"
android:paddingBottom="5dp" android:paddingBottom="5dp"
android:text="我监督的" android:text="我监督的"
android:textStyle="bold" /> android:textColor="@color/col_gray_black" />
<RadioButton <RadioButton
android:id="@+id/rb_mine" android:id="@+id/rb_mine"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/switch_custom_gray_white_left" android:background="@drawable/switch_custom_gray_white_right"
android:button="@null" android:button="@null"
android:gravity="center" android:gravity="center"
android:paddingLeft="10dp" android:paddingLeft="10dp"
@ -81,7 +81,7 @@
android:paddingRight="10dp" android:paddingRight="10dp"
android:paddingBottom="5dp" android:paddingBottom="5dp"
android:text="监督我的" android:text="监督我的"
android:textStyle="bold" /> android:textColor="@color/col_gray_black" />
</RadioGroup> </RadioGroup>
@ -110,7 +110,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_marginTop="3dp" android:layout_marginTop="9dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
@ -130,13 +130,13 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:clickable="true" android:clickable="true"
android:drawableLeft="@drawable/ic_arrow_cir" android:drawableLeft="@drawable/ic_date_title_icon"
android:focusable="true" android:focusable="true"
android:gravity="center" android:gravity="center"
android:hint="开始日期" android:hint="开始日期"
android:padding="5dp" android:padding="5dp"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="12sp" /> android:textSize="@dimen/text_14" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -155,7 +155,7 @@
android:hint="结束日期" android:hint="结束日期"
android:padding="5dp" android:padding="5dp"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="12sp" /> android:textSize="@dimen/text_14" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@ -164,7 +164,7 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="5dp"> android:layout_marginTop="16dp">
<com.scwang.smart.refresh.layout.SmartRefreshLayout <com.scwang.smart.refresh.layout.SmartRefreshLayout
android:id="@+id/srl_content" android:id="@+id/srl_content"
@ -177,7 +177,8 @@
android:id="@+id/rlv_content" android:id="@+id/rlv_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/white" /> android:background="@color/white"
tools:listitem="@layout/item_supervice" />
</com.scwang.smart.refresh.layout.SmartRefreshLayout> </com.scwang.smart.refresh.layout.SmartRefreshLayout>
<LinearLayout <LinearLayout

21
oamodule/src/main/res/layout/activity_supervise_detail.xml
View File

@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/gray_f0" android:background="@color/gray_f2"
android:orientation="vertical"> android:orientation="vertical">
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
@ -14,13 +14,14 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/gray_f8"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/gray_f8"
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="10dp" android:paddingTop="10dp"
android:paddingBottom="10dp"> android:paddingBottom="10dp">
@ -148,7 +149,8 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginTop="8dp"
android:background="@color/gray_f8"
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="5dp" android:paddingTop="5dp"
android:paddingBottom="10dp"> android:paddingBottom="10dp">
@ -167,7 +169,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:background="@drawable/shp_rectangle_gray" android:background="@drawable/shp_rectangle_gray_df"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
@ -191,9 +193,9 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:layout_marginTop="8dp"
android:paddingTop="10dp" android:background="@color/gray_f8"
android:paddingBottom="10dp"> android:orientation="vertical">
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
@ -245,7 +247,8 @@
android:id="@+id/ll_repect" android:id="@+id/ll_repect"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginTop="8dp"
android:background="@color/gray_f8"
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="10dp" android:paddingTop="10dp"
android:paddingBottom="10dp"> android:paddingBottom="10dp">
@ -264,7 +267,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:background="@drawable/shp_rectangle_gray" android:background="@drawable/shp_rectangle_gray_df"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView

15
oamodule/src/main/res/layout/item_supervice.xml
View File

@ -3,11 +3,10 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="3dp" android:layout_marginLeft="10dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginRight="3dp" android:layout_marginRight="10dp"
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp"
android:background="@color/white"
android:orientation="vertical" android:orientation="vertical"
android:padding="5dp"> android:padding="5dp">
@ -21,7 +20,8 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:textColor="@color/black" android:textColor="@color/black_10"
android:textSize="@dimen/text_16"
tools:text="督办名称" /> tools:text="督办名称" />
<TextView <TextView
@ -38,7 +38,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginTop="6dp"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
@ -48,6 +48,7 @@
android:layout_weight="1" android:layout_weight="1"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:textSize="@dimen/text_14"
tools:text="督办内容" /> tools:text="督办内容" />
<TextView <TextView
@ -57,6 +58,7 @@
android:layout_weight="1" android:layout_weight="1"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:textSize="@dimen/text_14"
tools:text="完成时限" /> tools:text="完成时限" />
<TextView <TextView
@ -65,7 +67,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:text="状态" android:text="状态"
android:textColor="@color/text_blue" /> android:textColor="@color/text_blue"
android:textSize="@dimen/text_14" />
</LinearLayout> </LinearLayout>