文档页面修改

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" />
 
 </RelativeLayout>

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();

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<DicBean> mFileTypeList;
     private OptionsPickerView<DicBean> 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

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

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

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"
+    android:background="@color/gray_f8"
-    tools:context=".activity.document.DocumentAddActivity">
+    android:orientation="vertical">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -23,6 +23,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 +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">
 
                     <EditText
@@ -117,9 +127,17 @@
                         android:gravity="left"
                         android:hint="请输入文件说明"
                         android:minLines="3"
-                        android:padding="5dp"
+                        android:padding="10dp"
                         android:textColor="@color/black"
                         android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/tv_summary_hint"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="right|center_vertical"
+                        android:paddingRight="10dp"
+                        android:text="0/140" />
                 </LinearLayout>
             </LinearLayout>
 
@@ -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">
 
                     <EditText
@@ -149,9 +169,17 @@
                         android:gravity="left"
                         android:hint="请输入备注"
                         android:minLines="3"
-                        android:padding="5dp"
+                        android:padding="10dp"
                         android:textColor="@color/black"
                         android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/tv_remark_hint"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="right|center_vertical"
+                        android:paddingRight="10dp"
+                        android:text="0/140" />
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
@@ -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" />
 
 </RelativeLayout>

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" />
 
                 <RelativeLayout
                     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
@@ -97,13 +104,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" />
 
                 <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">
 
                     <TextView
@@ -115,7 +124,7 @@
                         android:gravity="left"
                         android:hint="未录入"
                         android:minLines="3"
-                        android:padding="5dp"
+                        android:padding="10dp"
                         android:textColor="@color/black"
                         android:textSize="14sp" />
                 </LinearLayout>
@@ -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">
 
                     <TextView
@@ -147,7 +158,7 @@
                         android:gravity="left"
                         android:hint="未录入"
                         android:minLines="3"
-                        android:padding="5dp"
+                        android:padding="10dp"
                         android:textColor="@color/black"
                         android:textSize="14sp" />
                 </LinearLayout>

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">
 
                     <androidx.recyclerview.widget.RecyclerView
@@ -97,6 +106,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 +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">
 
                     <EditText
@@ -117,7 +128,7 @@
                         android:gravity="left"
                         android:hint="请输入文件说明"
                         android:minLines="3"
-                        android:padding="5dp"
+                        android:padding="10dp"
                         android:textColor="@color/black"
                         android:textSize="14sp" />
                 </LinearLayout>
@@ -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">
 
                     <EditText
@@ -149,7 +162,7 @@
                         android:gravity="left"
                         android:hint="请输入备注"
                         android:minLines="3"
-                        android:padding="5dp"
+                        android:padding="10dp"
                         android:textColor="@color/black"
                         android:textSize="14sp" />
                 </LinearLayout>

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

oamodule/src/main/res/layout/fragment_oa_document.xml

@@ -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_f8"
     android:orientation="vertical">
 
     <RelativeLayout
@@ -20,7 +20,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:background="#eeeeee"
             android:drawableRight="@drawable/ic_arrow_down_solid"
             android:drawablePadding="5dp"
             android:gravity="center_vertical"
@@ -44,7 +43,7 @@
     <RadioGroup
         android:id="@+id/rg_type"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="32dp"
         android:layout_marginLeft="10dp"
         android:layout_marginTop="10dp"
         android:layout_marginRight="10dp"
@@ -53,7 +52,7 @@
         <RadioButton
             android:id="@+id/rb_pri"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_weight="1"
             android:background="@drawable/switch_custom_gray_white_left"
             android:button="@null"
@@ -65,7 +64,7 @@
         <RadioButton
             android:id="@+id/rb_share"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_weight="1"
             android:background="@drawable/switch_custom_gray_white_center"
             android:button="@null"
@@ -76,7 +75,7 @@
         <RadioButton
             android:id="@+id/rb_pub"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_weight="1"
             android:background="@drawable/switch_custom_gray_white_right"
             android:button="@null"

oamodule/src/main/res/layout/fragment_oa_email.xml

@@ -3,14 +3,14 @@
     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">
 
     <RelativeLayout
         android:id="@+id/rl_title"
         android:layout_width="match_parent"
         android:layout_height="50dp"
-        android:background="@color/gray_f0"
+        android:background="@color/gray_f8"
         android:paddingLeft="10dp"
         android:paddingRight="10dp">