diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseActivity.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseActivity.java index b98f655..13aac46 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseActivity.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseActivity.java @@ -325,7 +325,6 @@ public abstract class BaseActivity extends AppCompatActivity { intent.setData(Uri.parse("package:" + this.getPackageName())); mLauncher.launch(intent); } else { - //do some thing hasManageFileManage(); } } else { diff --git a/baselib/src/main/res/drawable/shape_status_gray.xml b/baselib/src/main/res/drawable/shape_status_gray.xml new file mode 100644 index 0000000..b0bfc48 --- /dev/null +++ b/baselib/src/main/res/drawable/shape_status_gray.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file 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 ac40a05..ee57dbb 100755 --- a/baselib/src/main/res/layout/item_apply_service_photo.xml +++ b/baselib/src/main/res/layout/item_apply_service_photo.xml @@ -1,42 +1,46 @@ + android:padding="5dp"> - + + + + + + - - - \ 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 6e6e4d7..236bf5f 100644 --- a/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java +++ b/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java @@ -156,6 +156,10 @@ public class MainTabActivity extends BaseActivity { public void onNext(@NonNull UserInfoBean userInfoBean) { List departments = userInfoBean.getDepartments(); UserLgUtils.setUserDeptId(new Gson().toJson(departments)); + //通知fragment刷新 + if (mFragments != null && mFragments.size() > 0) { + mFragments.get(0).refreshContentView("userInfo"); + } } @Override diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/workreports/AddWorkReportsActivity.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/workreports/AddWorkReportsActivity.java index 85e0ae5..27ce222 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/workreports/AddWorkReportsActivity.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/workreports/AddWorkReportsActivity.java @@ -32,8 +32,6 @@ 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; -import com.tenlionsoft.oamodule.beans.PersonShowBean; import com.tenlionsoft.oamodule.beans.SaveWorkReportBean; import com.tenlionsoft.oamodule.net.OAApi; @@ -44,7 +42,7 @@ 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; import butterknife.ButterKnife; @@ -128,22 +126,9 @@ public class AddWorkReportsActivity extends BaseActivity { mAddFileAdapter.addOnItemClickListener(addFileBean -> { LogUtils.e("添加文件"); if (TextUtils.isEmpty(addFileBean.getId())) { - //选择 - if (mFileMax == 0) { - ToastUtils.show("超过最大上传数量限制"); - } else { - //TODO 校验是否有权限 - new LFilePicker() - .withActivity(this) - .withRequestCode(LionActions.REQUEST_CODE_AC) - .withTitle("文件选择") - .withMaxNum(mFileMax) - .withFileFilter(fileFilter) - .start(); - } + checkManagePermission(); } else { - //预览 - //判断文件类型 + //TODO 预览 } }); //删除上传的文件 @@ -153,11 +138,25 @@ public class AddWorkReportsActivity extends BaseActivity { mAddFileAdapter.notifyDataSetChanged(); ++mFileMax; }); - mRlvFiles.setLayoutManager(new GridLayoutManager(mActivity, 4)); + mRlvFiles.setLayoutManager(new LinearLayoutManager(mActivity)); mRlvFiles.setAdapter(mAddFileAdapter); mBtnConfirm.setOnClickListener(v -> doConfirm()); } + @Override + protected void hasManageFileManage() { + if (mFileMax == 0) { + ToastUtils.show("超过最大上传数量限制"); + } else { + new LFilePicker() + .withActivity(this) + .withRequestCode(LionActions.REQUEST_CODE_AC) + .withTitle("文件选择") + .withMaxNum(mFileMax) + .withFileFilter(fileFilter) + .start(); + } + } /** * 显示类型 */ diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/workreports/EditWorkReportActivity.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/workreports/EditWorkReportActivity.java index ee3c51e..cb726c2 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/workreports/EditWorkReportActivity.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/workreports/EditWorkReportActivity.java @@ -24,10 +24,12 @@ import com.tenlionsoft.baselib.core.beans.DicBean; 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.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; @@ -44,7 +46,7 @@ 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; import butterknife.ButterKnife; @@ -151,20 +153,62 @@ public class EditWorkReportActivity extends BaseActivity { mEtContent.setText(Html.fromHtml(bean.getReportContent())); if (!TextUtils.isEmpty(bean.getReportFiles())) { mFileBeans.clear(); - String[] split = bean.getReportFiles().split(","); - for (int i = 0; i < split.length; i++) { - AddFileBean fileBean = new AddFileBean(); - fileBean.setId(split[i]); - fileBean.setPath(BaseUrlApi.BASE_IMG_URL + split[i]); - fileBean.setFileType(1); - mFileBeans.add(0, fileBean); - --mFileMax; - } - mFileBeans.add(new AddFileBean()); - mAddFileAdapter.setData(mFileBeans); + doGetFileInfo(bean.getReportFiles()); + } } + /** + * 获取文件名称等信息 + */ + private void doGetFileInfo(String fileId) { + ProgressDialog dialog = UIUtil.initDialog(mActivity, "获取中..."); + dialog.show(); + RetrofitManager.getInstance() + .create(BaseApiService.class) + .getFileInfoList(fileId, UserLgUtils.getToken()) + .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) { + for (int i = 0; i < fileInfoBeans.size(); i++) { + FileInfoBean infoBean = fileInfoBeans.get(i); + AddFileBean bean = new AddFileBean(); + bean.setId(infoBean.getFileId()); + bean.setPath(BaseUrlApi.BASE_IMG_URL + infoBean.getFileId()); + bean.setFileType(FileUtils.getFileType(infoBean.getFileName())); + bean.setFileName(infoBean.getFileName()); + mFileBeans.add(0, bean); + --mFileMax; + } + mAddFileAdapter.setData(mFileBeans); + } else { + ToastUtils.show("未找到文档信息"); + } + } + + @Override + public void onError(@NonNull Throwable e) { + if (dialog.isShowing()) dialog.dismiss(); + ExceptionHandler.handleException(e); + } + + @Override + public void onComplete() { + + } + }); + } + private void initViews() { mTyps = new ArrayList<>(); DicBean type1 = new DicBean(); @@ -189,22 +233,9 @@ public class EditWorkReportActivity extends BaseActivity { mAddFileAdapter.addOnItemClickListener(addFileBean -> { LogUtils.e("添加文件"); if (TextUtils.isEmpty(addFileBean.getId())) { - //选择 - if (mFileMax == 0) { - ToastUtils.show("超过最大上传数量限制"); - } else { - //TODO 校验是否有权限 - new LFilePicker() - .withActivity(this) - .withRequestCode(LionActions.REQUEST_CODE_AC) - .withTitle("文件选择") - .withMaxNum(mFileMax) - .withFileFilter(fileFilter) - .start(); - } + checkManagePermission(); } else { - //预览 - //判断文件类型 + //TODO 预览 } }); //删除上传的文件 @@ -214,11 +245,26 @@ public class EditWorkReportActivity extends BaseActivity { mAddFileAdapter.notifyDataSetChanged(); ++mFileMax; }); - mRlvFiles.setLayoutManager(new GridLayoutManager(mActivity, 4)); + mRlvFiles.setLayoutManager(new LinearLayoutManager(mActivity)); mRlvFiles.setAdapter(mAddFileAdapter); mBtnConfirm.setOnClickListener(v -> doConfirm()); } + @Override + protected void hasManageFileManage() { + if (mFileMax == 0) { + ToastUtils.show("超过最大上传数量限制"); + } else { + new LFilePicker() + .withActivity(this) + .withRequestCode(LionActions.REQUEST_CODE_AC) + .withTitle("文件选择") + .withMaxNum(mFileMax) + .withFileFilter(fileFilter) + .start(); + } + } + /** * 显示类型 */ diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/workreports/WorkReportDetailActivity.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/workreports/WorkReportDetailActivity.java index d2dd051..3212675 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/workreports/WorkReportDetailActivity.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/workreports/WorkReportDetailActivity.java @@ -17,10 +17,13 @@ import com.tenlionsoft.baselib.core.beans.AddFileBean; import com.tenlionsoft.baselib.core.beans.BaseSuccessBean; 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.FileUtils; import com.tenlionsoft.baselib.utils.UIUtil; import com.tenlionsoft.baselib.utils.UserLgUtils; import com.tenlionsoft.oamodule.R; @@ -32,7 +35,7 @@ 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; import butterknife.ButterKnife; @@ -40,6 +43,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月19日15:21:37 @@ -187,24 +192,98 @@ public class WorkReportDetailActivity extends BaseActivity { if (!TextUtils.isEmpty(bean.getReportFiles())) { mRlvFiles.setVisibility(View.VISIBLE); mTvFileHint.setVisibility(View.GONE); - List files = new ArrayList<>(); - String[] split = bean.getReportFiles().split(","); - for (int i = 0; i < split.length; i++) { - AddFileBean fileBean = new AddFileBean(); - fileBean.setId(split[i]); - fileBean.setPath(BaseUrlApi.BASE_IMG_URL + split[i]); - fileBean.setFileType(1); - files.add(fileBean); - } - ShowFileAdapter adapter = new ShowFileAdapter(mActivity, files); - mRlvFiles.setLayoutManager(new GridLayoutManager(mActivity, 4)); - mRlvFiles.setAdapter(adapter); + doGetFileInfo(bean.getReportFiles()); } else { mRlvFiles.setVisibility(View.GONE); mTvFileHint.setVisibility(View.VISIBLE); } } + /** + * 获取文件名称等信息 + */ + private void doGetFileInfo(String fileId) { + ProgressDialog dialog = UIUtil.initDialog(mActivity, "获取中..."); + dialog.show(); + RetrofitManager.getInstance() + .create(BaseApiService.class) + .getFileInfoList(fileId, UserLgUtils.getToken()) + .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 mFiles = new ArrayList<>(); + for (int i = 0; i < fileInfoBeans.size(); i++) { + FileInfoBean infoBean = fileInfoBeans.get(i); + AddFileBean bean = new AddFileBean(); + bean.setId(infoBean.getFileId()); + bean.setPath(BaseUrlApi.BASE_IMG_URL + infoBean.getFileId()); + bean.setFileType(FileUtils.getFileType(infoBean.getFileName())); + bean.setFileName(infoBean.getFileName()); + mFiles.add(bean); + } + AddFileAdapter adapter = new AddFileAdapter(mActivity, mFiles); + mRlvFiles.setLayoutManager(new LinearLayoutManager(mActivity)); + mRlvFiles.setAdapter(adapter); + adapter.addOnItemClickListener(addFileBean -> previewFile(addFileBean, mFiles)); + } else { + ToastUtils.show("未找到文档信息"); + } + } + + @Override + public void onError(@NonNull Throwable e) { + if (dialog.isShowing()) dialog.dismiss(); + ExceptionHandler.handleException(e); + } + + @Override + public void onComplete() { + + } + }); + } + + /** + * 预览文件 + */ + private void previewFile(AddFileBean addFileBean, List mFiles) { + 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 < mFiles.size(); i++) { + if (mFiles.get(i).getFileType() == 2) { + AddFileBean fileBean = mFiles.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 视频或音频预览 + } + } + @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable @org.jetbrains.annotations.Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/workreports/WorkReportsActivity.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/workreports/WorkReportsActivity.java index 9a2f08f..b396a08 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/workreports/WorkReportsActivity.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/workreports/WorkReportsActivity.java @@ -3,6 +3,7 @@ package com.tenlionsoft.oamodule.activity.workreports; import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.view.inputmethod.EditorInfo; import android.widget.EditText; import android.widget.ImageView; import android.widget.LinearLayout; @@ -19,6 +20,7 @@ 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.LogUtils; import com.tenlionsoft.baselib.utils.UserLgUtils; import com.tenlionsoft.oamodule.R; import com.tenlionsoft.oamodule.R2; @@ -99,6 +101,24 @@ public class WorkReportsActivity extends BaseActivity { .withString("id", workReportDetailBean.getWorkReportId()) .navigation(mActivity, 12)); doRefresh(); + mEtBaseSearchCancel.setOnEditorActionListener((v, actionId, event) -> { + LogUtils.e("搜索==" + actionId); + if (actionId == EditorInfo.IME_ACTION_SEARCH) { + hideSoftKeyboard(); + mEtBaseSearchCancel.clearFocus(); + mKeywords = v.getText().toString(); + doRefresh(); + return true; + } else { + return false; + } + }); + mTvBaseSearchCancel.setOnClickListener(v -> { + mEtBaseSearchCancel.setText(""); + mEtBaseSearchCancel.clearFocus(); + mKeywords = ""; + doRefresh(); + }); } private void doLoadMore() { diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/adapter/WorkReportAdapter.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/adapter/WorkReportAdapter.java index 5a112e9..b3379bd 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/adapter/WorkReportAdapter.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/adapter/WorkReportAdapter.java @@ -1,6 +1,7 @@ package com.tenlionsoft.oamodule.adapter; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -34,17 +35,22 @@ public class WorkReportAdapter extends BaseRecyclerAdapter 0) { + String datum = data[0]; + if ("userInfo".equals(datum)) { + //刷新部门数据 + String userDeptId = UserLgUtils.getUserDeptId(); + if (!TextUtils.isEmpty(userDeptId)) { + Gson gson = new Gson(); + ArrayList depts = gson.fromJson(userDeptId, new TypeToken>() { + }.getType()); + if (depts != null && depts.size() > 0) { + mTvDept.setText(depts.get(0).getDepartmentName()); + } + } + } + } + } + @Override protected void refreshView() { diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/holder/WorkReportHolder.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/holder/WorkReportHolder.java index f4bb43c..137aee3 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/holder/WorkReportHolder.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/holder/WorkReportHolder.java @@ -24,8 +24,6 @@ public class WorkReportHolder extends BaseViewHolder { public TextView mTvTitle; @BindView(R2.id.tv_type) public TextView mTvType; - @BindView(R2.id.tv_egress) - public TextView mTvEgress; @BindView(R2.id.tv_content) public TextView mTvContent; diff --git a/oamodule/src/main/res/layout/activity_work_report_detail.xml b/oamodule/src/main/res/layout/activity_work_report_detail.xml index 8057d34..fb52a46 100644 --- a/oamodule/src/main/res/layout/activity_work_report_detail.xml +++ b/oamodule/src/main/res/layout/activity_work_report_detail.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.car.ByCarAddActivity"> + android:background="@color/gray_bg" + android:orientation="vertical"> diff --git a/oamodule/src/main/res/layout/activity_work_reports.xml b/oamodule/src/main/res/layout/activity_work_reports.xml index a209565..c864ef9 100644 --- a/oamodule/src/main/res/layout/activity_work_reports.xml +++ b/oamodule/src/main/res/layout/activity_work_reports.xml @@ -4,8 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/gray_bg" - android:orientation="vertical" - tools:context=".activity.meeting.MeetingCenterActivity"> + android:orientation="vertical"> @@ -22,7 +21,11 @@ + android:layout_height="wrap_content" + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" + android:background="@color/white" + tools:listitem="@layout/item_work_report" /> + android:paddingLeft="5dp" + android:paddingTop="10dp" + android:paddingRight="5dp" + android:paddingBottom="10dp"> - + android:gravity="center_vertical" + android:orientation="horizontal"> - + - + + + + android:layout_height="wrap_content" + android:layout_marginTop="5dp" + android:ellipsize="end" + android:maxLines="1" + android:textSize="@dimen/text_12" + tools:text="工作内容工作内容工作内容工作内容工作内容工作内容工作内容工作内容工作内容工作内容工作内容工作内容工作内容工作内容工作内容工作内容工作内容工作内容工作内容" /> \ No newline at end of file