From e06d0a0b6fffdd98a9cbf052328ba9792e69c279 Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 31 May 2022 15:36:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E9=A1=B5=E9=9D=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/drawable-xhdpi/ic_doc_item_icon.png | Bin 0 -> 211 bytes .../res/layout/item_apply_service_photo.xml | 2 +- .../mainmodule/base/MainTabActivity.java | 6 +-- .../document/DocumentAddActivity.java | 34 +++++++++++-- .../document/DocumentDetailActivity.java | 1 + .../document/DocumentEditActivity.java | 2 +- .../main/res/layout/activity_document_add.xml | 46 ++++++++++++++---- .../res/layout/activity_document_detail.xml | 21 ++++++-- .../res/layout/activity_document_edit.xml | 27 +++++++--- .../src/main/res/layout/fragment_mine.xml | 2 +- .../main/res/layout/fragment_oa_document.xml | 11 ++--- .../src/main/res/layout/fragment_oa_email.xml | 4 +- 12 files changed, 118 insertions(+), 38 deletions(-) create mode 100644 baselib/src/main/res/drawable-xhdpi/ic_doc_item_icon.png diff --git a/baselib/src/main/res/drawable-xhdpi/ic_doc_item_icon.png b/baselib/src/main/res/drawable-xhdpi/ic_doc_item_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5f54a85647682302ac50eff42697caf653c28b4b GIT binary patch literal 211 zcmV;^04)EBP)xN#0000&P)t-s@$vER z@9)^y*zWG`+S=OZ=jZM1?bg=T=;-Li#>VC4<=x%g(9qEA?Cj#=;@8*L-rnBJ%gf*2 z-|6Y;%*@Qm$;n3EQhxvd08B|lK~#90&CfRyfG`jQLG3wthxz|k$xuQFRZQ5~xSwYB zfGKGRyH*XlaO9bNCyL|1jY5&T)N*1jY^?~1-w1voz{YHV;}14o=>l`J0mMbO-5US^ N002ovPDHLkV1gi-Y{viq literal 0 HcmV?d00001 diff --git a/baselib/src/main/res/layout/item_apply_service_photo.xml b/baselib/src/main/res/layout/item_apply_service_photo.xml index ee57dbb..b980e12 100755 --- a/baselib/src/main/res/layout/item_apply_service_photo.xml +++ b/baselib/src/main/res/layout/item_apply_service_photo.xml @@ -41,6 +41,6 @@ android:layout_alignParentTop="true" android:layout_alignParentRight="true" android:scaleType="fitXY" - android:src="@drawable/ic_delete" /> + android:src="@drawable/ic_close_no_cir" /> \ No newline at end of file diff --git a/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java b/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java index 58df8ff..67302b4 100644 --- a/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java +++ b/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java @@ -275,7 +275,7 @@ public class MainTabActivity extends BaseActivity { mVpContent.setCurrentItem(1, false); ImmersionBar.with(this) - .statusBarColor(R.color.gray_f0) + .statusBarColor(R.color.gray_f8) .statusBarDarkFont(true) .titleBar(mVStatusBar) .init(); @@ -299,7 +299,7 @@ public class MainTabActivity extends BaseActivity { mVStatusBar.setVisibility(View.VISIBLE); ImmersionBar.with(this) - .statusBarColor(R.color.gray_f0) + .statusBarColor(R.color.gray_f8) .statusBarDarkFont(true) .titleBar(mVStatusBar) .init(); @@ -322,7 +322,7 @@ public class MainTabActivity extends BaseActivity { mVStatusBar.setVisibility(View.VISIBLE); ImmersionBar.with(this) - .statusBarColor(R.color.gray_f0) + .statusBarColor(R.color.gray_f8) .statusBarDarkFont(true) .titleBar(mVStatusBar) .init(); diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/document/DocumentAddActivity.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/document/DocumentAddActivity.java index 86c73e4..b44290d 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/document/DocumentAddActivity.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/document/DocumentAddActivity.java @@ -3,6 +3,8 @@ package com.tenlionsoft.oamodule.activity.document; 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.EditText; @@ -24,12 +26,13 @@ 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.UIUtil; -import com.tenlionsoft.baselib.utils.UserLgUtils; import com.tenlionsoft.oamodule.R; import com.tenlionsoft.oamodule.R2; import com.tenlionsoft.oamodule.beans.DocTypeBean; @@ -43,7 +46,6 @@ import java.util.ArrayList; import java.util.List; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import butterknife.BindView; @@ -78,6 +80,10 @@ public class DocumentAddActivity extends BaseActivity { Button mBtnConfirm; @BindView(R2.id.tv_file_type) TextView mTvFileType; + @BindView(R2.id.tv_summary_hint) + TextView mTvSummaryHint; + @BindView(R2.id.tv_remark_hint) + TextView mTvRemarkHint; private Unbinder mBind; private String mDocType = "文件"; private OptionsPickerView mDataSourcePicker; @@ -90,7 +96,7 @@ public class DocumentAddActivity extends BaseActivity { private List mFileTypeList; private OptionsPickerView mFileTypePicker; - + private final int mMaxInput = 140; @Override protected int setLayoutId() { @@ -101,6 +107,7 @@ public class DocumentAddActivity extends BaseActivity { public void initData() { mBind = ButterKnife.bind(this); mTvBaseTitle.setText("文档上传"); + mRlTitleBar.setBackgroundColor(getResources().getColor(R.color.gray_f8)); refreshView(STATE_LOAD_SUCCESS); initViews(); } @@ -151,6 +158,27 @@ public class DocumentAddActivity extends BaseActivity { mBtnConfirm.setOnClickListener(v -> doSave()); mTvFileType.setOnClickListener(v -> onShowFileType()); mTvFileType.setText(mDocType); + + mEtSummary.addTextChangedListener(new TextChange() { + @Override + public void afterTextChanged(Editable s) { + int length = s.toString().length(); + mTvSummaryHint.setText(length + "/" + mMaxInput); + } + }); + AstrictLengthFilter filter = new AstrictLengthFilter(mMaxInput); + mEtSummary.setFilters(new InputFilter[]{filter}); + + mEtRemark.addTextChangedListener(new TextChange() { + @Override + public void afterTextChanged(Editable s) { + int length = s.toString().length(); + mTvRemarkHint.setText(length + "/" + mMaxInput); + } + }); + AstrictLengthFilter filter2 = new AstrictLengthFilter(mMaxInput); + mEtRemark.setFilters(new InputFilter[]{filter2}); + } @Override diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/document/DocumentDetailActivity.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/document/DocumentDetailActivity.java index d796a0c..3b3d044 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/document/DocumentDetailActivity.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/document/DocumentDetailActivity.java @@ -91,6 +91,7 @@ public class DocumentDetailActivity extends BaseActivity { public void initData() { mBind = ButterKnife.bind(this); mTvBaseTitle.setText("文档详情"); + mRlTitleBar.setBackgroundColor(getResources().getColor(R.color.gray_f8)); mId = getIntent().getStringExtra("id"); mType = getIntent().getStringExtra("type"); if (TextUtils.isEmpty(mId)) { diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/document/DocumentEditActivity.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/document/DocumentEditActivity.java index 2fd0e82..daa65b1 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/document/DocumentEditActivity.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/document/DocumentEditActivity.java @@ -32,7 +32,6 @@ import com.tenlionsoft.baselib.utils.ExceptionHandler; import com.tenlionsoft.baselib.utils.FileUtils; import com.tenlionsoft.baselib.utils.LogUtils; 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.DocTypeBean; @@ -104,6 +103,7 @@ public class DocumentEditActivity extends BaseActivity { public void initData() { ButterKnife.bind(this); mTvBaseTitle.setText("文档编辑"); + mRlTitleBar.setBackgroundColor(getResources().getColor(R.color.gray_f8)); mId = getIntent().getStringExtra("id"); initViews(); if (TextUtils.isEmpty(mId)) { diff --git a/oamodule/src/main/res/layout/activity_document_add.xml b/oamodule/src/main/res/layout/activity_document_add.xml index b83c73e..a5de7a5 100644 --- a/oamodule/src/main/res/layout/activity_document_add.xml +++ b/oamodule/src/main/res/layout/activity_document_add.xml @@ -3,8 +3,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" - tools:context=".activity.document.DocumentAddActivity"> + android:background="@color/gray_f8" + android:orientation="vertical"> @@ -33,7 +35,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="请选择文档类型" @@ -47,6 +50,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" + android:drawableLeft="@drawable/ic_doc_item_icon" + android:drawablePadding="5dp" android:text="文件类型" android:textColor="@color/black" android:textSize="14sp" /> @@ -57,7 +62,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="请选择文件类型" @@ -71,6 +77,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" + android:drawableLeft="@drawable/ic_doc_item_icon" + android:drawablePadding="5dp" android:text="文档文件" android:textColor="@color/black" android:textSize="14sp" /> @@ -97,6 +105,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" + android:drawableLeft="@drawable/ic_doc_item_icon" + android:drawablePadding="5dp" android:text="文件说明" android:textColor="@color/black" android:textSize="14sp" /> @@ -105,7 +115,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"> + + @@ -129,6 +147,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" + android:drawableLeft="@drawable/ic_doc_item_icon" + android:drawablePadding="5dp" android:text="备注" android:textColor="@color/black" android:textSize="14sp" /> @@ -137,7 +157,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"> + + @@ -165,7 +193,7 @@ android:layout_alignParentBottom="true" android:layout_margin="10dp" android:background="@drawable/sel_btn_submit" - android:text="上传" + android:text="确认上传" android:textColor="@color/col_white_gray_press" /> \ No newline at end of file diff --git a/oamodule/src/main/res/layout/activity_document_detail.xml b/oamodule/src/main/res/layout/activity_document_detail.xml index 6a8152f..4d6c829 100644 --- a/oamodule/src/main/res/layout/activity_document_detail.xml +++ b/oamodule/src/main/res/layout/activity_document_detail.xml @@ -3,6 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/gray_f8" android:orientation="vertical" tools:context=".activity.document.DocumentAddActivity"> @@ -24,6 +25,8 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:text="文档类型" + android:drawableLeft="@drawable/ic_doc_item_icon" + android:drawablePadding="5dp" android:textColor="@color/black" android:textSize="14sp" /> @@ -47,6 +50,8 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:text="文件类型" + android:drawableLeft="@drawable/ic_doc_item_icon" + android:drawablePadding="5dp" android:textColor="@color/black" android:textSize="14sp" /> @@ -71,13 +76,15 @@ android:layout_gravity="center_vertical" android:text="文档文件" android:textColor="@color/black" + android:drawableLeft="@drawable/ic_doc_item_icon" + android:drawablePadding="5dp" android:textSize="14sp" /> @@ -128,6 +137,8 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:text="备注" + android:drawableLeft="@drawable/ic_doc_item_icon" + android:drawablePadding="5dp" android:textColor="@color/black" android:textSize="14sp" /> @@ -135,7 +146,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_document_edit.xml b/oamodule/src/main/res/layout/activity_document_edit.xml index a9829fe..94205d1 100644 --- a/oamodule/src/main/res/layout/activity_document_edit.xml +++ b/oamodule/src/main/res/layout/activity_document_edit.xml @@ -3,6 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/gray_f8" android:orientation="vertical" tools:context=".activity.document.DocumentAddActivity"> @@ -23,6 +24,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" + android:drawableLeft="@drawable/ic_doc_item_icon" + android:drawablePadding="5dp" android:text="文档类型" android:textColor="@color/black" android:textSize="14sp" /> @@ -33,7 +36,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="请选择文档类型" @@ -47,6 +51,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" + android:drawableLeft="@drawable/ic_doc_item_icon" + android:drawablePadding="5dp" android:text="文件类型" android:textColor="@color/black" android:textSize="14sp" /> @@ -57,7 +63,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="请选择文件类型" @@ -71,6 +78,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" + android:drawableLeft="@drawable/ic_doc_item_icon" + android:drawablePadding="5dp" android:text="文档文件" android:textColor="@color/black" android:textSize="14sp" /> @@ -79,7 +88,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"> @@ -105,7 +116,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"> @@ -129,6 +140,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" + android:drawableLeft="@drawable/ic_doc_item_icon" + android:drawablePadding="5dp" android:text="备注" android:textColor="@color/black" android:textSize="14sp" /> @@ -137,7 +150,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/fragment_mine.xml b/oamodule/src/main/res/layout/fragment_mine.xml index dc2606d..bde3407 100644 --- a/oamodule/src/main/res/layout/fragment_mine.xml +++ b/oamodule/src/main/res/layout/fragment_mine.xml @@ -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_f8" android:orientation="vertical">