From 1714c9fe9e7b210e09f76cc4af1d153061291f06 Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 31 May 2022 14:30:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=B8=B8=E5=B7=A5=E4=BD=9C=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tenlionsoft/baselib/utils/TimeUtils.java | 2 +- .../routine/ApplyRoutineWorkActivity.java | 34 +++- .../routine/RoutineRestoreActivity.java | 8 +- .../routine/RoutineWorkDetailActivity.java | 176 ++++++++++++++---- .../layout/activity_apply_routine_work.xml | 36 ++-- .../res/layout/activity_meeting_center.xml | 3 + .../res/layout/activity_routine_restore.xml | 5 +- .../main/res/layout/activity_routine_work.xml | 12 +- .../layout/activity_routine_work_detail.xml | 36 ++-- oamodule/src/main/res/layout/item_routine.xml | 116 ++++++------ 10 files changed, 281 insertions(+), 147 deletions(-) diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/utils/TimeUtils.java b/baselib/src/main/java/com/tenlionsoft/baselib/utils/TimeUtils.java index f48efe6..71e4b8d 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/utils/TimeUtils.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/utils/TimeUtils.java @@ -826,7 +826,7 @@ public final class TimeUtils { public static String timeTranDate(String date) { if (TextUtils.isEmpty(date)) return ""; String substring = date.substring(0, 10); - return substring; + return substring.replaceAll("-", "."); } /** diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/routine/ApplyRoutineWorkActivity.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/routine/ApplyRoutineWorkActivity.java index 3e33377..1989187 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/routine/ApplyRoutineWorkActivity.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/routine/ApplyRoutineWorkActivity.java @@ -3,6 +3,8 @@ package com.tenlionsoft.oamodule.activity.routine; 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; @@ -25,13 +27,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.beans.ChoosePersonListBean; @@ -46,7 +49,7 @@ import java.util.List; import androidx.annotation.Nullable; import androidx.appcompat.widget.SwitchCompat; -import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import butterknife.BindView; import butterknife.ButterKnife; @@ -101,6 +104,7 @@ public class ApplyRoutineWorkActivity extends BaseActivity { private String[] fileFilter = new String[]{".doc", ".docx", ".xls", ".xlsx", ".pptx", ".ppt", ".txt", ".pdf"}; private ChoosePersonListBean mSelUndertake; private String mIds; + private final int mMaxInput = 140; @Override protected int setLayoutId() { @@ -111,6 +115,7 @@ public class ApplyRoutineWorkActivity extends BaseActivity { public void initData() { ButterKnife.bind(this); mTvBaseTitle.setText("发起工作"); + mRlTitleBar.setBackgroundColor(getResources().getColor(R.color.gray_f8)); refreshView(STATE_LOAD_SUCCESS); initViews(); } @@ -148,10 +153,29 @@ public class ApplyRoutineWorkActivity extends BaseActivity { mAddFileAdapter.notifyDataSetChanged(); ++mFileMax; }); - mRlvFiles.setLayoutManager(new GridLayoutManager(mActivity, 4)); + mRlvFiles.setLayoutManager(new LinearLayoutManager(mActivity)); mRlvFiles.setAdapter(mAddFileAdapter); mBtnConfirm.setOnClickListener(v -> doConfirm()); + mEtRequest.addTextChangedListener(new TextChange() { + @Override + public void afterTextChanged(Editable s) { + int length = s.toString().length(); + mTvRequestNum.setText(length + "/" + mMaxInput); + } + }); + AstrictLengthFilter filter = new AstrictLengthFilter(mMaxInput); + mEtRequest.setFilters(new InputFilter[]{filter}); + + mEtRemark.addTextChangedListener(new TextChange() { + @Override + public void afterTextChanged(Editable s) { + int length = s.toString().length(); + mTvRemarkNum.setText(length + "/" + mMaxInput); + } + }); + AstrictLengthFilter filter2 = new AstrictLengthFilter(mMaxInput); + mEtRemark.setFilters(new InputFilter[]{filter2}); } @@ -182,7 +206,7 @@ public class ApplyRoutineWorkActivity 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)); long timeSpan = TimeUtils.getTimeSpan(TimeUtils.dateToString2(date), start, TimeConstants.DAY); if (span >= 0) { @@ -191,7 +215,7 @@ public class ApplyRoutineWorkActivity extends BaseActivity { } else { ToastUtils.show("结束时间须大于开始时间"); } - }else{ + } else { ToastUtils.show("请选择开始时间"); } break; diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/routine/RoutineRestoreActivity.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/routine/RoutineRestoreActivity.java index a82332d..68848d5 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/routine/RoutineRestoreActivity.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/routine/RoutineRestoreActivity.java @@ -44,6 +44,7 @@ import java.util.List; import androidx.annotation.Nullable; import androidx.appcompat.widget.SwitchCompat; import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import butterknife.BindView; import butterknife.ButterKnife; @@ -111,6 +112,7 @@ public class RoutineRestoreActivity extends BaseActivity { @Override public void initData() { mBind = ButterKnife.bind(this); + mRlTitleBar.setBackgroundColor(getResources().getColor(R.color.gray_f8)); mTvBaseTitle.setText("日常工作"); mId = getIntent().getStringExtra("id"); mUserId = getIntent().getStringExtra("userId"); @@ -142,10 +144,11 @@ public class RoutineRestoreActivity extends BaseActivity { mAddFileAdapter.notifyDataSetChanged(); ++mFileMax; }); - mRlvRestoreFiles.setLayoutManager(new GridLayoutManager(mActivity, 4)); + mRlvRestoreFiles.setLayoutManager(new LinearLayoutManager(mActivity)); mRlvRestoreFiles.setAdapter(mAddFileAdapter); mBtnConfirm.setOnClickListener(v -> doConfirm()); } + @Override protected void hasManageFileManage() { if (mFileMax == 0) { @@ -160,6 +163,7 @@ public class RoutineRestoreActivity extends BaseActivity { .start(); } } + private boolean checkParams() { String restore = mEtRestore.getText().toString().trim(); if (TextUtils.isEmpty(restore)) { @@ -266,7 +270,7 @@ public class RoutineRestoreActivity extends BaseActivity { if (observable == null) return; requests.add(observable); } - Observable[] observables1 = requests.toArray(new Observable[requests.size()]); + Observable[] observables1 = requests.toArray(new Observable[requests.size()]); Observable.mergeArrayDelayError(observables1) .compose(RxTransformer.getTransformer()) diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/routine/RoutineWorkDetailActivity.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/routine/RoutineWorkDetailActivity.java index f30abed..83bb3e7 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/routine/RoutineWorkDetailActivity.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/routine/RoutineWorkDetailActivity.java @@ -1,5 +1,6 @@ package com.tenlionsoft.oamodule.activity.routine; +import android.app.ProgressDialog; import android.text.Html; import android.text.TextUtils; import android.view.View; @@ -7,15 +8,20 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; +import com.alibaba.android.arouter.launcher.ARouter; +import com.hjq.toast.ToastUtils; import com.tenlionsoft.baselib.constant.PathConfig; import com.tenlionsoft.baselib.core.beans.AddFileBean; 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.bean.FileInfoBean; import com.tenlionsoft.baselib.core.retrofit_net.conver.RxTransformer; +import com.tenlionsoft.baselib.core.widget.base.AddFileAdapter; import com.tenlionsoft.baselib.core.widget.base.BaseActivity; -import com.tenlionsoft.baselib.core.widget.base.ShowFileAdapter; import com.tenlionsoft.baselib.utils.ExceptionHandler; -import com.tenlionsoft.baselib.utils.UserLgUtils; +import com.tenlionsoft.baselib.utils.FileUtils; +import com.tenlionsoft.baselib.utils.UIUtil; import com.tenlionsoft.oamodule.R; import com.tenlionsoft.oamodule.R2; import com.tenlionsoft.oamodule.beans.RoutineAcceptListBean; @@ -26,7 +32,7 @@ import java.util.ArrayList; import java.util.List; import androidx.appcompat.widget.SwitchCompat; -import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import butterknife.BindView; import butterknife.ButterKnife; @@ -34,6 +40,8 @@ import io.reactivex.rxjava3.annotations.NonNull; import io.reactivex.rxjava3.core.Observer; import io.reactivex.rxjava3.disposables.Disposable; +import static com.tenlionsoft.baselib.core.widget.PhotoActivity.TAG_IMGURL; + /** * 作者: Adam * 日期: 2022年04月18日11:32:54 @@ -88,6 +96,7 @@ public class RoutineWorkDetailActivity extends BaseActivity { public void initData() { ButterKnife.bind(this); mTvBaseTitle.setText("工作详情"); + mRlTitleBar.setBackgroundColor(getResources().getColor(R.color.gray_f8)); String id = getIntent().getStringExtra("id"); String userId = getIntent().getStringExtra("userId"); if (TextUtils.isEmpty(userId)) { @@ -143,20 +152,22 @@ public class RoutineWorkDetailActivity extends BaseActivity { mTvRequest.setText(Html.fromHtml(b.getRoutineWorkDTO().getWorkResultReq())); mTvRemark.setText(Html.fromHtml(b.getRoutineWorkDTO().getWorkRemarks())); if (!TextUtils.isEmpty(b.getRoutineWorkDTO().getWorkFiles())) { - List files = new ArrayList<>(); - mTvFileHint.setVisibility(View.GONE); - mRlvFiles.setVisibility(View.VISIBLE); - String[] split = b.getRoutineWorkDTO().getWorkFiles().split(","); - for (int i = 0; i < split.length; i++) { - AddFileBean bean = new AddFileBean(); - bean.setId(split[i]); - bean.setPath(BaseUrlApi.BASE_IMG_URL + split[i]); - bean.setFileType(1); - files.add(bean); - } - ShowFileAdapter adapter = new ShowFileAdapter(mActivity, files); - mRlvFiles.setLayoutManager(new GridLayoutManager(mActivity, 4)); - mRlvFiles.setAdapter(adapter); +// List files = new ArrayList<>(); +// mTvFileHint.setVisibility(View.GONE); +// mRlvFiles.setVisibility(View.VISIBLE); +// String[] split = b.getRoutineWorkDTO().getWorkFiles().split(","); +// for (int i = 0; i < split.length; i++) { +// AddFileBean bean = new AddFileBean(); +// bean.setId(split[i]); +// bean.setPath(BaseUrlApi.BASE_IMG_URL + split[i]); +// bean.setFileType(1); +// files.add(bean); +// } +// AddFileAdapter adapter = new AddFileAdapter(mActivity, files); +// mRlvFiles.setLayoutManager(new LinearLayoutManager(mActivity)); +// mRlvFiles.setAdapter(adapter); + + doGetFileInfo(b.getRoutineWorkDTO().getWorkFiles(), mRlvRestoreFiles); } else { mTvFileHint.setVisibility(View.VISIBLE); mRlvFiles.setVisibility(View.GONE); @@ -167,18 +178,20 @@ public class RoutineWorkDetailActivity extends BaseActivity { if (!TextUtils.isEmpty(b.getFiles())) { mRlvRestoreFiles.setVisibility(View.VISIBLE); mTvRestoreFileHint.setVisibility(View.GONE); - List files = new ArrayList<>(); - String[] split = b.getRoutineWorkDTO().getWorkFiles().split(","); - for (int i = 0; i < split.length; i++) { - AddFileBean bean = new AddFileBean(); - bean.setId(split[i]); - bean.setPath(BaseUrlApi.BASE_IMG_URL + split[i]); - bean.setFileType(1); - files.add(bean); - } - ShowFileAdapter adapter = new ShowFileAdapter(mActivity, files); - mRlvRestoreFiles.setLayoutManager(new GridLayoutManager(mActivity, 4)); - mRlvRestoreFiles.setAdapter(adapter); +// List files = new ArrayList<>(); +// String[] split = b.getRoutineWorkDTO().getWorkFiles().split(","); +// for (int i = 0; i < split.length; i++) { +// AddFileBean bean = new AddFileBean(); +// bean.setId(split[i]); +// bean.setPath(BaseUrlApi.BASE_IMG_URL + split[i]); +// bean.setFileType(1); +// files.add(bean); +// } +// AddFileAdapter adapter = new AddFileAdapter(mActivity, files); +// mRlvRestoreFiles.setLayoutManager(new LinearLayoutManager(mActivity)); +// mRlvRestoreFiles.setAdapter(adapter); + + doGetFileInfo(b.getFiles(), mRlvRestoreFiles); } else { mRlvRestoreFiles.setVisibility(View.GONE); mTvRestoreFileHint.setVisibility(View.VISIBLE); @@ -232,24 +245,105 @@ public class RoutineWorkDetailActivity extends BaseActivity { if (!TextUtils.isEmpty(b.getWorkFiles())) { mTvFileHint.setVisibility(View.GONE); mRlvFiles.setVisibility(View.VISIBLE); - List files = new ArrayList<>(); - String[] split = b.getWorkFiles().split(","); - for (int i = 0; i < split.length; i++) { - AddFileBean bean = new AddFileBean(); - bean.setId(split[i]); - bean.setPath(BaseUrlApi.BASE_IMG_URL + split[i]); - bean.setFileType(1); - files.add(bean); - } - ShowFileAdapter adapter = new ShowFileAdapter(mActivity, files); - mRlvFiles.setLayoutManager(new GridLayoutManager(mActivity, 4)); - mRlvFiles.setAdapter(adapter); + doGetFileInfo(b.getWorkFiles(), mRlvFiles); +// List files = new ArrayList<>(); +// String[] split = b.getWorkFiles().split(","); +// for (int i = 0; i < split.length; i++) { +// AddFileBean bean = new AddFileBean(); +// bean.setId(split[i]); +// bean.setPath(BaseUrlApi.BASE_IMG_URL + split[i]); +// bean.setFileType(1); +// files.add(bean); +// } +// AddFileAdapter adapter = new AddFileAdapter(mActivity, files); +// mRlvFiles.setLayoutManager(new LinearLayoutManager(mActivity)); +// mRlvFiles.setAdapter(adapter); } else { mTvFileHint.setVisibility(View.VISIBLE); mRlvFiles.setVisibility(View.GONE); } } + + private void doGetFileInfo(String fileId, RecyclerView rlvContent) { + ProgressDialog dialog = UIUtil.initDialog(mActivity, "获取中..."); + dialog.show(); + RetrofitManager.getInstance() + .create(BaseApiService.class) + .getFileInfoList(fileId) + .compose(RxTransformer.getTransformer()) + .subscribe(new Observer>() { + + + @Override + public void onSubscribe(@NonNull Disposable d) { + + } + + @Override + public void onNext(@NonNull List fileInfoBeans) { + if (dialog.isShowing()) dialog.dismiss(); + if (fileInfoBeans.size() > 0) { + List fileBeans = new ArrayList<>(); + AddFileAdapter addFileAdapter = new AddFileAdapter(mActivity, fileBeans); + rlvContent.setLayoutManager(new LinearLayoutManager(mActivity)); + rlvContent.setAdapter(addFileAdapter); + for (int i = 0; i < fileInfoBeans.size(); i++) { + FileInfoBean infoBean = fileInfoBeans.get(i); + AddFileBean bean = new AddFileBean(); + bean.setId(infoBean.getFileId()); + bean.setFileName(infoBean.getFileName()); + bean.setFileType(FileUtils.getFileType(infoBean.getFileName())); + bean.setPath(BaseUrlApi.BASE_FILE_URL + infoBean.getFileId()); + fileBeans.add(0, bean); + } + addFileAdapter.setData(fileBeans); + addFileAdapter.addOnItemClickListener(addFileBean -> { + if (addFileBean.getFileType() == 1) { + //文档 + ARouter.getInstance() + .build(PathConfig.PATH_MODULE_BASELIB_ACTIVITY_PREVIEW_FILE) + .withString("fileName", addFileBean.getFileName()) + .withString("fileId", addFileBean.getId()) + .navigation(); + } else if (2 == addFileBean.getFileType()) { + //图片预览 + //遍历文件获取所有图片文件 + ArrayList imgUrls = new ArrayList<>(); + for (int i = 0; i < addFileAdapter.getData().size(); i++) { + if (addFileAdapter.getData().get(i).getFileType() == 2) { + AddFileBean fileBean = addFileAdapter.getData().get(i); + String url = BaseUrlApi.BASE_IMG_URL + fileBean.getId(); + imgUrls.add(url); + } + } + ARouter.getInstance() + .build(PathConfig.PATH_MODULE_BASELIB_SHOW_IMG) + .withStringArrayList(TAG_IMGURL, imgUrls) + .navigation(); + } else if (3 == addFileBean.getFileType() || 4 == addFileBean.getFileType()) { + //TODO 视频或音频预览 + } + }); + } else { + ToastUtils.show("未找到文档信息"); + } + } + + @Override + public void onError(@NonNull Throwable e) { + if (dialog.isShowing()) dialog.dismiss(); + ExceptionHandler.handleException(e); + } + + @Override + public void onComplete() { + + } + }); + } + + @Override protected void doSearchByTitle() { diff --git a/oamodule/src/main/res/layout/activity_apply_routine_work.xml b/oamodule/src/main/res/layout/activity_apply_routine_work.xml index 7f5f15b..2f68e71 100644 --- a/oamodule/src/main/res/layout/activity_apply_routine_work.xml +++ b/oamodule/src/main/res/layout/activity_apply_routine_work.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_f2" android:orientation="vertical"> @@ -66,7 +66,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="请选择开始时间" @@ -90,7 +91,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="请选择结束时间" @@ -136,7 +138,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="请选择承办人" @@ -160,7 +163,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="请选择协办人" @@ -209,9 +213,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="5dp" + android:background="@color/gray_f8" android:orientation="vertical" android:paddingTop="5dp" - android:background="@color/gray_f8" android:paddingBottom="10dp"> @@ -228,7 +232,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"> @@ -251,7 +255,7 @@ android:layout_gravity="right" android:layout_marginRight="10dp" android:layout_marginBottom="5dp" - tools:text="0/140" /> + android:text="0/140" /> @@ -260,8 +264,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="5dp" - android:orientation="vertical" android:background="@color/gray_f8" + android:orientation="vertical" android:paddingTop="5dp" android:paddingBottom="10dp"> @@ -279,7 +283,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"> @@ -302,7 +306,7 @@ android:layout_gravity="right" android:layout_marginRight="10dp" android:layout_marginBottom="5dp" - tools:text="0/140" /> + android:text="0/140" /> @@ -311,8 +315,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="5dp" - android:orientation="vertical" android:background="@color/gray_f8" + android:orientation="vertical" android:paddingTop="5dp" android:paddingBottom="10dp"> @@ -330,7 +334,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_routine_restore.xml b/oamodule/src/main/res/layout/activity_routine_restore.xml index 84edd42..47a88fe 100644 --- a/oamodule/src/main/res/layout/activity_routine_restore.xml +++ b/oamodule/src/main/res/layout/activity_routine_restore.xml @@ -4,12 +4,13 @@ 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"> @@ -53,6 +54,7 @@ android:background="@null" android:gravity="right" android:hint="未录入" + android:textColor="@color/black_10" android:textSize="14sp" /> @@ -121,6 +123,7 @@ android:background="@null" android:gravity="right" android:hint="未录入" + android:textColor="@color/black_10" android:textSize="14sp" /> diff --git a/oamodule/src/main/res/layout/activity_routine_work.xml b/oamodule/src/main/res/layout/activity_routine_work.xml index f3246e8..b0ed810 100644 --- a/oamodule/src/main/res/layout/activity_routine_work.xml +++ b/oamodule/src/main/res/layout/activity_routine_work.xml @@ -55,7 +55,7 @@ + android:textColor="@color/col_gray_black" /> + android:textColor="@color/col_gray_black" /> @@ -110,6 +110,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="5dp" + android:layout_marginTop="5dp" android:layout_marginRight="5dp" android:gravity="center_vertical" android:orientation="horizontal" @@ -118,7 +119,6 @@ @@ -176,7 +176,7 @@ + android:layout_marginTop="10dp"> @@ -53,6 +53,7 @@ android:background="@null" android:gravity="right" android:hint="未录入" + android:textColor="@color/black_10" android:textSize="14sp" /> @@ -76,7 +77,7 @@ android:focusable="true" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/black_10" android:textSize="14sp" /> @@ -99,7 +100,7 @@ android:focusable="true" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/black_10" android:textSize="14sp" /> @@ -121,6 +122,7 @@ android:background="@null" android:gravity="right" android:hint="未录入" + android:textColor="@color/black_10" android:textSize="14sp" /> @@ -143,7 +145,7 @@ android:focusable="true" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/black_10" android:textSize="14sp" /> @@ -166,7 +168,7 @@ android:focusable="true" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/black_10" android:textSize="14sp" /> @@ -243,8 +245,8 @@ android:gravity="left" android:hint="未录入" android:minLines="3" - android:padding="5dp" - android:textColor="@color/black" + android:padding="10dp" + android:textColor="@color/black_10" android:textSize="14sp" /> @@ -274,7 +276,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"> @@ -317,7 +319,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"> @@ -389,8 +391,8 @@ android:gravity="left" android:hint="未录入" android:minLines="3" - android:padding="5dp" - android:textColor="@color/black" + android:padding="10dp" + android:textColor="@color/black_10" android:textSize="14sp" /> @@ -461,7 +463,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:orientation="horizontal"> - - - - - - - - + android:layout_marginLeft="5dp" + android:background="@drawable/shp_status_gray_rim" + android:gravity="center" + android:paddingLeft="10dp" + android:paddingTop="3dp" + android:paddingRight="10dp" + android:paddingBottom="3dp" + android:textColor="@color/white" + android:textSize="@dimen/text_12" + tools:text="未办结" /> - + android:layout_marginTop="3dp" + android:orientation="horizontal"> + + + + + + + + \ No newline at end of file