diff --git a/baselib/src/main/res/color/col_gray_black.xml b/baselib/src/main/res/color/col_gray_black.xml
new file mode 100644
index 0000000..14bbd4a
--- /dev/null
+++ b/baselib/src/main/res/color/col_gray_black.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/supervise/ApplySuperviseActivity.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/supervise/ApplySuperviseActivity.java
index 87dc4d5..93a984c 100644
--- a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/supervise/ApplySuperviseActivity.java
+++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/supervise/ApplySuperviseActivity.java
@@ -3,6 +3,8 @@ package com.tenlionsoft.oamodule.activity.supervise;
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.widget.Button;
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.retrofit_net.RetrofitManager;
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.interfaces.TextChange;
import com.tenlionsoft.baselib.utils.ExceptionHandler;
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.SaveSuperviseBean;
@@ -66,14 +69,14 @@ public class ApplySuperviseActivity extends BaseActivity {
TextView mTvUsers;
@BindView(R2.id.et_request)
EditText mEtRequest;
- @BindView(R2.id.tv_request_num)
- TextView mTvRequestNum;
@BindView(R2.id.cb_notice_msg)
CheckBox mCbNoticeMsg;
@BindView(R2.id.cb_notice_email)
CheckBox mCbNoticeEmail;
@BindView(R2.id.btn_confirm)
Button mBtnConfirm;
+ @BindView(R2.id.tv_content_hint)
+ TextView mTvContentHint;
private OptionsPickerView mTypePicker;
@@ -83,6 +86,8 @@ public class ApplySuperviseActivity extends BaseActivity {
private String mUserNames;
private SuperviseRelevanceOptionsListBean.RowsBean mSelRelevance;
+ private final int mReasonMax = 140;
+
@Override
protected int setLayoutId() {
return R.layout.activity_apply_supervise;
@@ -92,6 +97,7 @@ public class ApplySuperviseActivity extends BaseActivity {
public void initData() {
ButterKnife.bind(this);
mTvBaseTitle.setText("发起督办");
+ mRlTitleBar.setBackgroundColor(getResources().getColor(R.color.gray_f8));
refreshView(STATE_LOAD_SUCCESS);
initViews();
}
@@ -118,6 +124,15 @@ public class ApplySuperviseActivity extends BaseActivity {
.withBoolean("isSingle", false)
.navigation(mActivity, 13));
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});
}
/**
diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/supervise/SuperviseDetailActivity.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/supervise/SuperviseDetailActivity.java
index b7a72d5..3838369 100644
--- a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/supervise/SuperviseDetailActivity.java
+++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/supervise/SuperviseDetailActivity.java
@@ -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.widget.base.BaseActivity;
import com.tenlionsoft.baselib.utils.ExceptionHandler;
-import com.tenlionsoft.baselib.utils.UserLgUtils;
import com.tenlionsoft.oamodule.R;
import com.tenlionsoft.oamodule.R2;
import com.tenlionsoft.oamodule.beans.SuperviseBean;
@@ -67,6 +66,7 @@ public class SuperviseDetailActivity extends BaseActivity {
public void initData() {
ButterKnife.bind(this);
mTvBaseTitle.setText("督办详情");
+ mRlTitleBar.setBackgroundColor(getResources().getColor(R.color.gray_f8));
mId = getIntent().getStringExtra("id");
mUserId = getIntent().getStringExtra("userId");
if (!TextUtils.isEmpty(mUserId)) {
diff --git a/oamodule/src/main/res/layout/activity_apply_supervise.xml b/oamodule/src/main/res/layout/activity_apply_supervise.xml
index 1ffbab9..10a4675 100644
--- a/oamodule/src/main/res/layout/activity_apply_supervise.xml
+++ b/oamodule/src/main/res/layout/activity_apply_supervise.xml
@@ -1,9 +1,8 @@
@@ -65,7 +64,8 @@
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="请选择督办类型"
@@ -89,7 +89,8 @@
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="前选择督办时限"
@@ -114,7 +115,8 @@
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="请选择关联事项"
@@ -138,7 +140,8 @@
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="请选择督办人员"
@@ -153,8 +156,10 @@
@@ -170,8 +175,8 @@
+ android:textSize="@dimen/text_14" />
+ android:text="0/140"
+ android:textSize="@dimen/text_14" />
@@ -203,9 +209,9 @@
+ android:layout_marginTop="8dp"
+ android:background="@color/gray_f8"
+ android:orientation="vertical">
@@ -233,7 +239,8 @@
android:drawableLeft="@drawable/sel_checkbox_blue_gray"
android:drawablePadding="5dp"
android:padding="5dp"
- android:text="短信" />
+ android:text="短信"
+ android:textColor="@color/col_blue_gray" />
+ android:text="邮件"
+ android:textColor="@color/col_blue_gray" />
diff --git a/oamodule/src/main/res/layout/activity_supervise.xml b/oamodule/src/main/res/layout/activity_supervise.xml
index c564cbb..f2d9574 100644
--- a/oamodule/src/main/res/layout/activity_supervise.xml
+++ b/oamodule/src/main/res/layout/activity_supervise.xml
@@ -66,14 +66,14 @@
android:paddingRight="10dp"
android:paddingBottom="5dp"
android:text="我监督的"
- android:textStyle="bold" />
+ android:textColor="@color/col_gray_black" />
+ android:textColor="@color/col_gray_black" />
@@ -110,7 +110,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
- android:layout_marginTop="3dp"
+ android:layout_marginTop="9dp"
android:layout_marginRight="5dp"
android:gravity="center_vertical"
android:orientation="horizontal"
@@ -130,13 +130,13 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:clickable="true"
- android:drawableLeft="@drawable/ic_arrow_cir"
+ android:drawableLeft="@drawable/ic_date_title_icon"
android:focusable="true"
android:gravity="center"
android:hint="开始日期"
android:padding="5dp"
android:textColor="@color/black"
- android:textSize="12sp" />
+ android:textSize="@dimen/text_14" />
+ android:textSize="@dimen/text_14" />
@@ -164,7 +164,7 @@
+ android:layout_marginTop="16dp">
+ android:background="@color/white"
+ tools:listitem="@layout/item_supervice" />
@@ -148,7 +149,8 @@
@@ -167,7 +169,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">
+ android:layout_marginTop="8dp"
+ android:background="@color/gray_f8"
+ android:orientation="vertical">
@@ -245,7 +247,8 @@
android:id="@+id/ll_repect"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
+ android:layout_marginTop="8dp"
+ android:background="@color/gray_f8"
android:orientation="vertical"
android:paddingTop="10dp"
android:paddingBottom="10dp">
@@ -264,7 +267,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">
@@ -21,7 +20,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:textColor="@color/black"
+ android:textColor="@color/black_10"
+ android:textSize="@dimen/text_16"
tools:text="督办名称" />
+ android:textColor="@color/text_blue"
+ android:textSize="@dimen/text_14" />