diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f46d446..e4cdbee 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -118,6 +118,7 @@ private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; private QMUITipDialog submitDialog; + private ImageRecycleViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -145,6 +146,11 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("提交中,请稍后") .create(); + + checkImageAdapter = new ImageRecycleViewAdapter(this); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.setAdapter(checkImageAdapter); } @Override @@ -214,6 +220,10 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } + if (checkImageAdapter.getItemCount() < 1 || checkImageAdapter.getItemCount() > 2) { + ToastHelper.showToast("当前案卷状态必须上传至少一张图片", ToastHelper.WARING); + return; + } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(mediaList)); } @@ -407,36 +417,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + checkImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + checkImageAdapter.setDeleteView(true); + checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + checkImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f46d446..e4cdbee 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -118,6 +118,7 @@ private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; private QMUITipDialog submitDialog; + private ImageRecycleViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -145,6 +146,11 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("提交中,请稍后") .create(); + + checkImageAdapter = new ImageRecycleViewAdapter(this); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.setAdapter(checkImageAdapter); } @Override @@ -214,6 +220,10 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } + if (checkImageAdapter.getItemCount() < 1 || checkImageAdapter.getItemCount() > 2) { + ToastHelper.showToast("当前案卷状态必须上传至少一张图片", ToastHelper.WARING); + return; + } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(mediaList)); } @@ -407,36 +417,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + checkImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + checkImageAdapter.setDeleteView(true); + checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + checkImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 5be798d..aca2f2d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -123,6 +123,7 @@ private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; private QMUITipDialog submitDialog; + private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -151,6 +152,11 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("提交中,请稍后") .create(); + + handleImageAdapter = new ImageRecycleViewAdapter(this); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(handleImageAdapter); } @Override @@ -328,7 +334,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时,处理图片必传。至少一张,最多两张 - if (mediaList.size() < 1 || mediaList.size() > 2) { + if (handleImageAdapter.getItemCount() < 1 || handleImageAdapter.getItemCount() > 2) { ToastHelper.showToast("当前案卷状态必须上传至少一张图片", ToastHelper.WARING); return; } @@ -412,36 +418,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + handleImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + handleImageAdapter.setDeleteView(true); + handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + handleImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f46d446..e4cdbee 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -118,6 +118,7 @@ private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; private QMUITipDialog submitDialog; + private ImageRecycleViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -145,6 +146,11 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("提交中,请稍后") .create(); + + checkImageAdapter = new ImageRecycleViewAdapter(this); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.setAdapter(checkImageAdapter); } @Override @@ -214,6 +220,10 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } + if (checkImageAdapter.getItemCount() < 1 || checkImageAdapter.getItemCount() > 2) { + ToastHelper.showToast("当前案卷状态必须上传至少一张图片", ToastHelper.WARING); + return; + } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(mediaList)); } @@ -407,36 +417,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + checkImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + checkImageAdapter.setDeleteView(true); + checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + checkImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 5be798d..aca2f2d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -123,6 +123,7 @@ private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; private QMUITipDialog submitDialog; + private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -151,6 +152,11 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("提交中,请稍后") .create(); + + handleImageAdapter = new ImageRecycleViewAdapter(this); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(handleImageAdapter); } @Override @@ -328,7 +334,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时,处理图片必传。至少一张,最多两张 - if (mediaList.size() < 1 || mediaList.size() > 2) { + if (handleImageAdapter.getItemCount() < 1 || handleImageAdapter.getItemCount() > 2) { ToastHelper.showToast("当前案卷状态必须上传至少一张图片", ToastHelper.WARING); return; } @@ -412,36 +418,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + handleImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + handleImageAdapter.setDeleteView(true); + handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + handleImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index f83e281..ba13804 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -144,6 +144,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); + private ImageRecycleViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -173,6 +174,11 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); + + verifyImageAdapter = new ImageRecycleViewAdapter(this); + caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseVerifyRecyclerView.setAdapter(verifyImageAdapter); } @Override @@ -418,7 +424,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (mediaList.size() != 2) { + if (verifyImageAdapter.getItemCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -434,7 +440,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (mediaList.size() != 2) { + if (verifyImageAdapter.getItemCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -583,36 +589,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + verifyImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + verifyImageAdapter.setDeleteView(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + verifyImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f46d446..e4cdbee 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -118,6 +118,7 @@ private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; private QMUITipDialog submitDialog; + private ImageRecycleViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -145,6 +146,11 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("提交中,请稍后") .create(); + + checkImageAdapter = new ImageRecycleViewAdapter(this); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.setAdapter(checkImageAdapter); } @Override @@ -214,6 +220,10 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } + if (checkImageAdapter.getItemCount() < 1 || checkImageAdapter.getItemCount() > 2) { + ToastHelper.showToast("当前案卷状态必须上传至少一张图片", ToastHelper.WARING); + return; + } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(mediaList)); } @@ -407,36 +417,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + checkImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + checkImageAdapter.setDeleteView(true); + checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + checkImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 5be798d..aca2f2d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -123,6 +123,7 @@ private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; private QMUITipDialog submitDialog; + private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -151,6 +152,11 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("提交中,请稍后") .create(); + + handleImageAdapter = new ImageRecycleViewAdapter(this); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(handleImageAdapter); } @Override @@ -328,7 +334,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时,处理图片必传。至少一张,最多两张 - if (mediaList.size() < 1 || mediaList.size() > 2) { + if (handleImageAdapter.getItemCount() < 1 || handleImageAdapter.getItemCount() > 2) { ToastHelper.showToast("当前案卷状态必须上传至少一张图片", ToastHelper.WARING); return; } @@ -412,36 +418,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + handleImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + handleImageAdapter.setDeleteView(true); + handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + handleImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index f83e281..ba13804 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -144,6 +144,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); + private ImageRecycleViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -173,6 +174,11 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); + + verifyImageAdapter = new ImageRecycleViewAdapter(this); + caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseVerifyRecyclerView.setAdapter(verifyImageAdapter); } @Override @@ -418,7 +424,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (mediaList.size() != 2) { + if (verifyImageAdapter.getItemCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -434,7 +440,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (mediaList.size() != 2) { + if (verifyImageAdapter.getItemCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -583,36 +589,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + verifyImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + verifyImageAdapter.setDeleteView(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + verifyImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 7e736dd..ae2a1a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.check; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -114,11 +113,34 @@ public void handleMessage(Message msg) { CaseCheckFragment checkFragment = reference.get(); if (msg.what == Constant.CASE_CHECK_OK) { - Log.d(TAG, "核实查成功,更新列表"); + Log.d(TAG, "核查成功,更新列表"); checkFragment.isRefresh = true; //刷新之后页码重置 checkFragment.pageIndex = 1; checkFragment.caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex); + } else if (msg.what == 202104251) { + if (checkFragment.isRefresh || checkFragment.isLoadMore) { + checkFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (checkFragment.dataBeans.size() == 0) { + checkFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + checkFragment.emptyView.hide(); + checkFragment.adapter = new CaseCheckResultAdapter(checkFragment.context, checkFragment.dataBeans); + checkFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkFragment.context)); + checkFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkFragment.context, DividerItemDecoration.VERTICAL)); + checkFragment.caseRecyclerView.setAdapter(checkFragment.adapter); + checkFragment.adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(checkFragment.context, CaseCheckDetailActivity.class); + intent.putExtra("id", checkFragment.dataBeans.get(position).getId()); + checkFragment.startActivity(intent); + } + }); + } + } } } } @@ -142,42 +164,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104251); + weakReferenceHandler.sendEmptyMessage(202104251); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("您暂时没有待办案卷", null); - } else { - emptyView.hide(); - adapter = new CaseCheckResultAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseCheckDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f46d446..e4cdbee 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -118,6 +118,7 @@ private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; private QMUITipDialog submitDialog; + private ImageRecycleViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -145,6 +146,11 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("提交中,请稍后") .create(); + + checkImageAdapter = new ImageRecycleViewAdapter(this); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.setAdapter(checkImageAdapter); } @Override @@ -214,6 +220,10 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } + if (checkImageAdapter.getItemCount() < 1 || checkImageAdapter.getItemCount() > 2) { + ToastHelper.showToast("当前案卷状态必须上传至少一张图片", ToastHelper.WARING); + return; + } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(mediaList)); } @@ -407,36 +417,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + checkImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + checkImageAdapter.setDeleteView(true); + checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + checkImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 5be798d..aca2f2d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -123,6 +123,7 @@ private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; private QMUITipDialog submitDialog; + private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -151,6 +152,11 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("提交中,请稍后") .create(); + + handleImageAdapter = new ImageRecycleViewAdapter(this); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(handleImageAdapter); } @Override @@ -328,7 +334,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时,处理图片必传。至少一张,最多两张 - if (mediaList.size() < 1 || mediaList.size() > 2) { + if (handleImageAdapter.getItemCount() < 1 || handleImageAdapter.getItemCount() > 2) { ToastHelper.showToast("当前案卷状态必须上传至少一张图片", ToastHelper.WARING); return; } @@ -412,36 +418,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + handleImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + handleImageAdapter.setDeleteView(true); + handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + handleImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index f83e281..ba13804 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -144,6 +144,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); + private ImageRecycleViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -173,6 +174,11 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); + + verifyImageAdapter = new ImageRecycleViewAdapter(this); + caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseVerifyRecyclerView.setAdapter(verifyImageAdapter); } @Override @@ -418,7 +424,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (mediaList.size() != 2) { + if (verifyImageAdapter.getItemCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -434,7 +440,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (mediaList.size() != 2) { + if (verifyImageAdapter.getItemCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -583,36 +589,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + verifyImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + verifyImageAdapter.setDeleteView(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + verifyImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 7e736dd..ae2a1a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.check; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -114,11 +113,34 @@ public void handleMessage(Message msg) { CaseCheckFragment checkFragment = reference.get(); if (msg.what == Constant.CASE_CHECK_OK) { - Log.d(TAG, "核实查成功,更新列表"); + Log.d(TAG, "核查成功,更新列表"); checkFragment.isRefresh = true; //刷新之后页码重置 checkFragment.pageIndex = 1; checkFragment.caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex); + } else if (msg.what == 202104251) { + if (checkFragment.isRefresh || checkFragment.isLoadMore) { + checkFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (checkFragment.dataBeans.size() == 0) { + checkFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + checkFragment.emptyView.hide(); + checkFragment.adapter = new CaseCheckResultAdapter(checkFragment.context, checkFragment.dataBeans); + checkFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkFragment.context)); + checkFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkFragment.context, DividerItemDecoration.VERTICAL)); + checkFragment.caseRecyclerView.setAdapter(checkFragment.adapter); + checkFragment.adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(checkFragment.context, CaseCheckDetailActivity.class); + intent.putExtra("id", checkFragment.dataBeans.get(position).getId()); + checkFragment.startActivity(intent); + } + }); + } + } } } } @@ -142,42 +164,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104251); + weakReferenceHandler.sendEmptyMessage(202104251); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("您暂时没有待办案卷", null); - } else { - emptyView.hide(); - adapter = new CaseCheckResultAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseCheckDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index a9a3a79..b01fc84 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.check; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,6 +118,29 @@ //刷新之后页码重置 checkedFragment.pageIndex = 1; checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(checkedFragment.pageIndex); + } else if (msg.what == 202104252) { + if (checkedFragment.isRefresh || checkedFragment.isLoadMore) { + checkedFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (checkedFragment.dataBeans.size() == 0) { + checkedFragment.emptyView.show("您还没有已办案卷", null); + } else { + checkedFragment.emptyView.hide(); + checkedFragment.adapter = new CaseCheckedResultAdapter(checkedFragment.context, checkedFragment.dataBeans); + checkedFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkedFragment.context)); + checkedFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkedFragment.context, DividerItemDecoration.VERTICAL)); + checkedFragment.caseRecyclerView.setAdapter(checkedFragment.adapter); + checkedFragment.adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(checkedFragment.context, CaseCheckedDetailActivity.class); + intent.putExtra("id", checkedFragment.dataBeans.get(position).getId()); + checkedFragment.startActivity(intent); + } + }); + } + } } } } @@ -143,42 +165,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104252); + weakReferenceHandler.sendEmptyMessage(202104252); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("您还没有已办案卷", null); - } else { - emptyView.hide(); - adapter = new CaseCheckedResultAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseCheckedDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f46d446..e4cdbee 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -118,6 +118,7 @@ private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; private QMUITipDialog submitDialog; + private ImageRecycleViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -145,6 +146,11 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("提交中,请稍后") .create(); + + checkImageAdapter = new ImageRecycleViewAdapter(this); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.setAdapter(checkImageAdapter); } @Override @@ -214,6 +220,10 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } + if (checkImageAdapter.getItemCount() < 1 || checkImageAdapter.getItemCount() > 2) { + ToastHelper.showToast("当前案卷状态必须上传至少一张图片", ToastHelper.WARING); + return; + } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(mediaList)); } @@ -407,36 +417,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + checkImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + checkImageAdapter.setDeleteView(true); + checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + checkImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 5be798d..aca2f2d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -123,6 +123,7 @@ private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; private QMUITipDialog submitDialog; + private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -151,6 +152,11 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("提交中,请稍后") .create(); + + handleImageAdapter = new ImageRecycleViewAdapter(this); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(handleImageAdapter); } @Override @@ -328,7 +334,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时,处理图片必传。至少一张,最多两张 - if (mediaList.size() < 1 || mediaList.size() > 2) { + if (handleImageAdapter.getItemCount() < 1 || handleImageAdapter.getItemCount() > 2) { ToastHelper.showToast("当前案卷状态必须上传至少一张图片", ToastHelper.WARING); return; } @@ -412,36 +418,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + handleImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + handleImageAdapter.setDeleteView(true); + handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + handleImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index f83e281..ba13804 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -144,6 +144,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); + private ImageRecycleViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -173,6 +174,11 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); + + verifyImageAdapter = new ImageRecycleViewAdapter(this); + caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseVerifyRecyclerView.setAdapter(verifyImageAdapter); } @Override @@ -418,7 +424,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (mediaList.size() != 2) { + if (verifyImageAdapter.getItemCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -434,7 +440,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (mediaList.size() != 2) { + if (verifyImageAdapter.getItemCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -583,36 +589,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + verifyImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + verifyImageAdapter.setDeleteView(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + verifyImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 7e736dd..ae2a1a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.check; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -114,11 +113,34 @@ public void handleMessage(Message msg) { CaseCheckFragment checkFragment = reference.get(); if (msg.what == Constant.CASE_CHECK_OK) { - Log.d(TAG, "核实查成功,更新列表"); + Log.d(TAG, "核查成功,更新列表"); checkFragment.isRefresh = true; //刷新之后页码重置 checkFragment.pageIndex = 1; checkFragment.caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex); + } else if (msg.what == 202104251) { + if (checkFragment.isRefresh || checkFragment.isLoadMore) { + checkFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (checkFragment.dataBeans.size() == 0) { + checkFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + checkFragment.emptyView.hide(); + checkFragment.adapter = new CaseCheckResultAdapter(checkFragment.context, checkFragment.dataBeans); + checkFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkFragment.context)); + checkFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkFragment.context, DividerItemDecoration.VERTICAL)); + checkFragment.caseRecyclerView.setAdapter(checkFragment.adapter); + checkFragment.adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(checkFragment.context, CaseCheckDetailActivity.class); + intent.putExtra("id", checkFragment.dataBeans.get(position).getId()); + checkFragment.startActivity(intent); + } + }); + } + } } } } @@ -142,42 +164,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104251); + weakReferenceHandler.sendEmptyMessage(202104251); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("您暂时没有待办案卷", null); - } else { - emptyView.hide(); - adapter = new CaseCheckResultAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseCheckDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index a9a3a79..b01fc84 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.check; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,6 +118,29 @@ //刷新之后页码重置 checkedFragment.pageIndex = 1; checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(checkedFragment.pageIndex); + } else if (msg.what == 202104252) { + if (checkedFragment.isRefresh || checkedFragment.isLoadMore) { + checkedFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (checkedFragment.dataBeans.size() == 0) { + checkedFragment.emptyView.show("您还没有已办案卷", null); + } else { + checkedFragment.emptyView.hide(); + checkedFragment.adapter = new CaseCheckedResultAdapter(checkedFragment.context, checkedFragment.dataBeans); + checkedFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkedFragment.context)); + checkedFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkedFragment.context, DividerItemDecoration.VERTICAL)); + checkedFragment.caseRecyclerView.setAdapter(checkedFragment.adapter); + checkedFragment.adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(checkedFragment.context, CaseCheckedDetailActivity.class); + intent.putExtra("id", checkedFragment.dataBeans.get(position).getId()); + checkedFragment.startActivity(intent); + } + }); + } + } } } } @@ -143,42 +165,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104252); + weakReferenceHandler.sendEmptyMessage(202104252); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("您还没有已办案卷", null); - } else { - emptyView.hide(); - adapter = new CaseCheckedResultAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseCheckedDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 9b74097..916ad06 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -116,6 +115,29 @@ //刷新之后页码重置 handledFragment.pageIndex = 1; handledFragment.caseHandledListPresenter.onReadyRetrofitRequest(handledFragment.pageIndex); + } else if (msg.what == 202104288) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("没有案卷需要处理", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new CaseHandledAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new CaseHandledAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(handledFragment.context, CaseHandledDetailActivity.class); + intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); + handledFragment.startActivity(intent); + } + }); + } + } } } } @@ -139,42 +161,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104288); + weakReferenceHandler.sendEmptyMessage(202104288); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandledAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandledAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandledDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f46d446..e4cdbee 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -118,6 +118,7 @@ private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; private QMUITipDialog submitDialog; + private ImageRecycleViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -145,6 +146,11 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("提交中,请稍后") .create(); + + checkImageAdapter = new ImageRecycleViewAdapter(this); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.setAdapter(checkImageAdapter); } @Override @@ -214,6 +220,10 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } + if (checkImageAdapter.getItemCount() < 1 || checkImageAdapter.getItemCount() > 2) { + ToastHelper.showToast("当前案卷状态必须上传至少一张图片", ToastHelper.WARING); + return; + } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(mediaList)); } @@ -407,36 +417,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + checkImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + checkImageAdapter.setDeleteView(true); + checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + checkImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 5be798d..aca2f2d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -123,6 +123,7 @@ private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; private QMUITipDialog submitDialog; + private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -151,6 +152,11 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("提交中,请稍后") .create(); + + handleImageAdapter = new ImageRecycleViewAdapter(this); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(handleImageAdapter); } @Override @@ -328,7 +334,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时,处理图片必传。至少一张,最多两张 - if (mediaList.size() < 1 || mediaList.size() > 2) { + if (handleImageAdapter.getItemCount() < 1 || handleImageAdapter.getItemCount() > 2) { ToastHelper.showToast("当前案卷状态必须上传至少一张图片", ToastHelper.WARING); return; } @@ -412,36 +418,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + handleImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + handleImageAdapter.setDeleteView(true); + handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + handleImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index f83e281..ba13804 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -144,6 +144,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); + private ImageRecycleViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -173,6 +174,11 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); + + verifyImageAdapter = new ImageRecycleViewAdapter(this); + caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseVerifyRecyclerView.setAdapter(verifyImageAdapter); } @Override @@ -418,7 +424,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (mediaList.size() != 2) { + if (verifyImageAdapter.getItemCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -434,7 +440,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (mediaList.size() != 2) { + if (verifyImageAdapter.getItemCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -583,36 +589,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + verifyImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + verifyImageAdapter.setDeleteView(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + verifyImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 7e736dd..ae2a1a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.check; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -114,11 +113,34 @@ public void handleMessage(Message msg) { CaseCheckFragment checkFragment = reference.get(); if (msg.what == Constant.CASE_CHECK_OK) { - Log.d(TAG, "核实查成功,更新列表"); + Log.d(TAG, "核查成功,更新列表"); checkFragment.isRefresh = true; //刷新之后页码重置 checkFragment.pageIndex = 1; checkFragment.caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex); + } else if (msg.what == 202104251) { + if (checkFragment.isRefresh || checkFragment.isLoadMore) { + checkFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (checkFragment.dataBeans.size() == 0) { + checkFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + checkFragment.emptyView.hide(); + checkFragment.adapter = new CaseCheckResultAdapter(checkFragment.context, checkFragment.dataBeans); + checkFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkFragment.context)); + checkFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkFragment.context, DividerItemDecoration.VERTICAL)); + checkFragment.caseRecyclerView.setAdapter(checkFragment.adapter); + checkFragment.adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(checkFragment.context, CaseCheckDetailActivity.class); + intent.putExtra("id", checkFragment.dataBeans.get(position).getId()); + checkFragment.startActivity(intent); + } + }); + } + } } } } @@ -142,42 +164,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104251); + weakReferenceHandler.sendEmptyMessage(202104251); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("您暂时没有待办案卷", null); - } else { - emptyView.hide(); - adapter = new CaseCheckResultAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseCheckDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index a9a3a79..b01fc84 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.check; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,6 +118,29 @@ //刷新之后页码重置 checkedFragment.pageIndex = 1; checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(checkedFragment.pageIndex); + } else if (msg.what == 202104252) { + if (checkedFragment.isRefresh || checkedFragment.isLoadMore) { + checkedFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (checkedFragment.dataBeans.size() == 0) { + checkedFragment.emptyView.show("您还没有已办案卷", null); + } else { + checkedFragment.emptyView.hide(); + checkedFragment.adapter = new CaseCheckedResultAdapter(checkedFragment.context, checkedFragment.dataBeans); + checkedFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkedFragment.context)); + checkedFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkedFragment.context, DividerItemDecoration.VERTICAL)); + checkedFragment.caseRecyclerView.setAdapter(checkedFragment.adapter); + checkedFragment.adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(checkedFragment.context, CaseCheckedDetailActivity.class); + intent.putExtra("id", checkedFragment.dataBeans.get(position).getId()); + checkedFragment.startActivity(intent); + } + }); + } + } } } } @@ -143,42 +165,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104252); + weakReferenceHandler.sendEmptyMessage(202104252); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("您还没有已办案卷", null); - } else { - emptyView.hide(); - adapter = new CaseCheckedResultAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseCheckedDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 9b74097..916ad06 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -116,6 +115,29 @@ //刷新之后页码重置 handledFragment.pageIndex = 1; handledFragment.caseHandledListPresenter.onReadyRetrofitRequest(handledFragment.pageIndex); + } else if (msg.what == 202104288) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("没有案卷需要处理", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new CaseHandledAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new CaseHandledAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(handledFragment.context, CaseHandledDetailActivity.class); + intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); + handledFragment.startActivity(intent); + } + }); + } + } } } } @@ -139,42 +161,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104288); + weakReferenceHandler.sendEmptyMessage(202104288); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandledAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandledAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandledDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c8f3bd5..a8e7cc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,8 +118,31 @@ caseTodoFragment.isRefresh = true; //刷新之后页码重置 caseTodoFragment.pageIndex = 1; - caseTodoFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, - null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); + caseTodoFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); + } else if (msg.what == 202104287) { + if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { + caseTodoFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (caseTodoFragment.dataBeans.size() == 0) { + caseTodoFragment.emptyView.show("没有案卷需要处理", null); + } else { + caseTodoFragment.emptyView.hide(); + caseTodoFragment.adapter = new CaseHandleAdapter(caseTodoFragment.context, caseTodoFragment.dataBeans); + caseTodoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(caseTodoFragment.context)); + caseTodoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(caseTodoFragment.context, DividerItemDecoration.VERTICAL)); + caseTodoFragment.caseRecyclerView.setAdapter(caseTodoFragment.adapter); + caseTodoFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(caseTodoFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", caseTodoFragment.dataBeans.get(position).getId()); + caseTodoFragment.startActivity(intent); + } + }); + } + } } } } @@ -144,43 +166,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104287); + weakReferenceHandler.sendEmptyMessage(202104287); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandleAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f46d446..e4cdbee 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -118,6 +118,7 @@ private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; private QMUITipDialog submitDialog; + private ImageRecycleViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -145,6 +146,11 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("提交中,请稍后") .create(); + + checkImageAdapter = new ImageRecycleViewAdapter(this); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.setAdapter(checkImageAdapter); } @Override @@ -214,6 +220,10 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } + if (checkImageAdapter.getItemCount() < 1 || checkImageAdapter.getItemCount() > 2) { + ToastHelper.showToast("当前案卷状态必须上传至少一张图片", ToastHelper.WARING); + return; + } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(mediaList)); } @@ -407,36 +417,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + checkImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + checkImageAdapter.setDeleteView(true); + checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + checkImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 5be798d..aca2f2d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -123,6 +123,7 @@ private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; private QMUITipDialog submitDialog; + private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -151,6 +152,11 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("提交中,请稍后") .create(); + + handleImageAdapter = new ImageRecycleViewAdapter(this); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(handleImageAdapter); } @Override @@ -328,7 +334,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时,处理图片必传。至少一张,最多两张 - if (mediaList.size() < 1 || mediaList.size() > 2) { + if (handleImageAdapter.getItemCount() < 1 || handleImageAdapter.getItemCount() > 2) { ToastHelper.showToast("当前案卷状态必须上传至少一张图片", ToastHelper.WARING); return; } @@ -412,36 +418,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + handleImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + handleImageAdapter.setDeleteView(true); + handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + handleImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index f83e281..ba13804 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -144,6 +144,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); + private ImageRecycleViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -173,6 +174,11 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); + + verifyImageAdapter = new ImageRecycleViewAdapter(this); + caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseVerifyRecyclerView.setAdapter(verifyImageAdapter); } @Override @@ -418,7 +424,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (mediaList.size() != 2) { + if (verifyImageAdapter.getItemCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -434,7 +440,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (mediaList.size() != 2) { + if (verifyImageAdapter.getItemCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -583,36 +589,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + verifyImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + verifyImageAdapter.setDeleteView(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + verifyImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 7e736dd..ae2a1a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.check; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -114,11 +113,34 @@ public void handleMessage(Message msg) { CaseCheckFragment checkFragment = reference.get(); if (msg.what == Constant.CASE_CHECK_OK) { - Log.d(TAG, "核实查成功,更新列表"); + Log.d(TAG, "核查成功,更新列表"); checkFragment.isRefresh = true; //刷新之后页码重置 checkFragment.pageIndex = 1; checkFragment.caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex); + } else if (msg.what == 202104251) { + if (checkFragment.isRefresh || checkFragment.isLoadMore) { + checkFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (checkFragment.dataBeans.size() == 0) { + checkFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + checkFragment.emptyView.hide(); + checkFragment.adapter = new CaseCheckResultAdapter(checkFragment.context, checkFragment.dataBeans); + checkFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkFragment.context)); + checkFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkFragment.context, DividerItemDecoration.VERTICAL)); + checkFragment.caseRecyclerView.setAdapter(checkFragment.adapter); + checkFragment.adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(checkFragment.context, CaseCheckDetailActivity.class); + intent.putExtra("id", checkFragment.dataBeans.get(position).getId()); + checkFragment.startActivity(intent); + } + }); + } + } } } } @@ -142,42 +164,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104251); + weakReferenceHandler.sendEmptyMessage(202104251); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("您暂时没有待办案卷", null); - } else { - emptyView.hide(); - adapter = new CaseCheckResultAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseCheckDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index a9a3a79..b01fc84 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.check; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,6 +118,29 @@ //刷新之后页码重置 checkedFragment.pageIndex = 1; checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(checkedFragment.pageIndex); + } else if (msg.what == 202104252) { + if (checkedFragment.isRefresh || checkedFragment.isLoadMore) { + checkedFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (checkedFragment.dataBeans.size() == 0) { + checkedFragment.emptyView.show("您还没有已办案卷", null); + } else { + checkedFragment.emptyView.hide(); + checkedFragment.adapter = new CaseCheckedResultAdapter(checkedFragment.context, checkedFragment.dataBeans); + checkedFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkedFragment.context)); + checkedFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkedFragment.context, DividerItemDecoration.VERTICAL)); + checkedFragment.caseRecyclerView.setAdapter(checkedFragment.adapter); + checkedFragment.adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(checkedFragment.context, CaseCheckedDetailActivity.class); + intent.putExtra("id", checkedFragment.dataBeans.get(position).getId()); + checkedFragment.startActivity(intent); + } + }); + } + } } } } @@ -143,42 +165,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104252); + weakReferenceHandler.sendEmptyMessage(202104252); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("您还没有已办案卷", null); - } else { - emptyView.hide(); - adapter = new CaseCheckedResultAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseCheckedDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 9b74097..916ad06 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -116,6 +115,29 @@ //刷新之后页码重置 handledFragment.pageIndex = 1; handledFragment.caseHandledListPresenter.onReadyRetrofitRequest(handledFragment.pageIndex); + } else if (msg.what == 202104288) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("没有案卷需要处理", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new CaseHandledAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new CaseHandledAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(handledFragment.context, CaseHandledDetailActivity.class); + intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); + handledFragment.startActivity(intent); + } + }); + } + } } } } @@ -139,42 +161,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104288); + weakReferenceHandler.sendEmptyMessage(202104288); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandledAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandledAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandledDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c8f3bd5..a8e7cc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,8 +118,31 @@ caseTodoFragment.isRefresh = true; //刷新之后页码重置 caseTodoFragment.pageIndex = 1; - caseTodoFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, - null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); + caseTodoFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); + } else if (msg.what == 202104287) { + if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { + caseTodoFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (caseTodoFragment.dataBeans.size() == 0) { + caseTodoFragment.emptyView.show("没有案卷需要处理", null); + } else { + caseTodoFragment.emptyView.hide(); + caseTodoFragment.adapter = new CaseHandleAdapter(caseTodoFragment.context, caseTodoFragment.dataBeans); + caseTodoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(caseTodoFragment.context)); + caseTodoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(caseTodoFragment.context, DividerItemDecoration.VERTICAL)); + caseTodoFragment.caseRecyclerView.setAdapter(caseTodoFragment.adapter); + caseTodoFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(caseTodoFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", caseTodoFragment.dataBeans.get(position).getId()); + caseTodoFragment.startActivity(intent); + } + }); + } + } } } } @@ -144,43 +166,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104287); + weakReferenceHandler.sendEmptyMessage(202104287); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandleAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 7227dfd..8a14832 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,8 +118,31 @@ overtimeCaseFragment.isRefresh = true; //刷新之后页码重置 overtimeCaseFragment.pageIndex = 1; - overtimeCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest("1", - null, Constant.PAGE_LIMIT, overtimeCaseFragment.pageIndex); + overtimeCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, overtimeCaseFragment.pageIndex); + } else if (msg.what == 202104285) { + if (overtimeCaseFragment.isRefresh || overtimeCaseFragment.isLoadMore) { + overtimeCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (overtimeCaseFragment.dataBeans.size() == 0) { + overtimeCaseFragment.emptyView.show("没有案卷需要处理", null); + } else { + overtimeCaseFragment.emptyView.hide(); + overtimeCaseFragment.adapter = new CaseHandleAdapter(overtimeCaseFragment.context, overtimeCaseFragment.dataBeans); + overtimeCaseFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(overtimeCaseFragment.context)); + overtimeCaseFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(overtimeCaseFragment.context, DividerItemDecoration.VERTICAL)); + overtimeCaseFragment.caseRecyclerView.setAdapter(overtimeCaseFragment.adapter); + overtimeCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(overtimeCaseFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", overtimeCaseFragment.dataBeans.get(position).getId()); + overtimeCaseFragment.startActivity(intent); + } + }); + } + } } } } @@ -145,43 +167,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104285); + weakReferenceHandler.sendEmptyMessage(202104285); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandleAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f46d446..e4cdbee 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -118,6 +118,7 @@ private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; private QMUITipDialog submitDialog; + private ImageRecycleViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -145,6 +146,11 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("提交中,请稍后") .create(); + + checkImageAdapter = new ImageRecycleViewAdapter(this); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.setAdapter(checkImageAdapter); } @Override @@ -214,6 +220,10 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } + if (checkImageAdapter.getItemCount() < 1 || checkImageAdapter.getItemCount() > 2) { + ToastHelper.showToast("当前案卷状态必须上传至少一张图片", ToastHelper.WARING); + return; + } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(mediaList)); } @@ -407,36 +417,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + checkImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + checkImageAdapter.setDeleteView(true); + checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + checkImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 5be798d..aca2f2d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -123,6 +123,7 @@ private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; private QMUITipDialog submitDialog; + private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -151,6 +152,11 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("提交中,请稍后") .create(); + + handleImageAdapter = new ImageRecycleViewAdapter(this); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(handleImageAdapter); } @Override @@ -328,7 +334,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时,处理图片必传。至少一张,最多两张 - if (mediaList.size() < 1 || mediaList.size() > 2) { + if (handleImageAdapter.getItemCount() < 1 || handleImageAdapter.getItemCount() > 2) { ToastHelper.showToast("当前案卷状态必须上传至少一张图片", ToastHelper.WARING); return; } @@ -412,36 +418,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + handleImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + handleImageAdapter.setDeleteView(true); + handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + handleImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index f83e281..ba13804 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -144,6 +144,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); + private ImageRecycleViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -173,6 +174,11 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); + + verifyImageAdapter = new ImageRecycleViewAdapter(this); + caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseVerifyRecyclerView.setAdapter(verifyImageAdapter); } @Override @@ -418,7 +424,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (mediaList.size() != 2) { + if (verifyImageAdapter.getItemCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -434,7 +440,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (mediaList.size() != 2) { + if (verifyImageAdapter.getItemCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -583,36 +589,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + verifyImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + verifyImageAdapter.setDeleteView(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + verifyImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 7e736dd..ae2a1a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.check; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -114,11 +113,34 @@ public void handleMessage(Message msg) { CaseCheckFragment checkFragment = reference.get(); if (msg.what == Constant.CASE_CHECK_OK) { - Log.d(TAG, "核实查成功,更新列表"); + Log.d(TAG, "核查成功,更新列表"); checkFragment.isRefresh = true; //刷新之后页码重置 checkFragment.pageIndex = 1; checkFragment.caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex); + } else if (msg.what == 202104251) { + if (checkFragment.isRefresh || checkFragment.isLoadMore) { + checkFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (checkFragment.dataBeans.size() == 0) { + checkFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + checkFragment.emptyView.hide(); + checkFragment.adapter = new CaseCheckResultAdapter(checkFragment.context, checkFragment.dataBeans); + checkFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkFragment.context)); + checkFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkFragment.context, DividerItemDecoration.VERTICAL)); + checkFragment.caseRecyclerView.setAdapter(checkFragment.adapter); + checkFragment.adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(checkFragment.context, CaseCheckDetailActivity.class); + intent.putExtra("id", checkFragment.dataBeans.get(position).getId()); + checkFragment.startActivity(intent); + } + }); + } + } } } } @@ -142,42 +164,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104251); + weakReferenceHandler.sendEmptyMessage(202104251); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("您暂时没有待办案卷", null); - } else { - emptyView.hide(); - adapter = new CaseCheckResultAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseCheckDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index a9a3a79..b01fc84 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.check; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,6 +118,29 @@ //刷新之后页码重置 checkedFragment.pageIndex = 1; checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(checkedFragment.pageIndex); + } else if (msg.what == 202104252) { + if (checkedFragment.isRefresh || checkedFragment.isLoadMore) { + checkedFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (checkedFragment.dataBeans.size() == 0) { + checkedFragment.emptyView.show("您还没有已办案卷", null); + } else { + checkedFragment.emptyView.hide(); + checkedFragment.adapter = new CaseCheckedResultAdapter(checkedFragment.context, checkedFragment.dataBeans); + checkedFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkedFragment.context)); + checkedFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkedFragment.context, DividerItemDecoration.VERTICAL)); + checkedFragment.caseRecyclerView.setAdapter(checkedFragment.adapter); + checkedFragment.adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(checkedFragment.context, CaseCheckedDetailActivity.class); + intent.putExtra("id", checkedFragment.dataBeans.get(position).getId()); + checkedFragment.startActivity(intent); + } + }); + } + } } } } @@ -143,42 +165,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104252); + weakReferenceHandler.sendEmptyMessage(202104252); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("您还没有已办案卷", null); - } else { - emptyView.hide(); - adapter = new CaseCheckedResultAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseCheckedDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 9b74097..916ad06 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -116,6 +115,29 @@ //刷新之后页码重置 handledFragment.pageIndex = 1; handledFragment.caseHandledListPresenter.onReadyRetrofitRequest(handledFragment.pageIndex); + } else if (msg.what == 202104288) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("没有案卷需要处理", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new CaseHandledAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new CaseHandledAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(handledFragment.context, CaseHandledDetailActivity.class); + intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); + handledFragment.startActivity(intent); + } + }); + } + } } } } @@ -139,42 +161,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104288); + weakReferenceHandler.sendEmptyMessage(202104288); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandledAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandledAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandledDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c8f3bd5..a8e7cc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,8 +118,31 @@ caseTodoFragment.isRefresh = true; //刷新之后页码重置 caseTodoFragment.pageIndex = 1; - caseTodoFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, - null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); + caseTodoFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); + } else if (msg.what == 202104287) { + if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { + caseTodoFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (caseTodoFragment.dataBeans.size() == 0) { + caseTodoFragment.emptyView.show("没有案卷需要处理", null); + } else { + caseTodoFragment.emptyView.hide(); + caseTodoFragment.adapter = new CaseHandleAdapter(caseTodoFragment.context, caseTodoFragment.dataBeans); + caseTodoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(caseTodoFragment.context)); + caseTodoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(caseTodoFragment.context, DividerItemDecoration.VERTICAL)); + caseTodoFragment.caseRecyclerView.setAdapter(caseTodoFragment.adapter); + caseTodoFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(caseTodoFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", caseTodoFragment.dataBeans.get(position).getId()); + caseTodoFragment.startActivity(intent); + } + }); + } + } } } } @@ -144,43 +166,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104287); + weakReferenceHandler.sendEmptyMessage(202104287); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandleAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 7227dfd..8a14832 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,8 +118,31 @@ overtimeCaseFragment.isRefresh = true; //刷新之后页码重置 overtimeCaseFragment.pageIndex = 1; - overtimeCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest("1", - null, Constant.PAGE_LIMIT, overtimeCaseFragment.pageIndex); + overtimeCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, overtimeCaseFragment.pageIndex); + } else if (msg.what == 202104285) { + if (overtimeCaseFragment.isRefresh || overtimeCaseFragment.isLoadMore) { + overtimeCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (overtimeCaseFragment.dataBeans.size() == 0) { + overtimeCaseFragment.emptyView.show("没有案卷需要处理", null); + } else { + overtimeCaseFragment.emptyView.hide(); + overtimeCaseFragment.adapter = new CaseHandleAdapter(overtimeCaseFragment.context, overtimeCaseFragment.dataBeans); + overtimeCaseFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(overtimeCaseFragment.context)); + overtimeCaseFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(overtimeCaseFragment.context, DividerItemDecoration.VERTICAL)); + overtimeCaseFragment.caseRecyclerView.setAdapter(overtimeCaseFragment.adapter); + overtimeCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(overtimeCaseFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", overtimeCaseFragment.dataBeans.get(position).getId()); + overtimeCaseFragment.startActivity(intent); + } + }); + } + } } } } @@ -145,43 +167,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104285); + weakReferenceHandler.sendEmptyMessage(202104285); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandleAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index b0ab4f5..edbad6e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,8 +118,31 @@ urgentCaseFragment.isRefresh = true; //刷新之后页码重置 urgentCaseFragment.pageIndex = 1; - urgentCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, - "1", Constant.PAGE_LIMIT, urgentCaseFragment.pageIndex); + urgentCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, urgentCaseFragment.pageIndex); + } else if (msg.what == 202104286) { + if (urgentCaseFragment.isRefresh || urgentCaseFragment.isLoadMore) { + urgentCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (urgentCaseFragment.dataBeans.size() == 0) { + urgentCaseFragment.emptyView.show("没有案卷需要处理", null); + } else { + urgentCaseFragment.emptyView.hide(); + urgentCaseFragment.adapter = new CaseHandleAdapter(urgentCaseFragment.context, urgentCaseFragment.dataBeans); + urgentCaseFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(urgentCaseFragment.context)); + urgentCaseFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(urgentCaseFragment.context, DividerItemDecoration.VERTICAL)); + urgentCaseFragment.caseRecyclerView.setAdapter(urgentCaseFragment.adapter); + urgentCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(urgentCaseFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", urgentCaseFragment.dataBeans.get(position).getId()); + urgentCaseFragment.startActivity(intent); + } + }); + } + } } } } @@ -145,43 +167,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104286); + weakReferenceHandler.sendEmptyMessage(202104286); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandleAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f46d446..e4cdbee 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -118,6 +118,7 @@ private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; private QMUITipDialog submitDialog; + private ImageRecycleViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -145,6 +146,11 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("提交中,请稍后") .create(); + + checkImageAdapter = new ImageRecycleViewAdapter(this); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.setAdapter(checkImageAdapter); } @Override @@ -214,6 +220,10 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } + if (checkImageAdapter.getItemCount() < 1 || checkImageAdapter.getItemCount() > 2) { + ToastHelper.showToast("当前案卷状态必须上传至少一张图片", ToastHelper.WARING); + return; + } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(mediaList)); } @@ -407,36 +417,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + checkImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + checkImageAdapter.setDeleteView(true); + checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + checkImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 5be798d..aca2f2d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -123,6 +123,7 @@ private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; private QMUITipDialog submitDialog; + private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -151,6 +152,11 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("提交中,请稍后") .create(); + + handleImageAdapter = new ImageRecycleViewAdapter(this); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(handleImageAdapter); } @Override @@ -328,7 +334,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时,处理图片必传。至少一张,最多两张 - if (mediaList.size() < 1 || mediaList.size() > 2) { + if (handleImageAdapter.getItemCount() < 1 || handleImageAdapter.getItemCount() > 2) { ToastHelper.showToast("当前案卷状态必须上传至少一张图片", ToastHelper.WARING); return; } @@ -412,36 +418,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + handleImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + handleImageAdapter.setDeleteView(true); + handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + handleImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index f83e281..ba13804 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -144,6 +144,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); + private ImageRecycleViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -173,6 +174,11 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); + + verifyImageAdapter = new ImageRecycleViewAdapter(this); + caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseVerifyRecyclerView.setAdapter(verifyImageAdapter); } @Override @@ -418,7 +424,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (mediaList.size() != 2) { + if (verifyImageAdapter.getItemCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -434,7 +440,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (mediaList.size() != 2) { + if (verifyImageAdapter.getItemCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -583,36 +589,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + verifyImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + verifyImageAdapter.setDeleteView(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + verifyImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 7e736dd..ae2a1a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.check; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -114,11 +113,34 @@ public void handleMessage(Message msg) { CaseCheckFragment checkFragment = reference.get(); if (msg.what == Constant.CASE_CHECK_OK) { - Log.d(TAG, "核实查成功,更新列表"); + Log.d(TAG, "核查成功,更新列表"); checkFragment.isRefresh = true; //刷新之后页码重置 checkFragment.pageIndex = 1; checkFragment.caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex); + } else if (msg.what == 202104251) { + if (checkFragment.isRefresh || checkFragment.isLoadMore) { + checkFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (checkFragment.dataBeans.size() == 0) { + checkFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + checkFragment.emptyView.hide(); + checkFragment.adapter = new CaseCheckResultAdapter(checkFragment.context, checkFragment.dataBeans); + checkFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkFragment.context)); + checkFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkFragment.context, DividerItemDecoration.VERTICAL)); + checkFragment.caseRecyclerView.setAdapter(checkFragment.adapter); + checkFragment.adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(checkFragment.context, CaseCheckDetailActivity.class); + intent.putExtra("id", checkFragment.dataBeans.get(position).getId()); + checkFragment.startActivity(intent); + } + }); + } + } } } } @@ -142,42 +164,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104251); + weakReferenceHandler.sendEmptyMessage(202104251); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("您暂时没有待办案卷", null); - } else { - emptyView.hide(); - adapter = new CaseCheckResultAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseCheckDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index a9a3a79..b01fc84 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.check; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,6 +118,29 @@ //刷新之后页码重置 checkedFragment.pageIndex = 1; checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(checkedFragment.pageIndex); + } else if (msg.what == 202104252) { + if (checkedFragment.isRefresh || checkedFragment.isLoadMore) { + checkedFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (checkedFragment.dataBeans.size() == 0) { + checkedFragment.emptyView.show("您还没有已办案卷", null); + } else { + checkedFragment.emptyView.hide(); + checkedFragment.adapter = new CaseCheckedResultAdapter(checkedFragment.context, checkedFragment.dataBeans); + checkedFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkedFragment.context)); + checkedFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkedFragment.context, DividerItemDecoration.VERTICAL)); + checkedFragment.caseRecyclerView.setAdapter(checkedFragment.adapter); + checkedFragment.adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(checkedFragment.context, CaseCheckedDetailActivity.class); + intent.putExtra("id", checkedFragment.dataBeans.get(position).getId()); + checkedFragment.startActivity(intent); + } + }); + } + } } } } @@ -143,42 +165,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104252); + weakReferenceHandler.sendEmptyMessage(202104252); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("您还没有已办案卷", null); - } else { - emptyView.hide(); - adapter = new CaseCheckedResultAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseCheckedDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 9b74097..916ad06 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -116,6 +115,29 @@ //刷新之后页码重置 handledFragment.pageIndex = 1; handledFragment.caseHandledListPresenter.onReadyRetrofitRequest(handledFragment.pageIndex); + } else if (msg.what == 202104288) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("没有案卷需要处理", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new CaseHandledAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new CaseHandledAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(handledFragment.context, CaseHandledDetailActivity.class); + intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); + handledFragment.startActivity(intent); + } + }); + } + } } } } @@ -139,42 +161,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104288); + weakReferenceHandler.sendEmptyMessage(202104288); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandledAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandledAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandledDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c8f3bd5..a8e7cc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,8 +118,31 @@ caseTodoFragment.isRefresh = true; //刷新之后页码重置 caseTodoFragment.pageIndex = 1; - caseTodoFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, - null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); + caseTodoFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); + } else if (msg.what == 202104287) { + if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { + caseTodoFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (caseTodoFragment.dataBeans.size() == 0) { + caseTodoFragment.emptyView.show("没有案卷需要处理", null); + } else { + caseTodoFragment.emptyView.hide(); + caseTodoFragment.adapter = new CaseHandleAdapter(caseTodoFragment.context, caseTodoFragment.dataBeans); + caseTodoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(caseTodoFragment.context)); + caseTodoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(caseTodoFragment.context, DividerItemDecoration.VERTICAL)); + caseTodoFragment.caseRecyclerView.setAdapter(caseTodoFragment.adapter); + caseTodoFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(caseTodoFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", caseTodoFragment.dataBeans.get(position).getId()); + caseTodoFragment.startActivity(intent); + } + }); + } + } } } } @@ -144,43 +166,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104287); + weakReferenceHandler.sendEmptyMessage(202104287); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandleAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 7227dfd..8a14832 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,8 +118,31 @@ overtimeCaseFragment.isRefresh = true; //刷新之后页码重置 overtimeCaseFragment.pageIndex = 1; - overtimeCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest("1", - null, Constant.PAGE_LIMIT, overtimeCaseFragment.pageIndex); + overtimeCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, overtimeCaseFragment.pageIndex); + } else if (msg.what == 202104285) { + if (overtimeCaseFragment.isRefresh || overtimeCaseFragment.isLoadMore) { + overtimeCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (overtimeCaseFragment.dataBeans.size() == 0) { + overtimeCaseFragment.emptyView.show("没有案卷需要处理", null); + } else { + overtimeCaseFragment.emptyView.hide(); + overtimeCaseFragment.adapter = new CaseHandleAdapter(overtimeCaseFragment.context, overtimeCaseFragment.dataBeans); + overtimeCaseFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(overtimeCaseFragment.context)); + overtimeCaseFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(overtimeCaseFragment.context, DividerItemDecoration.VERTICAL)); + overtimeCaseFragment.caseRecyclerView.setAdapter(overtimeCaseFragment.adapter); + overtimeCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(overtimeCaseFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", overtimeCaseFragment.dataBeans.get(position).getId()); + overtimeCaseFragment.startActivity(intent); + } + }); + } + } } } } @@ -145,43 +167,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104285); + weakReferenceHandler.sendEmptyMessage(202104285); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandleAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index b0ab4f5..edbad6e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,8 +118,31 @@ urgentCaseFragment.isRefresh = true; //刷新之后页码重置 urgentCaseFragment.pageIndex = 1; - urgentCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, - "1", Constant.PAGE_LIMIT, urgentCaseFragment.pageIndex); + urgentCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, urgentCaseFragment.pageIndex); + } else if (msg.what == 202104286) { + if (urgentCaseFragment.isRefresh || urgentCaseFragment.isLoadMore) { + urgentCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (urgentCaseFragment.dataBeans.size() == 0) { + urgentCaseFragment.emptyView.show("没有案卷需要处理", null); + } else { + urgentCaseFragment.emptyView.hide(); + urgentCaseFragment.adapter = new CaseHandleAdapter(urgentCaseFragment.context, urgentCaseFragment.dataBeans); + urgentCaseFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(urgentCaseFragment.context)); + urgentCaseFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(urgentCaseFragment.context, DividerItemDecoration.VERTICAL)); + urgentCaseFragment.caseRecyclerView.setAdapter(urgentCaseFragment.adapter); + urgentCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(urgentCaseFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", urgentCaseFragment.dataBeans.get(position).getId()); + urgentCaseFragment.startActivity(intent); + } + }); + } + } } } } @@ -145,43 +167,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104286); + weakReferenceHandler.sendEmptyMessage(202104286); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandleAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index eef7916..8986954 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.overtime; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -117,6 +116,29 @@ //刷新之后页码重置 handledFragment.pageIndex = 1; handledFragment.overtimeCaseListPresenter.onReadyRetrofitRequest("1", handledFragment.pageIndex); + } else if (msg.what == 202104284) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("没有紧急案卷", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new OvertimeCaseAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(handledFragment.context, CaseTodoHandledDetailActivity.class); + intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); + handledFragment.startActivity(intent); + } + }); + } + } } } } @@ -141,42 +163,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104284); + weakReferenceHandler.sendEmptyMessage(202104284); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104284) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); - } else { - emptyView.hide(); - adapter = new OvertimeCaseAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseTodoHandledDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f46d446..e4cdbee 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -118,6 +118,7 @@ private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; private QMUITipDialog submitDialog; + private ImageRecycleViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -145,6 +146,11 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("提交中,请稍后") .create(); + + checkImageAdapter = new ImageRecycleViewAdapter(this); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.setAdapter(checkImageAdapter); } @Override @@ -214,6 +220,10 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } + if (checkImageAdapter.getItemCount() < 1 || checkImageAdapter.getItemCount() > 2) { + ToastHelper.showToast("当前案卷状态必须上传至少一张图片", ToastHelper.WARING); + return; + } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(mediaList)); } @@ -407,36 +417,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + checkImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + checkImageAdapter.setDeleteView(true); + checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + checkImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 5be798d..aca2f2d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -123,6 +123,7 @@ private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; private QMUITipDialog submitDialog; + private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -151,6 +152,11 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("提交中,请稍后") .create(); + + handleImageAdapter = new ImageRecycleViewAdapter(this); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(handleImageAdapter); } @Override @@ -328,7 +334,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时,处理图片必传。至少一张,最多两张 - if (mediaList.size() < 1 || mediaList.size() > 2) { + if (handleImageAdapter.getItemCount() < 1 || handleImageAdapter.getItemCount() > 2) { ToastHelper.showToast("当前案卷状态必须上传至少一张图片", ToastHelper.WARING); return; } @@ -412,36 +418,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + handleImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + handleImageAdapter.setDeleteView(true); + handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + handleImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index f83e281..ba13804 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -144,6 +144,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); + private ImageRecycleViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -173,6 +174,11 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); + + verifyImageAdapter = new ImageRecycleViewAdapter(this); + caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseVerifyRecyclerView.setAdapter(verifyImageAdapter); } @Override @@ -418,7 +424,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (mediaList.size() != 2) { + if (verifyImageAdapter.getItemCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -434,7 +440,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (mediaList.size() != 2) { + if (verifyImageAdapter.getItemCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -583,36 +589,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + verifyImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + verifyImageAdapter.setDeleteView(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + verifyImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 7e736dd..ae2a1a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.check; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -114,11 +113,34 @@ public void handleMessage(Message msg) { CaseCheckFragment checkFragment = reference.get(); if (msg.what == Constant.CASE_CHECK_OK) { - Log.d(TAG, "核实查成功,更新列表"); + Log.d(TAG, "核查成功,更新列表"); checkFragment.isRefresh = true; //刷新之后页码重置 checkFragment.pageIndex = 1; checkFragment.caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex); + } else if (msg.what == 202104251) { + if (checkFragment.isRefresh || checkFragment.isLoadMore) { + checkFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (checkFragment.dataBeans.size() == 0) { + checkFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + checkFragment.emptyView.hide(); + checkFragment.adapter = new CaseCheckResultAdapter(checkFragment.context, checkFragment.dataBeans); + checkFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkFragment.context)); + checkFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkFragment.context, DividerItemDecoration.VERTICAL)); + checkFragment.caseRecyclerView.setAdapter(checkFragment.adapter); + checkFragment.adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(checkFragment.context, CaseCheckDetailActivity.class); + intent.putExtra("id", checkFragment.dataBeans.get(position).getId()); + checkFragment.startActivity(intent); + } + }); + } + } } } } @@ -142,42 +164,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104251); + weakReferenceHandler.sendEmptyMessage(202104251); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("您暂时没有待办案卷", null); - } else { - emptyView.hide(); - adapter = new CaseCheckResultAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseCheckDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index a9a3a79..b01fc84 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.check; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,6 +118,29 @@ //刷新之后页码重置 checkedFragment.pageIndex = 1; checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(checkedFragment.pageIndex); + } else if (msg.what == 202104252) { + if (checkedFragment.isRefresh || checkedFragment.isLoadMore) { + checkedFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (checkedFragment.dataBeans.size() == 0) { + checkedFragment.emptyView.show("您还没有已办案卷", null); + } else { + checkedFragment.emptyView.hide(); + checkedFragment.adapter = new CaseCheckedResultAdapter(checkedFragment.context, checkedFragment.dataBeans); + checkedFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkedFragment.context)); + checkedFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkedFragment.context, DividerItemDecoration.VERTICAL)); + checkedFragment.caseRecyclerView.setAdapter(checkedFragment.adapter); + checkedFragment.adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(checkedFragment.context, CaseCheckedDetailActivity.class); + intent.putExtra("id", checkedFragment.dataBeans.get(position).getId()); + checkedFragment.startActivity(intent); + } + }); + } + } } } } @@ -143,42 +165,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104252); + weakReferenceHandler.sendEmptyMessage(202104252); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("您还没有已办案卷", null); - } else { - emptyView.hide(); - adapter = new CaseCheckedResultAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseCheckedDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 9b74097..916ad06 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -116,6 +115,29 @@ //刷新之后页码重置 handledFragment.pageIndex = 1; handledFragment.caseHandledListPresenter.onReadyRetrofitRequest(handledFragment.pageIndex); + } else if (msg.what == 202104288) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("没有案卷需要处理", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new CaseHandledAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new CaseHandledAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(handledFragment.context, CaseHandledDetailActivity.class); + intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); + handledFragment.startActivity(intent); + } + }); + } + } } } } @@ -139,42 +161,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104288); + weakReferenceHandler.sendEmptyMessage(202104288); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandledAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandledAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandledDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c8f3bd5..a8e7cc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,8 +118,31 @@ caseTodoFragment.isRefresh = true; //刷新之后页码重置 caseTodoFragment.pageIndex = 1; - caseTodoFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, - null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); + caseTodoFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); + } else if (msg.what == 202104287) { + if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { + caseTodoFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (caseTodoFragment.dataBeans.size() == 0) { + caseTodoFragment.emptyView.show("没有案卷需要处理", null); + } else { + caseTodoFragment.emptyView.hide(); + caseTodoFragment.adapter = new CaseHandleAdapter(caseTodoFragment.context, caseTodoFragment.dataBeans); + caseTodoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(caseTodoFragment.context)); + caseTodoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(caseTodoFragment.context, DividerItemDecoration.VERTICAL)); + caseTodoFragment.caseRecyclerView.setAdapter(caseTodoFragment.adapter); + caseTodoFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(caseTodoFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", caseTodoFragment.dataBeans.get(position).getId()); + caseTodoFragment.startActivity(intent); + } + }); + } + } } } } @@ -144,43 +166,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104287); + weakReferenceHandler.sendEmptyMessage(202104287); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandleAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 7227dfd..8a14832 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,8 +118,31 @@ overtimeCaseFragment.isRefresh = true; //刷新之后页码重置 overtimeCaseFragment.pageIndex = 1; - overtimeCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest("1", - null, Constant.PAGE_LIMIT, overtimeCaseFragment.pageIndex); + overtimeCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, overtimeCaseFragment.pageIndex); + } else if (msg.what == 202104285) { + if (overtimeCaseFragment.isRefresh || overtimeCaseFragment.isLoadMore) { + overtimeCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (overtimeCaseFragment.dataBeans.size() == 0) { + overtimeCaseFragment.emptyView.show("没有案卷需要处理", null); + } else { + overtimeCaseFragment.emptyView.hide(); + overtimeCaseFragment.adapter = new CaseHandleAdapter(overtimeCaseFragment.context, overtimeCaseFragment.dataBeans); + overtimeCaseFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(overtimeCaseFragment.context)); + overtimeCaseFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(overtimeCaseFragment.context, DividerItemDecoration.VERTICAL)); + overtimeCaseFragment.caseRecyclerView.setAdapter(overtimeCaseFragment.adapter); + overtimeCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(overtimeCaseFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", overtimeCaseFragment.dataBeans.get(position).getId()); + overtimeCaseFragment.startActivity(intent); + } + }); + } + } } } } @@ -145,43 +167,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104285); + weakReferenceHandler.sendEmptyMessage(202104285); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandleAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index b0ab4f5..edbad6e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,8 +118,31 @@ urgentCaseFragment.isRefresh = true; //刷新之后页码重置 urgentCaseFragment.pageIndex = 1; - urgentCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, - "1", Constant.PAGE_LIMIT, urgentCaseFragment.pageIndex); + urgentCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, urgentCaseFragment.pageIndex); + } else if (msg.what == 202104286) { + if (urgentCaseFragment.isRefresh || urgentCaseFragment.isLoadMore) { + urgentCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (urgentCaseFragment.dataBeans.size() == 0) { + urgentCaseFragment.emptyView.show("没有案卷需要处理", null); + } else { + urgentCaseFragment.emptyView.hide(); + urgentCaseFragment.adapter = new CaseHandleAdapter(urgentCaseFragment.context, urgentCaseFragment.dataBeans); + urgentCaseFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(urgentCaseFragment.context)); + urgentCaseFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(urgentCaseFragment.context, DividerItemDecoration.VERTICAL)); + urgentCaseFragment.caseRecyclerView.setAdapter(urgentCaseFragment.adapter); + urgentCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(urgentCaseFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", urgentCaseFragment.dataBeans.get(position).getId()); + urgentCaseFragment.startActivity(intent); + } + }); + } + } } } } @@ -145,43 +167,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104286); + weakReferenceHandler.sendEmptyMessage(202104286); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandleAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index eef7916..8986954 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.overtime; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -117,6 +116,29 @@ //刷新之后页码重置 handledFragment.pageIndex = 1; handledFragment.overtimeCaseListPresenter.onReadyRetrofitRequest("1", handledFragment.pageIndex); + } else if (msg.what == 202104284) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("没有紧急案卷", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new OvertimeCaseAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(handledFragment.context, CaseTodoHandledDetailActivity.class); + intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); + handledFragment.startActivity(intent); + } + }); + } + } } } } @@ -141,42 +163,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104284); + weakReferenceHandler.sendEmptyMessage(202104284); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104284) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); - } else { - emptyView.hide(); - adapter = new OvertimeCaseAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseTodoHandledDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index 69ad1e0..db01e7d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.overtime; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -117,6 +116,30 @@ //刷新之后页码重置 caseTodoFragment.pageIndex = 1; caseTodoFragment.overtimeCaseListPresenter.onReadyRetrofitRequest("0", caseTodoFragment.pageIndex); + } else if (msg.what == 202104283) { + if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { + caseTodoFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (caseTodoFragment.dataBeans.size() == 0) { + caseTodoFragment.emptyView.show("没有紧急案卷", null); + } else { + caseTodoFragment.emptyView.hide(); + caseTodoFragment.adapter = new OvertimeCaseAdapter(caseTodoFragment.context, caseTodoFragment.dataBeans); + caseTodoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(caseTodoFragment.context)); + caseTodoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(caseTodoFragment.context, DividerItemDecoration.VERTICAL)); + caseTodoFragment.caseRecyclerView.setAdapter(caseTodoFragment.adapter); + caseTodoFragment.adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(caseTodoFragment.context, CaseTodoDetailActivity.class); + intent.putExtra("title", "超时督办"); + intent.putExtra("id", caseTodoFragment.dataBeans.get(position).getId()); + caseTodoFragment.startActivity(intent); + } + }); + } + } } } } @@ -141,43 +164,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104283); + weakReferenceHandler.sendEmptyMessage(202104283); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104283) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); - } else { - emptyView.hide(); - adapter = new OvertimeCaseAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseTodoDetailActivity.class); - intent.putExtra("title", "超时督办"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f46d446..e4cdbee 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -118,6 +118,7 @@ private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; private QMUITipDialog submitDialog; + private ImageRecycleViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -145,6 +146,11 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("提交中,请稍后") .create(); + + checkImageAdapter = new ImageRecycleViewAdapter(this); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.setAdapter(checkImageAdapter); } @Override @@ -214,6 +220,10 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } + if (checkImageAdapter.getItemCount() < 1 || checkImageAdapter.getItemCount() > 2) { + ToastHelper.showToast("当前案卷状态必须上传至少一张图片", ToastHelper.WARING); + return; + } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(mediaList)); } @@ -407,36 +417,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + checkImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + checkImageAdapter.setDeleteView(true); + checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + checkImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 5be798d..aca2f2d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -123,6 +123,7 @@ private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; private QMUITipDialog submitDialog; + private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -151,6 +152,11 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("提交中,请稍后") .create(); + + handleImageAdapter = new ImageRecycleViewAdapter(this); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(handleImageAdapter); } @Override @@ -328,7 +334,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时,处理图片必传。至少一张,最多两张 - if (mediaList.size() < 1 || mediaList.size() > 2) { + if (handleImageAdapter.getItemCount() < 1 || handleImageAdapter.getItemCount() > 2) { ToastHelper.showToast("当前案卷状态必须上传至少一张图片", ToastHelper.WARING); return; } @@ -412,36 +418,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + handleImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + handleImageAdapter.setDeleteView(true); + handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + handleImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index f83e281..ba13804 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -144,6 +144,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); + private ImageRecycleViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -173,6 +174,11 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); + + verifyImageAdapter = new ImageRecycleViewAdapter(this); + caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseVerifyRecyclerView.setAdapter(verifyImageAdapter); } @Override @@ -418,7 +424,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (mediaList.size() != 2) { + if (verifyImageAdapter.getItemCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -434,7 +440,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (mediaList.size() != 2) { + if (verifyImageAdapter.getItemCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -583,36 +589,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + verifyImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + verifyImageAdapter.setDeleteView(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + verifyImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 7e736dd..ae2a1a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.check; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -114,11 +113,34 @@ public void handleMessage(Message msg) { CaseCheckFragment checkFragment = reference.get(); if (msg.what == Constant.CASE_CHECK_OK) { - Log.d(TAG, "核实查成功,更新列表"); + Log.d(TAG, "核查成功,更新列表"); checkFragment.isRefresh = true; //刷新之后页码重置 checkFragment.pageIndex = 1; checkFragment.caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex); + } else if (msg.what == 202104251) { + if (checkFragment.isRefresh || checkFragment.isLoadMore) { + checkFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (checkFragment.dataBeans.size() == 0) { + checkFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + checkFragment.emptyView.hide(); + checkFragment.adapter = new CaseCheckResultAdapter(checkFragment.context, checkFragment.dataBeans); + checkFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkFragment.context)); + checkFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkFragment.context, DividerItemDecoration.VERTICAL)); + checkFragment.caseRecyclerView.setAdapter(checkFragment.adapter); + checkFragment.adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(checkFragment.context, CaseCheckDetailActivity.class); + intent.putExtra("id", checkFragment.dataBeans.get(position).getId()); + checkFragment.startActivity(intent); + } + }); + } + } } } } @@ -142,42 +164,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104251); + weakReferenceHandler.sendEmptyMessage(202104251); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("您暂时没有待办案卷", null); - } else { - emptyView.hide(); - adapter = new CaseCheckResultAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseCheckDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index a9a3a79..b01fc84 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.check; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,6 +118,29 @@ //刷新之后页码重置 checkedFragment.pageIndex = 1; checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(checkedFragment.pageIndex); + } else if (msg.what == 202104252) { + if (checkedFragment.isRefresh || checkedFragment.isLoadMore) { + checkedFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (checkedFragment.dataBeans.size() == 0) { + checkedFragment.emptyView.show("您还没有已办案卷", null); + } else { + checkedFragment.emptyView.hide(); + checkedFragment.adapter = new CaseCheckedResultAdapter(checkedFragment.context, checkedFragment.dataBeans); + checkedFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkedFragment.context)); + checkedFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkedFragment.context, DividerItemDecoration.VERTICAL)); + checkedFragment.caseRecyclerView.setAdapter(checkedFragment.adapter); + checkedFragment.adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(checkedFragment.context, CaseCheckedDetailActivity.class); + intent.putExtra("id", checkedFragment.dataBeans.get(position).getId()); + checkedFragment.startActivity(intent); + } + }); + } + } } } } @@ -143,42 +165,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104252); + weakReferenceHandler.sendEmptyMessage(202104252); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("您还没有已办案卷", null); - } else { - emptyView.hide(); - adapter = new CaseCheckedResultAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseCheckedDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 9b74097..916ad06 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -116,6 +115,29 @@ //刷新之后页码重置 handledFragment.pageIndex = 1; handledFragment.caseHandledListPresenter.onReadyRetrofitRequest(handledFragment.pageIndex); + } else if (msg.what == 202104288) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("没有案卷需要处理", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new CaseHandledAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new CaseHandledAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(handledFragment.context, CaseHandledDetailActivity.class); + intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); + handledFragment.startActivity(intent); + } + }); + } + } } } } @@ -139,42 +161,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104288); + weakReferenceHandler.sendEmptyMessage(202104288); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandledAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandledAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandledDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c8f3bd5..a8e7cc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,8 +118,31 @@ caseTodoFragment.isRefresh = true; //刷新之后页码重置 caseTodoFragment.pageIndex = 1; - caseTodoFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, - null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); + caseTodoFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); + } else if (msg.what == 202104287) { + if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { + caseTodoFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (caseTodoFragment.dataBeans.size() == 0) { + caseTodoFragment.emptyView.show("没有案卷需要处理", null); + } else { + caseTodoFragment.emptyView.hide(); + caseTodoFragment.adapter = new CaseHandleAdapter(caseTodoFragment.context, caseTodoFragment.dataBeans); + caseTodoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(caseTodoFragment.context)); + caseTodoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(caseTodoFragment.context, DividerItemDecoration.VERTICAL)); + caseTodoFragment.caseRecyclerView.setAdapter(caseTodoFragment.adapter); + caseTodoFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(caseTodoFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", caseTodoFragment.dataBeans.get(position).getId()); + caseTodoFragment.startActivity(intent); + } + }); + } + } } } } @@ -144,43 +166,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104287); + weakReferenceHandler.sendEmptyMessage(202104287); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandleAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 7227dfd..8a14832 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,8 +118,31 @@ overtimeCaseFragment.isRefresh = true; //刷新之后页码重置 overtimeCaseFragment.pageIndex = 1; - overtimeCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest("1", - null, Constant.PAGE_LIMIT, overtimeCaseFragment.pageIndex); + overtimeCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, overtimeCaseFragment.pageIndex); + } else if (msg.what == 202104285) { + if (overtimeCaseFragment.isRefresh || overtimeCaseFragment.isLoadMore) { + overtimeCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (overtimeCaseFragment.dataBeans.size() == 0) { + overtimeCaseFragment.emptyView.show("没有案卷需要处理", null); + } else { + overtimeCaseFragment.emptyView.hide(); + overtimeCaseFragment.adapter = new CaseHandleAdapter(overtimeCaseFragment.context, overtimeCaseFragment.dataBeans); + overtimeCaseFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(overtimeCaseFragment.context)); + overtimeCaseFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(overtimeCaseFragment.context, DividerItemDecoration.VERTICAL)); + overtimeCaseFragment.caseRecyclerView.setAdapter(overtimeCaseFragment.adapter); + overtimeCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(overtimeCaseFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", overtimeCaseFragment.dataBeans.get(position).getId()); + overtimeCaseFragment.startActivity(intent); + } + }); + } + } } } } @@ -145,43 +167,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104285); + weakReferenceHandler.sendEmptyMessage(202104285); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandleAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index b0ab4f5..edbad6e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,8 +118,31 @@ urgentCaseFragment.isRefresh = true; //刷新之后页码重置 urgentCaseFragment.pageIndex = 1; - urgentCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, - "1", Constant.PAGE_LIMIT, urgentCaseFragment.pageIndex); + urgentCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, urgentCaseFragment.pageIndex); + } else if (msg.what == 202104286) { + if (urgentCaseFragment.isRefresh || urgentCaseFragment.isLoadMore) { + urgentCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (urgentCaseFragment.dataBeans.size() == 0) { + urgentCaseFragment.emptyView.show("没有案卷需要处理", null); + } else { + urgentCaseFragment.emptyView.hide(); + urgentCaseFragment.adapter = new CaseHandleAdapter(urgentCaseFragment.context, urgentCaseFragment.dataBeans); + urgentCaseFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(urgentCaseFragment.context)); + urgentCaseFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(urgentCaseFragment.context, DividerItemDecoration.VERTICAL)); + urgentCaseFragment.caseRecyclerView.setAdapter(urgentCaseFragment.adapter); + urgentCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(urgentCaseFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", urgentCaseFragment.dataBeans.get(position).getId()); + urgentCaseFragment.startActivity(intent); + } + }); + } + } } } } @@ -145,43 +167,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104286); + weakReferenceHandler.sendEmptyMessage(202104286); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandleAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index eef7916..8986954 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.overtime; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -117,6 +116,29 @@ //刷新之后页码重置 handledFragment.pageIndex = 1; handledFragment.overtimeCaseListPresenter.onReadyRetrofitRequest("1", handledFragment.pageIndex); + } else if (msg.what == 202104284) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("没有紧急案卷", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new OvertimeCaseAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(handledFragment.context, CaseTodoHandledDetailActivity.class); + intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); + handledFragment.startActivity(intent); + } + }); + } + } } } } @@ -141,42 +163,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104284); + weakReferenceHandler.sendEmptyMessage(202104284); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104284) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); - } else { - emptyView.hide(); - adapter = new OvertimeCaseAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseTodoHandledDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index 69ad1e0..db01e7d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.overtime; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -117,6 +116,30 @@ //刷新之后页码重置 caseTodoFragment.pageIndex = 1; caseTodoFragment.overtimeCaseListPresenter.onReadyRetrofitRequest("0", caseTodoFragment.pageIndex); + } else if (msg.what == 202104283) { + if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { + caseTodoFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (caseTodoFragment.dataBeans.size() == 0) { + caseTodoFragment.emptyView.show("没有紧急案卷", null); + } else { + caseTodoFragment.emptyView.hide(); + caseTodoFragment.adapter = new OvertimeCaseAdapter(caseTodoFragment.context, caseTodoFragment.dataBeans); + caseTodoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(caseTodoFragment.context)); + caseTodoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(caseTodoFragment.context, DividerItemDecoration.VERTICAL)); + caseTodoFragment.caseRecyclerView.setAdapter(caseTodoFragment.adapter); + caseTodoFragment.adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(caseTodoFragment.context, CaseTodoDetailActivity.class); + intent.putExtra("title", "超时督办"); + intent.putExtra("id", caseTodoFragment.dataBeans.get(position).getId()); + caseTodoFragment.startActivity(intent); + } + }); + } + } } } } @@ -141,43 +164,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104283); + weakReferenceHandler.sendEmptyMessage(202104283); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104283) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); - } else { - emptyView.hide(); - adapter = new OvertimeCaseAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseTodoDetailActivity.class); - intent.putExtra("title", "超时督办"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index b329bb5..4701761 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.urgent; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -117,6 +116,29 @@ //刷新之后页码重置 handledFragment.pageIndex = 1; handledFragment.urgentCaseListPresenter.onReadyRetrofitRequest("1", handledFragment.pageIndex); + } else if (msg.what == 202104282) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("没有紧急案卷", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new UrgentCaseAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(handledFragment.context, CaseTodoHandledDetailActivity.class); + intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); + handledFragment.startActivity(intent); + } + }); + } + } } } } @@ -141,42 +163,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104282); + weakReferenceHandler.sendEmptyMessage(202104282); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104282) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); - } else { - emptyView.hide(); - adapter = new UrgentCaseAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseTodoHandledDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f46d446..e4cdbee 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -118,6 +118,7 @@ private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; private QMUITipDialog submitDialog; + private ImageRecycleViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -145,6 +146,11 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("提交中,请稍后") .create(); + + checkImageAdapter = new ImageRecycleViewAdapter(this); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.setAdapter(checkImageAdapter); } @Override @@ -214,6 +220,10 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } + if (checkImageAdapter.getItemCount() < 1 || checkImageAdapter.getItemCount() > 2) { + ToastHelper.showToast("当前案卷状态必须上传至少一张图片", ToastHelper.WARING); + return; + } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(mediaList)); } @@ -407,36 +417,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + checkImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + checkImageAdapter.setDeleteView(true); + checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + checkImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 5be798d..aca2f2d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -123,6 +123,7 @@ private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; private QMUITipDialog submitDialog; + private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -151,6 +152,11 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("提交中,请稍后") .create(); + + handleImageAdapter = new ImageRecycleViewAdapter(this); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(handleImageAdapter); } @Override @@ -328,7 +334,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时,处理图片必传。至少一张,最多两张 - if (mediaList.size() < 1 || mediaList.size() > 2) { + if (handleImageAdapter.getItemCount() < 1 || handleImageAdapter.getItemCount() > 2) { ToastHelper.showToast("当前案卷状态必须上传至少一张图片", ToastHelper.WARING); return; } @@ -412,36 +418,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + handleImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + handleImageAdapter.setDeleteView(true); + handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + handleImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index f83e281..ba13804 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -144,6 +144,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); + private ImageRecycleViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -173,6 +174,11 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); + + verifyImageAdapter = new ImageRecycleViewAdapter(this); + caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseVerifyRecyclerView.setAdapter(verifyImageAdapter); } @Override @@ -418,7 +424,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (mediaList.size() != 2) { + if (verifyImageAdapter.getItemCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -434,7 +440,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (mediaList.size() != 2) { + if (verifyImageAdapter.getItemCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -583,36 +589,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + verifyImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + verifyImageAdapter.setDeleteView(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + verifyImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 7e736dd..ae2a1a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.check; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -114,11 +113,34 @@ public void handleMessage(Message msg) { CaseCheckFragment checkFragment = reference.get(); if (msg.what == Constant.CASE_CHECK_OK) { - Log.d(TAG, "核实查成功,更新列表"); + Log.d(TAG, "核查成功,更新列表"); checkFragment.isRefresh = true; //刷新之后页码重置 checkFragment.pageIndex = 1; checkFragment.caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex); + } else if (msg.what == 202104251) { + if (checkFragment.isRefresh || checkFragment.isLoadMore) { + checkFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (checkFragment.dataBeans.size() == 0) { + checkFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + checkFragment.emptyView.hide(); + checkFragment.adapter = new CaseCheckResultAdapter(checkFragment.context, checkFragment.dataBeans); + checkFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkFragment.context)); + checkFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkFragment.context, DividerItemDecoration.VERTICAL)); + checkFragment.caseRecyclerView.setAdapter(checkFragment.adapter); + checkFragment.adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(checkFragment.context, CaseCheckDetailActivity.class); + intent.putExtra("id", checkFragment.dataBeans.get(position).getId()); + checkFragment.startActivity(intent); + } + }); + } + } } } } @@ -142,42 +164,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104251); + weakReferenceHandler.sendEmptyMessage(202104251); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("您暂时没有待办案卷", null); - } else { - emptyView.hide(); - adapter = new CaseCheckResultAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseCheckDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index a9a3a79..b01fc84 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.check; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,6 +118,29 @@ //刷新之后页码重置 checkedFragment.pageIndex = 1; checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(checkedFragment.pageIndex); + } else if (msg.what == 202104252) { + if (checkedFragment.isRefresh || checkedFragment.isLoadMore) { + checkedFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (checkedFragment.dataBeans.size() == 0) { + checkedFragment.emptyView.show("您还没有已办案卷", null); + } else { + checkedFragment.emptyView.hide(); + checkedFragment.adapter = new CaseCheckedResultAdapter(checkedFragment.context, checkedFragment.dataBeans); + checkedFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkedFragment.context)); + checkedFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkedFragment.context, DividerItemDecoration.VERTICAL)); + checkedFragment.caseRecyclerView.setAdapter(checkedFragment.adapter); + checkedFragment.adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(checkedFragment.context, CaseCheckedDetailActivity.class); + intent.putExtra("id", checkedFragment.dataBeans.get(position).getId()); + checkedFragment.startActivity(intent); + } + }); + } + } } } } @@ -143,42 +165,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104252); + weakReferenceHandler.sendEmptyMessage(202104252); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("您还没有已办案卷", null); - } else { - emptyView.hide(); - adapter = new CaseCheckedResultAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseCheckedDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 9b74097..916ad06 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -116,6 +115,29 @@ //刷新之后页码重置 handledFragment.pageIndex = 1; handledFragment.caseHandledListPresenter.onReadyRetrofitRequest(handledFragment.pageIndex); + } else if (msg.what == 202104288) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("没有案卷需要处理", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new CaseHandledAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new CaseHandledAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(handledFragment.context, CaseHandledDetailActivity.class); + intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); + handledFragment.startActivity(intent); + } + }); + } + } } } } @@ -139,42 +161,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104288); + weakReferenceHandler.sendEmptyMessage(202104288); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandledAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandledAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandledDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c8f3bd5..a8e7cc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,8 +118,31 @@ caseTodoFragment.isRefresh = true; //刷新之后页码重置 caseTodoFragment.pageIndex = 1; - caseTodoFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, - null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); + caseTodoFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); + } else if (msg.what == 202104287) { + if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { + caseTodoFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (caseTodoFragment.dataBeans.size() == 0) { + caseTodoFragment.emptyView.show("没有案卷需要处理", null); + } else { + caseTodoFragment.emptyView.hide(); + caseTodoFragment.adapter = new CaseHandleAdapter(caseTodoFragment.context, caseTodoFragment.dataBeans); + caseTodoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(caseTodoFragment.context)); + caseTodoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(caseTodoFragment.context, DividerItemDecoration.VERTICAL)); + caseTodoFragment.caseRecyclerView.setAdapter(caseTodoFragment.adapter); + caseTodoFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(caseTodoFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", caseTodoFragment.dataBeans.get(position).getId()); + caseTodoFragment.startActivity(intent); + } + }); + } + } } } } @@ -144,43 +166,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104287); + weakReferenceHandler.sendEmptyMessage(202104287); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandleAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 7227dfd..8a14832 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,8 +118,31 @@ overtimeCaseFragment.isRefresh = true; //刷新之后页码重置 overtimeCaseFragment.pageIndex = 1; - overtimeCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest("1", - null, Constant.PAGE_LIMIT, overtimeCaseFragment.pageIndex); + overtimeCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, overtimeCaseFragment.pageIndex); + } else if (msg.what == 202104285) { + if (overtimeCaseFragment.isRefresh || overtimeCaseFragment.isLoadMore) { + overtimeCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (overtimeCaseFragment.dataBeans.size() == 0) { + overtimeCaseFragment.emptyView.show("没有案卷需要处理", null); + } else { + overtimeCaseFragment.emptyView.hide(); + overtimeCaseFragment.adapter = new CaseHandleAdapter(overtimeCaseFragment.context, overtimeCaseFragment.dataBeans); + overtimeCaseFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(overtimeCaseFragment.context)); + overtimeCaseFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(overtimeCaseFragment.context, DividerItemDecoration.VERTICAL)); + overtimeCaseFragment.caseRecyclerView.setAdapter(overtimeCaseFragment.adapter); + overtimeCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(overtimeCaseFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", overtimeCaseFragment.dataBeans.get(position).getId()); + overtimeCaseFragment.startActivity(intent); + } + }); + } + } } } } @@ -145,43 +167,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104285); + weakReferenceHandler.sendEmptyMessage(202104285); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandleAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index b0ab4f5..edbad6e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,8 +118,31 @@ urgentCaseFragment.isRefresh = true; //刷新之后页码重置 urgentCaseFragment.pageIndex = 1; - urgentCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, - "1", Constant.PAGE_LIMIT, urgentCaseFragment.pageIndex); + urgentCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, urgentCaseFragment.pageIndex); + } else if (msg.what == 202104286) { + if (urgentCaseFragment.isRefresh || urgentCaseFragment.isLoadMore) { + urgentCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (urgentCaseFragment.dataBeans.size() == 0) { + urgentCaseFragment.emptyView.show("没有案卷需要处理", null); + } else { + urgentCaseFragment.emptyView.hide(); + urgentCaseFragment.adapter = new CaseHandleAdapter(urgentCaseFragment.context, urgentCaseFragment.dataBeans); + urgentCaseFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(urgentCaseFragment.context)); + urgentCaseFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(urgentCaseFragment.context, DividerItemDecoration.VERTICAL)); + urgentCaseFragment.caseRecyclerView.setAdapter(urgentCaseFragment.adapter); + urgentCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(urgentCaseFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", urgentCaseFragment.dataBeans.get(position).getId()); + urgentCaseFragment.startActivity(intent); + } + }); + } + } } } } @@ -145,43 +167,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104286); + weakReferenceHandler.sendEmptyMessage(202104286); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandleAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index eef7916..8986954 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.overtime; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -117,6 +116,29 @@ //刷新之后页码重置 handledFragment.pageIndex = 1; handledFragment.overtimeCaseListPresenter.onReadyRetrofitRequest("1", handledFragment.pageIndex); + } else if (msg.what == 202104284) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("没有紧急案卷", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new OvertimeCaseAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(handledFragment.context, CaseTodoHandledDetailActivity.class); + intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); + handledFragment.startActivity(intent); + } + }); + } + } } } } @@ -141,42 +163,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104284); + weakReferenceHandler.sendEmptyMessage(202104284); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104284) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); - } else { - emptyView.hide(); - adapter = new OvertimeCaseAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseTodoHandledDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index 69ad1e0..db01e7d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.overtime; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -117,6 +116,30 @@ //刷新之后页码重置 caseTodoFragment.pageIndex = 1; caseTodoFragment.overtimeCaseListPresenter.onReadyRetrofitRequest("0", caseTodoFragment.pageIndex); + } else if (msg.what == 202104283) { + if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { + caseTodoFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (caseTodoFragment.dataBeans.size() == 0) { + caseTodoFragment.emptyView.show("没有紧急案卷", null); + } else { + caseTodoFragment.emptyView.hide(); + caseTodoFragment.adapter = new OvertimeCaseAdapter(caseTodoFragment.context, caseTodoFragment.dataBeans); + caseTodoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(caseTodoFragment.context)); + caseTodoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(caseTodoFragment.context, DividerItemDecoration.VERTICAL)); + caseTodoFragment.caseRecyclerView.setAdapter(caseTodoFragment.adapter); + caseTodoFragment.adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(caseTodoFragment.context, CaseTodoDetailActivity.class); + intent.putExtra("title", "超时督办"); + intent.putExtra("id", caseTodoFragment.dataBeans.get(position).getId()); + caseTodoFragment.startActivity(intent); + } + }); + } + } } } } @@ -141,43 +164,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104283); + weakReferenceHandler.sendEmptyMessage(202104283); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104283) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); - } else { - emptyView.hide(); - adapter = new OvertimeCaseAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseTodoDetailActivity.class); - intent.putExtra("title", "超时督办"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index b329bb5..4701761 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.urgent; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -117,6 +116,29 @@ //刷新之后页码重置 handledFragment.pageIndex = 1; handledFragment.urgentCaseListPresenter.onReadyRetrofitRequest("1", handledFragment.pageIndex); + } else if (msg.what == 202104282) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("没有紧急案卷", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new UrgentCaseAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(handledFragment.context, CaseTodoHandledDetailActivity.class); + intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); + handledFragment.startActivity(intent); + } + }); + } + } } } } @@ -141,42 +163,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104282); + weakReferenceHandler.sendEmptyMessage(202104282); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104282) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); - } else { - emptyView.hide(); - adapter = new UrgentCaseAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseTodoHandledDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 0bc1b46..7cc98ca 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.urgent; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -117,6 +116,30 @@ //刷新之后页码重置 caseTodoFragment.pageIndex = 1; caseTodoFragment.urgentCaseListPresenter.onReadyRetrofitRequest("0", caseTodoFragment.pageIndex); + } else if (msg.what == 202104281) { + if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { + caseTodoFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (caseTodoFragment.dataBeans.size() == 0) { + caseTodoFragment.emptyView.show("没有紧急案卷", null); + } else { + caseTodoFragment.emptyView.hide(); + caseTodoFragment.adapter = new UrgentCaseAdapter(caseTodoFragment.context, caseTodoFragment.dataBeans); + caseTodoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(caseTodoFragment.context)); + caseTodoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(caseTodoFragment.context, DividerItemDecoration.VERTICAL)); + caseTodoFragment.caseRecyclerView.setAdapter(caseTodoFragment.adapter); + caseTodoFragment.adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(caseTodoFragment.context, CaseTodoDetailActivity.class); + intent.putExtra("title", "紧急要件"); + intent.putExtra("id", caseTodoFragment.dataBeans.get(position).getId()); + caseTodoFragment.startActivity(intent); + } + }); + } + } } } } @@ -141,43 +164,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104281); + weakReferenceHandler.sendEmptyMessage(202104281); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104281) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); - } else { - emptyView.hide(); - adapter = new UrgentCaseAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseTodoDetailActivity.class); - intent.putExtra("title", "紧急要件"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f46d446..e4cdbee 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -118,6 +118,7 @@ private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; private QMUITipDialog submitDialog; + private ImageRecycleViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -145,6 +146,11 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("提交中,请稍后") .create(); + + checkImageAdapter = new ImageRecycleViewAdapter(this); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.setAdapter(checkImageAdapter); } @Override @@ -214,6 +220,10 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } + if (checkImageAdapter.getItemCount() < 1 || checkImageAdapter.getItemCount() > 2) { + ToastHelper.showToast("当前案卷状态必须上传至少一张图片", ToastHelper.WARING); + return; + } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(mediaList)); } @@ -407,36 +417,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + checkImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + checkImageAdapter.setDeleteView(true); + checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + checkImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 5be798d..aca2f2d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -123,6 +123,7 @@ private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; private QMUITipDialog submitDialog; + private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -151,6 +152,11 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("提交中,请稍后") .create(); + + handleImageAdapter = new ImageRecycleViewAdapter(this); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(handleImageAdapter); } @Override @@ -328,7 +334,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时,处理图片必传。至少一张,最多两张 - if (mediaList.size() < 1 || mediaList.size() > 2) { + if (handleImageAdapter.getItemCount() < 1 || handleImageAdapter.getItemCount() > 2) { ToastHelper.showToast("当前案卷状态必须上传至少一张图片", ToastHelper.WARING); return; } @@ -412,36 +418,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + handleImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + handleImageAdapter.setDeleteView(true); + handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + handleImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index f83e281..ba13804 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -144,6 +144,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); + private ImageRecycleViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -173,6 +174,11 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); + + verifyImageAdapter = new ImageRecycleViewAdapter(this); + caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseVerifyRecyclerView.setAdapter(verifyImageAdapter); } @Override @@ -418,7 +424,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (mediaList.size() != 2) { + if (verifyImageAdapter.getItemCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -434,7 +440,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (mediaList.size() != 2) { + if (verifyImageAdapter.getItemCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -583,36 +589,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + verifyImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + verifyImageAdapter.setDeleteView(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + verifyImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 7e736dd..ae2a1a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.check; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -114,11 +113,34 @@ public void handleMessage(Message msg) { CaseCheckFragment checkFragment = reference.get(); if (msg.what == Constant.CASE_CHECK_OK) { - Log.d(TAG, "核实查成功,更新列表"); + Log.d(TAG, "核查成功,更新列表"); checkFragment.isRefresh = true; //刷新之后页码重置 checkFragment.pageIndex = 1; checkFragment.caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex); + } else if (msg.what == 202104251) { + if (checkFragment.isRefresh || checkFragment.isLoadMore) { + checkFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (checkFragment.dataBeans.size() == 0) { + checkFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + checkFragment.emptyView.hide(); + checkFragment.adapter = new CaseCheckResultAdapter(checkFragment.context, checkFragment.dataBeans); + checkFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkFragment.context)); + checkFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkFragment.context, DividerItemDecoration.VERTICAL)); + checkFragment.caseRecyclerView.setAdapter(checkFragment.adapter); + checkFragment.adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(checkFragment.context, CaseCheckDetailActivity.class); + intent.putExtra("id", checkFragment.dataBeans.get(position).getId()); + checkFragment.startActivity(intent); + } + }); + } + } } } } @@ -142,42 +164,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104251); + weakReferenceHandler.sendEmptyMessage(202104251); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("您暂时没有待办案卷", null); - } else { - emptyView.hide(); - adapter = new CaseCheckResultAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseCheckDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index a9a3a79..b01fc84 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.check; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,6 +118,29 @@ //刷新之后页码重置 checkedFragment.pageIndex = 1; checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(checkedFragment.pageIndex); + } else if (msg.what == 202104252) { + if (checkedFragment.isRefresh || checkedFragment.isLoadMore) { + checkedFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (checkedFragment.dataBeans.size() == 0) { + checkedFragment.emptyView.show("您还没有已办案卷", null); + } else { + checkedFragment.emptyView.hide(); + checkedFragment.adapter = new CaseCheckedResultAdapter(checkedFragment.context, checkedFragment.dataBeans); + checkedFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkedFragment.context)); + checkedFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkedFragment.context, DividerItemDecoration.VERTICAL)); + checkedFragment.caseRecyclerView.setAdapter(checkedFragment.adapter); + checkedFragment.adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(checkedFragment.context, CaseCheckedDetailActivity.class); + intent.putExtra("id", checkedFragment.dataBeans.get(position).getId()); + checkedFragment.startActivity(intent); + } + }); + } + } } } } @@ -143,42 +165,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104252); + weakReferenceHandler.sendEmptyMessage(202104252); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("您还没有已办案卷", null); - } else { - emptyView.hide(); - adapter = new CaseCheckedResultAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseCheckedDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 9b74097..916ad06 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -116,6 +115,29 @@ //刷新之后页码重置 handledFragment.pageIndex = 1; handledFragment.caseHandledListPresenter.onReadyRetrofitRequest(handledFragment.pageIndex); + } else if (msg.what == 202104288) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("没有案卷需要处理", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new CaseHandledAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new CaseHandledAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(handledFragment.context, CaseHandledDetailActivity.class); + intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); + handledFragment.startActivity(intent); + } + }); + } + } } } } @@ -139,42 +161,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104288); + weakReferenceHandler.sendEmptyMessage(202104288); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandledAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandledAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandledDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c8f3bd5..a8e7cc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,8 +118,31 @@ caseTodoFragment.isRefresh = true; //刷新之后页码重置 caseTodoFragment.pageIndex = 1; - caseTodoFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, - null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); + caseTodoFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); + } else if (msg.what == 202104287) { + if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { + caseTodoFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (caseTodoFragment.dataBeans.size() == 0) { + caseTodoFragment.emptyView.show("没有案卷需要处理", null); + } else { + caseTodoFragment.emptyView.hide(); + caseTodoFragment.adapter = new CaseHandleAdapter(caseTodoFragment.context, caseTodoFragment.dataBeans); + caseTodoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(caseTodoFragment.context)); + caseTodoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(caseTodoFragment.context, DividerItemDecoration.VERTICAL)); + caseTodoFragment.caseRecyclerView.setAdapter(caseTodoFragment.adapter); + caseTodoFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(caseTodoFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", caseTodoFragment.dataBeans.get(position).getId()); + caseTodoFragment.startActivity(intent); + } + }); + } + } } } } @@ -144,43 +166,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104287); + weakReferenceHandler.sendEmptyMessage(202104287); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandleAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 7227dfd..8a14832 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,8 +118,31 @@ overtimeCaseFragment.isRefresh = true; //刷新之后页码重置 overtimeCaseFragment.pageIndex = 1; - overtimeCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest("1", - null, Constant.PAGE_LIMIT, overtimeCaseFragment.pageIndex); + overtimeCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, overtimeCaseFragment.pageIndex); + } else if (msg.what == 202104285) { + if (overtimeCaseFragment.isRefresh || overtimeCaseFragment.isLoadMore) { + overtimeCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (overtimeCaseFragment.dataBeans.size() == 0) { + overtimeCaseFragment.emptyView.show("没有案卷需要处理", null); + } else { + overtimeCaseFragment.emptyView.hide(); + overtimeCaseFragment.adapter = new CaseHandleAdapter(overtimeCaseFragment.context, overtimeCaseFragment.dataBeans); + overtimeCaseFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(overtimeCaseFragment.context)); + overtimeCaseFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(overtimeCaseFragment.context, DividerItemDecoration.VERTICAL)); + overtimeCaseFragment.caseRecyclerView.setAdapter(overtimeCaseFragment.adapter); + overtimeCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(overtimeCaseFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", overtimeCaseFragment.dataBeans.get(position).getId()); + overtimeCaseFragment.startActivity(intent); + } + }); + } + } } } } @@ -145,43 +167,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104285); + weakReferenceHandler.sendEmptyMessage(202104285); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandleAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index b0ab4f5..edbad6e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,8 +118,31 @@ urgentCaseFragment.isRefresh = true; //刷新之后页码重置 urgentCaseFragment.pageIndex = 1; - urgentCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, - "1", Constant.PAGE_LIMIT, urgentCaseFragment.pageIndex); + urgentCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, urgentCaseFragment.pageIndex); + } else if (msg.what == 202104286) { + if (urgentCaseFragment.isRefresh || urgentCaseFragment.isLoadMore) { + urgentCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (urgentCaseFragment.dataBeans.size() == 0) { + urgentCaseFragment.emptyView.show("没有案卷需要处理", null); + } else { + urgentCaseFragment.emptyView.hide(); + urgentCaseFragment.adapter = new CaseHandleAdapter(urgentCaseFragment.context, urgentCaseFragment.dataBeans); + urgentCaseFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(urgentCaseFragment.context)); + urgentCaseFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(urgentCaseFragment.context, DividerItemDecoration.VERTICAL)); + urgentCaseFragment.caseRecyclerView.setAdapter(urgentCaseFragment.adapter); + urgentCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(urgentCaseFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", urgentCaseFragment.dataBeans.get(position).getId()); + urgentCaseFragment.startActivity(intent); + } + }); + } + } } } } @@ -145,43 +167,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104286); + weakReferenceHandler.sendEmptyMessage(202104286); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandleAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index eef7916..8986954 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.overtime; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -117,6 +116,29 @@ //刷新之后页码重置 handledFragment.pageIndex = 1; handledFragment.overtimeCaseListPresenter.onReadyRetrofitRequest("1", handledFragment.pageIndex); + } else if (msg.what == 202104284) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("没有紧急案卷", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new OvertimeCaseAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(handledFragment.context, CaseTodoHandledDetailActivity.class); + intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); + handledFragment.startActivity(intent); + } + }); + } + } } } } @@ -141,42 +163,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104284); + weakReferenceHandler.sendEmptyMessage(202104284); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104284) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); - } else { - emptyView.hide(); - adapter = new OvertimeCaseAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseTodoHandledDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index 69ad1e0..db01e7d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.overtime; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -117,6 +116,30 @@ //刷新之后页码重置 caseTodoFragment.pageIndex = 1; caseTodoFragment.overtimeCaseListPresenter.onReadyRetrofitRequest("0", caseTodoFragment.pageIndex); + } else if (msg.what == 202104283) { + if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { + caseTodoFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (caseTodoFragment.dataBeans.size() == 0) { + caseTodoFragment.emptyView.show("没有紧急案卷", null); + } else { + caseTodoFragment.emptyView.hide(); + caseTodoFragment.adapter = new OvertimeCaseAdapter(caseTodoFragment.context, caseTodoFragment.dataBeans); + caseTodoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(caseTodoFragment.context)); + caseTodoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(caseTodoFragment.context, DividerItemDecoration.VERTICAL)); + caseTodoFragment.caseRecyclerView.setAdapter(caseTodoFragment.adapter); + caseTodoFragment.adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(caseTodoFragment.context, CaseTodoDetailActivity.class); + intent.putExtra("title", "超时督办"); + intent.putExtra("id", caseTodoFragment.dataBeans.get(position).getId()); + caseTodoFragment.startActivity(intent); + } + }); + } + } } } } @@ -141,43 +164,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104283); + weakReferenceHandler.sendEmptyMessage(202104283); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104283) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); - } else { - emptyView.hide(); - adapter = new OvertimeCaseAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseTodoDetailActivity.class); - intent.putExtra("title", "超时督办"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index b329bb5..4701761 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.urgent; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -117,6 +116,29 @@ //刷新之后页码重置 handledFragment.pageIndex = 1; handledFragment.urgentCaseListPresenter.onReadyRetrofitRequest("1", handledFragment.pageIndex); + } else if (msg.what == 202104282) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("没有紧急案卷", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new UrgentCaseAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(handledFragment.context, CaseTodoHandledDetailActivity.class); + intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); + handledFragment.startActivity(intent); + } + }); + } + } } } } @@ -141,42 +163,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104282); + weakReferenceHandler.sendEmptyMessage(202104282); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104282) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); - } else { - emptyView.hide(); - adapter = new UrgentCaseAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseTodoHandledDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 0bc1b46..7cc98ca 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.urgent; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -117,6 +116,30 @@ //刷新之后页码重置 caseTodoFragment.pageIndex = 1; caseTodoFragment.urgentCaseListPresenter.onReadyRetrofitRequest("0", caseTodoFragment.pageIndex); + } else if (msg.what == 202104281) { + if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { + caseTodoFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (caseTodoFragment.dataBeans.size() == 0) { + caseTodoFragment.emptyView.show("没有紧急案卷", null); + } else { + caseTodoFragment.emptyView.hide(); + caseTodoFragment.adapter = new UrgentCaseAdapter(caseTodoFragment.context, caseTodoFragment.dataBeans); + caseTodoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(caseTodoFragment.context)); + caseTodoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(caseTodoFragment.context, DividerItemDecoration.VERTICAL)); + caseTodoFragment.caseRecyclerView.setAdapter(caseTodoFragment.adapter); + caseTodoFragment.adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(caseTodoFragment.context, CaseTodoDetailActivity.class); + intent.putExtra("title", "紧急要件"); + intent.putExtra("id", caseTodoFragment.dataBeans.get(position).getId()); + caseTodoFragment.startActivity(intent); + } + }); + } + } } } } @@ -141,43 +164,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104281); + weakReferenceHandler.sendEmptyMessage(202104281); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104281) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); - } else { - emptyView.hide(); - adapter = new UrgentCaseAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseTodoDetailActivity.class); - intent.putExtra("title", "紧急要件"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index e7af03b..af00601 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.verify; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,6 +118,29 @@ //刷新之后页码重置 verifiedFragment.pageIndex = 1; verifiedFragment.caseVerifiedPresenter.onReadyRetrofitRequest(verifiedFragment.pageIndex); + } else if (msg.what == 202104254) { + if (verifiedFragment.isRefresh || verifiedFragment.isLoadMore) { + verifiedFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (verifiedFragment.dataBeans.size() == 0) { + verifiedFragment.emptyView.show("您还没有已办案卷", null); + } else { + verifiedFragment.emptyView.hide(); + verifiedFragment.adapter = new CaseVerifiedResultAdapter(verifiedFragment.context, verifiedFragment.dataBeans); + verifiedFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(verifiedFragment.context)); + verifiedFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(verifiedFragment.context, DividerItemDecoration.VERTICAL)); + verifiedFragment.caseRecyclerView.setAdapter(verifiedFragment.adapter); + verifiedFragment.adapter.setOnItemClickListener(new CaseVerifiedResultAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(verifiedFragment.context, CaseVerifiedDetailActivity.class); + intent.putExtra("id", verifiedFragment.dataBeans.get(position).getId()); + verifiedFragment.startActivity(intent); + } + }); + } + } } } } @@ -143,42 +165,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104254); + weakReferenceHandler.sendEmptyMessage(202104254); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104254) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("您还没有已办案卷", null); - } else { - emptyView.hide(); - adapter = new CaseVerifiedResultAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseVerifiedResultAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseVerifiedDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f46d446..e4cdbee 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -118,6 +118,7 @@ private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; private QMUITipDialog submitDialog; + private ImageRecycleViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -145,6 +146,11 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("提交中,请稍后") .create(); + + checkImageAdapter = new ImageRecycleViewAdapter(this); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.setAdapter(checkImageAdapter); } @Override @@ -214,6 +220,10 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } + if (checkImageAdapter.getItemCount() < 1 || checkImageAdapter.getItemCount() > 2) { + ToastHelper.showToast("当前案卷状态必须上传至少一张图片", ToastHelper.WARING); + return; + } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(mediaList)); } @@ -407,36 +417,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + checkImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + checkImageAdapter.setDeleteView(true); + checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + checkImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 5be798d..aca2f2d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -123,6 +123,7 @@ private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; private QMUITipDialog submitDialog; + private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -151,6 +152,11 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("提交中,请稍后") .create(); + + handleImageAdapter = new ImageRecycleViewAdapter(this); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(handleImageAdapter); } @Override @@ -328,7 +334,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时,处理图片必传。至少一张,最多两张 - if (mediaList.size() < 1 || mediaList.size() > 2) { + if (handleImageAdapter.getItemCount() < 1 || handleImageAdapter.getItemCount() > 2) { ToastHelper.showToast("当前案卷状态必须上传至少一张图片", ToastHelper.WARING); return; } @@ -412,36 +418,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + handleImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + handleImageAdapter.setDeleteView(true); + handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + handleImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index f83e281..ba13804 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -144,6 +144,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); + private ImageRecycleViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -173,6 +174,11 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); + + verifyImageAdapter = new ImageRecycleViewAdapter(this); + caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseVerifyRecyclerView.setAdapter(verifyImageAdapter); } @Override @@ -418,7 +424,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (mediaList.size() != 2) { + if (verifyImageAdapter.getItemCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -434,7 +440,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (mediaList.size() != 2) { + if (verifyImageAdapter.getItemCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -583,36 +589,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + verifyImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + verifyImageAdapter.setDeleteView(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + verifyImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 7e736dd..ae2a1a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.check; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -114,11 +113,34 @@ public void handleMessage(Message msg) { CaseCheckFragment checkFragment = reference.get(); if (msg.what == Constant.CASE_CHECK_OK) { - Log.d(TAG, "核实查成功,更新列表"); + Log.d(TAG, "核查成功,更新列表"); checkFragment.isRefresh = true; //刷新之后页码重置 checkFragment.pageIndex = 1; checkFragment.caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex); + } else if (msg.what == 202104251) { + if (checkFragment.isRefresh || checkFragment.isLoadMore) { + checkFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (checkFragment.dataBeans.size() == 0) { + checkFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + checkFragment.emptyView.hide(); + checkFragment.adapter = new CaseCheckResultAdapter(checkFragment.context, checkFragment.dataBeans); + checkFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkFragment.context)); + checkFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkFragment.context, DividerItemDecoration.VERTICAL)); + checkFragment.caseRecyclerView.setAdapter(checkFragment.adapter); + checkFragment.adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(checkFragment.context, CaseCheckDetailActivity.class); + intent.putExtra("id", checkFragment.dataBeans.get(position).getId()); + checkFragment.startActivity(intent); + } + }); + } + } } } } @@ -142,42 +164,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104251); + weakReferenceHandler.sendEmptyMessage(202104251); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("您暂时没有待办案卷", null); - } else { - emptyView.hide(); - adapter = new CaseCheckResultAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseCheckDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index a9a3a79..b01fc84 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.check; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,6 +118,29 @@ //刷新之后页码重置 checkedFragment.pageIndex = 1; checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(checkedFragment.pageIndex); + } else if (msg.what == 202104252) { + if (checkedFragment.isRefresh || checkedFragment.isLoadMore) { + checkedFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (checkedFragment.dataBeans.size() == 0) { + checkedFragment.emptyView.show("您还没有已办案卷", null); + } else { + checkedFragment.emptyView.hide(); + checkedFragment.adapter = new CaseCheckedResultAdapter(checkedFragment.context, checkedFragment.dataBeans); + checkedFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkedFragment.context)); + checkedFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkedFragment.context, DividerItemDecoration.VERTICAL)); + checkedFragment.caseRecyclerView.setAdapter(checkedFragment.adapter); + checkedFragment.adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(checkedFragment.context, CaseCheckedDetailActivity.class); + intent.putExtra("id", checkedFragment.dataBeans.get(position).getId()); + checkedFragment.startActivity(intent); + } + }); + } + } } } } @@ -143,42 +165,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104252); + weakReferenceHandler.sendEmptyMessage(202104252); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("您还没有已办案卷", null); - } else { - emptyView.hide(); - adapter = new CaseCheckedResultAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseCheckedDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 9b74097..916ad06 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -116,6 +115,29 @@ //刷新之后页码重置 handledFragment.pageIndex = 1; handledFragment.caseHandledListPresenter.onReadyRetrofitRequest(handledFragment.pageIndex); + } else if (msg.what == 202104288) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("没有案卷需要处理", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new CaseHandledAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new CaseHandledAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(handledFragment.context, CaseHandledDetailActivity.class); + intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); + handledFragment.startActivity(intent); + } + }); + } + } } } } @@ -139,42 +161,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104288); + weakReferenceHandler.sendEmptyMessage(202104288); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandledAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandledAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandledDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c8f3bd5..a8e7cc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,8 +118,31 @@ caseTodoFragment.isRefresh = true; //刷新之后页码重置 caseTodoFragment.pageIndex = 1; - caseTodoFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, - null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); + caseTodoFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); + } else if (msg.what == 202104287) { + if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { + caseTodoFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (caseTodoFragment.dataBeans.size() == 0) { + caseTodoFragment.emptyView.show("没有案卷需要处理", null); + } else { + caseTodoFragment.emptyView.hide(); + caseTodoFragment.adapter = new CaseHandleAdapter(caseTodoFragment.context, caseTodoFragment.dataBeans); + caseTodoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(caseTodoFragment.context)); + caseTodoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(caseTodoFragment.context, DividerItemDecoration.VERTICAL)); + caseTodoFragment.caseRecyclerView.setAdapter(caseTodoFragment.adapter); + caseTodoFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(caseTodoFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", caseTodoFragment.dataBeans.get(position).getId()); + caseTodoFragment.startActivity(intent); + } + }); + } + } } } } @@ -144,43 +166,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104287); + weakReferenceHandler.sendEmptyMessage(202104287); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandleAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 7227dfd..8a14832 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,8 +118,31 @@ overtimeCaseFragment.isRefresh = true; //刷新之后页码重置 overtimeCaseFragment.pageIndex = 1; - overtimeCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest("1", - null, Constant.PAGE_LIMIT, overtimeCaseFragment.pageIndex); + overtimeCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, overtimeCaseFragment.pageIndex); + } else if (msg.what == 202104285) { + if (overtimeCaseFragment.isRefresh || overtimeCaseFragment.isLoadMore) { + overtimeCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (overtimeCaseFragment.dataBeans.size() == 0) { + overtimeCaseFragment.emptyView.show("没有案卷需要处理", null); + } else { + overtimeCaseFragment.emptyView.hide(); + overtimeCaseFragment.adapter = new CaseHandleAdapter(overtimeCaseFragment.context, overtimeCaseFragment.dataBeans); + overtimeCaseFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(overtimeCaseFragment.context)); + overtimeCaseFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(overtimeCaseFragment.context, DividerItemDecoration.VERTICAL)); + overtimeCaseFragment.caseRecyclerView.setAdapter(overtimeCaseFragment.adapter); + overtimeCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(overtimeCaseFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", overtimeCaseFragment.dataBeans.get(position).getId()); + overtimeCaseFragment.startActivity(intent); + } + }); + } + } } } } @@ -145,43 +167,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104285); + weakReferenceHandler.sendEmptyMessage(202104285); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandleAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index b0ab4f5..edbad6e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,8 +118,31 @@ urgentCaseFragment.isRefresh = true; //刷新之后页码重置 urgentCaseFragment.pageIndex = 1; - urgentCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, - "1", Constant.PAGE_LIMIT, urgentCaseFragment.pageIndex); + urgentCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, urgentCaseFragment.pageIndex); + } else if (msg.what == 202104286) { + if (urgentCaseFragment.isRefresh || urgentCaseFragment.isLoadMore) { + urgentCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (urgentCaseFragment.dataBeans.size() == 0) { + urgentCaseFragment.emptyView.show("没有案卷需要处理", null); + } else { + urgentCaseFragment.emptyView.hide(); + urgentCaseFragment.adapter = new CaseHandleAdapter(urgentCaseFragment.context, urgentCaseFragment.dataBeans); + urgentCaseFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(urgentCaseFragment.context)); + urgentCaseFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(urgentCaseFragment.context, DividerItemDecoration.VERTICAL)); + urgentCaseFragment.caseRecyclerView.setAdapter(urgentCaseFragment.adapter); + urgentCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(urgentCaseFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", urgentCaseFragment.dataBeans.get(position).getId()); + urgentCaseFragment.startActivity(intent); + } + }); + } + } } } } @@ -145,43 +167,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104286); + weakReferenceHandler.sendEmptyMessage(202104286); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandleAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index eef7916..8986954 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.overtime; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -117,6 +116,29 @@ //刷新之后页码重置 handledFragment.pageIndex = 1; handledFragment.overtimeCaseListPresenter.onReadyRetrofitRequest("1", handledFragment.pageIndex); + } else if (msg.what == 202104284) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("没有紧急案卷", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new OvertimeCaseAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(handledFragment.context, CaseTodoHandledDetailActivity.class); + intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); + handledFragment.startActivity(intent); + } + }); + } + } } } } @@ -141,42 +163,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104284); + weakReferenceHandler.sendEmptyMessage(202104284); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104284) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); - } else { - emptyView.hide(); - adapter = new OvertimeCaseAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseTodoHandledDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index 69ad1e0..db01e7d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.overtime; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -117,6 +116,30 @@ //刷新之后页码重置 caseTodoFragment.pageIndex = 1; caseTodoFragment.overtimeCaseListPresenter.onReadyRetrofitRequest("0", caseTodoFragment.pageIndex); + } else if (msg.what == 202104283) { + if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { + caseTodoFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (caseTodoFragment.dataBeans.size() == 0) { + caseTodoFragment.emptyView.show("没有紧急案卷", null); + } else { + caseTodoFragment.emptyView.hide(); + caseTodoFragment.adapter = new OvertimeCaseAdapter(caseTodoFragment.context, caseTodoFragment.dataBeans); + caseTodoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(caseTodoFragment.context)); + caseTodoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(caseTodoFragment.context, DividerItemDecoration.VERTICAL)); + caseTodoFragment.caseRecyclerView.setAdapter(caseTodoFragment.adapter); + caseTodoFragment.adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(caseTodoFragment.context, CaseTodoDetailActivity.class); + intent.putExtra("title", "超时督办"); + intent.putExtra("id", caseTodoFragment.dataBeans.get(position).getId()); + caseTodoFragment.startActivity(intent); + } + }); + } + } } } } @@ -141,43 +164,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104283); + weakReferenceHandler.sendEmptyMessage(202104283); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104283) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); - } else { - emptyView.hide(); - adapter = new OvertimeCaseAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseTodoDetailActivity.class); - intent.putExtra("title", "超时督办"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index b329bb5..4701761 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.urgent; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -117,6 +116,29 @@ //刷新之后页码重置 handledFragment.pageIndex = 1; handledFragment.urgentCaseListPresenter.onReadyRetrofitRequest("1", handledFragment.pageIndex); + } else if (msg.what == 202104282) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("没有紧急案卷", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new UrgentCaseAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(handledFragment.context, CaseTodoHandledDetailActivity.class); + intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); + handledFragment.startActivity(intent); + } + }); + } + } } } } @@ -141,42 +163,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104282); + weakReferenceHandler.sendEmptyMessage(202104282); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104282) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); - } else { - emptyView.hide(); - adapter = new UrgentCaseAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseTodoHandledDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 0bc1b46..7cc98ca 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.urgent; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -117,6 +116,30 @@ //刷新之后页码重置 caseTodoFragment.pageIndex = 1; caseTodoFragment.urgentCaseListPresenter.onReadyRetrofitRequest("0", caseTodoFragment.pageIndex); + } else if (msg.what == 202104281) { + if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { + caseTodoFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (caseTodoFragment.dataBeans.size() == 0) { + caseTodoFragment.emptyView.show("没有紧急案卷", null); + } else { + caseTodoFragment.emptyView.hide(); + caseTodoFragment.adapter = new UrgentCaseAdapter(caseTodoFragment.context, caseTodoFragment.dataBeans); + caseTodoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(caseTodoFragment.context)); + caseTodoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(caseTodoFragment.context, DividerItemDecoration.VERTICAL)); + caseTodoFragment.caseRecyclerView.setAdapter(caseTodoFragment.adapter); + caseTodoFragment.adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(caseTodoFragment.context, CaseTodoDetailActivity.class); + intent.putExtra("title", "紧急要件"); + intent.putExtra("id", caseTodoFragment.dataBeans.get(position).getId()); + caseTodoFragment.startActivity(intent); + } + }); + } + } } } } @@ -141,43 +164,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104281); + weakReferenceHandler.sendEmptyMessage(202104281); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104281) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); - } else { - emptyView.hide(); - adapter = new UrgentCaseAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseTodoDetailActivity.class); - intent.putExtra("title", "紧急要件"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index e7af03b..af00601 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.verify; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,6 +118,29 @@ //刷新之后页码重置 verifiedFragment.pageIndex = 1; verifiedFragment.caseVerifiedPresenter.onReadyRetrofitRequest(verifiedFragment.pageIndex); + } else if (msg.what == 202104254) { + if (verifiedFragment.isRefresh || verifiedFragment.isLoadMore) { + verifiedFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (verifiedFragment.dataBeans.size() == 0) { + verifiedFragment.emptyView.show("您还没有已办案卷", null); + } else { + verifiedFragment.emptyView.hide(); + verifiedFragment.adapter = new CaseVerifiedResultAdapter(verifiedFragment.context, verifiedFragment.dataBeans); + verifiedFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(verifiedFragment.context)); + verifiedFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(verifiedFragment.context, DividerItemDecoration.VERTICAL)); + verifiedFragment.caseRecyclerView.setAdapter(verifiedFragment.adapter); + verifiedFragment.adapter.setOnItemClickListener(new CaseVerifiedResultAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(verifiedFragment.context, CaseVerifiedDetailActivity.class); + intent.putExtra("id", verifiedFragment.dataBeans.get(position).getId()); + verifiedFragment.startActivity(intent); + } + }); + } + } } } } @@ -143,42 +165,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104254); + weakReferenceHandler.sendEmptyMessage(202104254); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104254) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("您还没有已办案卷", null); - } else { - emptyView.hide(); - adapter = new CaseVerifiedResultAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseVerifiedResultAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseVerifiedDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index e77db43..72d6f9c 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.verify; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,6 +118,29 @@ //刷新之后页码重置 verifyFragment.pageIndex = 1; verifyFragment.caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifyFragment.pageIndex); + } else if (msg.what == 202104253) { + if (verifyFragment.isRefresh || verifyFragment.isLoadMore) { + verifyFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (verifyFragment.dataBeans.size() == 0) { + verifyFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + verifyFragment.emptyView.hide(); + verifyFragment.adapter = new CaseVerifyResultAdapter(verifyFragment.context, verifyFragment.dataBeans); + verifyFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(verifyFragment.context)); + verifyFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(verifyFragment.context, DividerItemDecoration.VERTICAL)); + verifyFragment.caseRecyclerView.setAdapter(verifyFragment.adapter); + verifyFragment.adapter.setOnItemClickListener(new CaseVerifyResultAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(verifyFragment.context, CaseVerifyDetailActivity.class); + intent.putExtra("id", verifyFragment.dataBeans.get(position).getId()); + verifyFragment.startActivity(intent); + } + }); + } + } } } } @@ -142,42 +164,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104253); + weakReferenceHandler.sendEmptyMessage(202104253); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104253) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("您暂时没有待办案卷", null); - } else { - emptyView.hide(); - adapter = new CaseVerifyResultAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseVerifyResultAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseVerifyDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index f46d446..e4cdbee 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -118,6 +118,7 @@ private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; private QMUITipDialog submitDialog; + private ImageRecycleViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -145,6 +146,11 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("提交中,请稍后") .create(); + + checkImageAdapter = new ImageRecycleViewAdapter(this); + caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseCheckRecyclerView.setAdapter(checkImageAdapter); } @Override @@ -214,6 +220,10 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } + if (checkImageAdapter.getItemCount() < 1 || checkImageAdapter.getItemCount() > 2) { + ToastHelper.showToast("当前案卷状态必须上传至少一张图片", ToastHelper.WARING); + return; + } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(mediaList)); } @@ -407,36 +417,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + checkImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + checkImageAdapter.setDeleteView(true); + checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + checkImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 5be798d..aca2f2d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -123,6 +123,7 @@ private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; private QMUITipDialog submitDialog; + private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -151,6 +152,11 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("提交中,请稍后") .create(); + + handleImageAdapter = new ImageRecycleViewAdapter(this); + caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseHandleRecyclerView.setAdapter(handleImageAdapter); } @Override @@ -328,7 +334,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时,处理图片必传。至少一张,最多两张 - if (mediaList.size() < 1 || mediaList.size() > 2) { + if (handleImageAdapter.getItemCount() < 1 || handleImageAdapter.getItemCount() > 2) { ToastHelper.showToast("当前案卷状态必须上传至少一张图片", ToastHelper.WARING); return; } @@ -412,36 +418,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + handleImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + handleImageAdapter.setDeleteView(true); + handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + handleImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index f83e281..ba13804 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -144,6 +144,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); + private ImageRecycleViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -173,6 +174,11 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); + + verifyImageAdapter = new ImageRecycleViewAdapter(this); + caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); + caseVerifyRecyclerView.setAdapter(verifyImageAdapter); } @Override @@ -418,7 +424,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (mediaList.size() != 2) { + if (verifyImageAdapter.getItemCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -434,7 +440,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (mediaList.size() != 2) { + if (verifyImageAdapter.getItemCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -583,36 +589,37 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - String url = resultBean.getData(); - mediaList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - if (realPaths.size() == 2) { - addImageView.setVisibility(View.GONE); - } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(realPaths); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); + int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 2) { + String url = resultBean.getData(); + mediaList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + if (realPaths.size() == 2) { + addImageView.setVisibility(View.GONE); } - }); - //删除按钮点击事件 - imageAdapter.setDeleteView(true); - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { - @Override - public void onClick(int position) { - realPaths.remove(position); - imageAdapter.setMediaList(realPaths); - if (realPaths.size() != 2) { - addImageView.setVisibility(View.VISIBLE); + verifyImageAdapter.setMediaList(realPaths); + //九宫格点击事件 + verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); } - } - }); + }); + //删除按钮点击事件 + verifyImageAdapter.setDeleteView(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + @Override + public void onClick(int position) { + realPaths.remove(position); + verifyImageAdapter.setMediaList(realPaths); + if (realPaths.size() != 2) { + addImageView.setVisibility(View.VISIBLE); + } + } + }); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 7e736dd..ae2a1a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.check; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -114,11 +113,34 @@ public void handleMessage(Message msg) { CaseCheckFragment checkFragment = reference.get(); if (msg.what == Constant.CASE_CHECK_OK) { - Log.d(TAG, "核实查成功,更新列表"); + Log.d(TAG, "核查成功,更新列表"); checkFragment.isRefresh = true; //刷新之后页码重置 checkFragment.pageIndex = 1; checkFragment.caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex); + } else if (msg.what == 202104251) { + if (checkFragment.isRefresh || checkFragment.isLoadMore) { + checkFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (checkFragment.dataBeans.size() == 0) { + checkFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + checkFragment.emptyView.hide(); + checkFragment.adapter = new CaseCheckResultAdapter(checkFragment.context, checkFragment.dataBeans); + checkFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkFragment.context)); + checkFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkFragment.context, DividerItemDecoration.VERTICAL)); + checkFragment.caseRecyclerView.setAdapter(checkFragment.adapter); + checkFragment.adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(checkFragment.context, CaseCheckDetailActivity.class); + intent.putExtra("id", checkFragment.dataBeans.get(position).getId()); + checkFragment.startActivity(intent); + } + }); + } + } } } } @@ -142,42 +164,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104251); + weakReferenceHandler.sendEmptyMessage(202104251); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("您暂时没有待办案卷", null); - } else { - emptyView.hide(); - adapter = new CaseCheckResultAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseCheckDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index a9a3a79..b01fc84 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.check; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,6 +118,29 @@ //刷新之后页码重置 checkedFragment.pageIndex = 1; checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(checkedFragment.pageIndex); + } else if (msg.what == 202104252) { + if (checkedFragment.isRefresh || checkedFragment.isLoadMore) { + checkedFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (checkedFragment.dataBeans.size() == 0) { + checkedFragment.emptyView.show("您还没有已办案卷", null); + } else { + checkedFragment.emptyView.hide(); + checkedFragment.adapter = new CaseCheckedResultAdapter(checkedFragment.context, checkedFragment.dataBeans); + checkedFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkedFragment.context)); + checkedFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkedFragment.context, DividerItemDecoration.VERTICAL)); + checkedFragment.caseRecyclerView.setAdapter(checkedFragment.adapter); + checkedFragment.adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(checkedFragment.context, CaseCheckedDetailActivity.class); + intent.putExtra("id", checkedFragment.dataBeans.get(position).getId()); + checkedFragment.startActivity(intent); + } + }); + } + } } } } @@ -143,42 +165,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104252); + weakReferenceHandler.sendEmptyMessage(202104252); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("您还没有已办案卷", null); - } else { - emptyView.hide(); - adapter = new CaseCheckedResultAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseCheckedDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 9b74097..916ad06 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -116,6 +115,29 @@ //刷新之后页码重置 handledFragment.pageIndex = 1; handledFragment.caseHandledListPresenter.onReadyRetrofitRequest(handledFragment.pageIndex); + } else if (msg.what == 202104288) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("没有案卷需要处理", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new CaseHandledAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new CaseHandledAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(handledFragment.context, CaseHandledDetailActivity.class); + intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); + handledFragment.startActivity(intent); + } + }); + } + } } } } @@ -139,42 +161,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104288); + weakReferenceHandler.sendEmptyMessage(202104288); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandledAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandledAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandledDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index c8f3bd5..a8e7cc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,8 +118,31 @@ caseTodoFragment.isRefresh = true; //刷新之后页码重置 caseTodoFragment.pageIndex = 1; - caseTodoFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, - null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); + caseTodoFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); + } else if (msg.what == 202104287) { + if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { + caseTodoFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (caseTodoFragment.dataBeans.size() == 0) { + caseTodoFragment.emptyView.show("没有案卷需要处理", null); + } else { + caseTodoFragment.emptyView.hide(); + caseTodoFragment.adapter = new CaseHandleAdapter(caseTodoFragment.context, caseTodoFragment.dataBeans); + caseTodoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(caseTodoFragment.context)); + caseTodoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(caseTodoFragment.context, DividerItemDecoration.VERTICAL)); + caseTodoFragment.caseRecyclerView.setAdapter(caseTodoFragment.adapter); + caseTodoFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(caseTodoFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", caseTodoFragment.dataBeans.get(position).getId()); + caseTodoFragment.startActivity(intent); + } + }); + } + } } } } @@ -144,43 +166,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104287); + weakReferenceHandler.sendEmptyMessage(202104287); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandleAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 7227dfd..8a14832 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,8 +118,31 @@ overtimeCaseFragment.isRefresh = true; //刷新之后页码重置 overtimeCaseFragment.pageIndex = 1; - overtimeCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest("1", - null, Constant.PAGE_LIMIT, overtimeCaseFragment.pageIndex); + overtimeCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, overtimeCaseFragment.pageIndex); + } else if (msg.what == 202104285) { + if (overtimeCaseFragment.isRefresh || overtimeCaseFragment.isLoadMore) { + overtimeCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (overtimeCaseFragment.dataBeans.size() == 0) { + overtimeCaseFragment.emptyView.show("没有案卷需要处理", null); + } else { + overtimeCaseFragment.emptyView.hide(); + overtimeCaseFragment.adapter = new CaseHandleAdapter(overtimeCaseFragment.context, overtimeCaseFragment.dataBeans); + overtimeCaseFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(overtimeCaseFragment.context)); + overtimeCaseFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(overtimeCaseFragment.context, DividerItemDecoration.VERTICAL)); + overtimeCaseFragment.caseRecyclerView.setAdapter(overtimeCaseFragment.adapter); + overtimeCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(overtimeCaseFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", overtimeCaseFragment.dataBeans.get(position).getId()); + overtimeCaseFragment.startActivity(intent); + } + }); + } + } } } } @@ -145,43 +167,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104285); + weakReferenceHandler.sendEmptyMessage(202104285); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandleAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index b0ab4f5..edbad6e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.handle; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,8 +118,31 @@ urgentCaseFragment.isRefresh = true; //刷新之后页码重置 urgentCaseFragment.pageIndex = 1; - urgentCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, - "1", Constant.PAGE_LIMIT, urgentCaseFragment.pageIndex); + urgentCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, urgentCaseFragment.pageIndex); + } else if (msg.what == 202104286) { + if (urgentCaseFragment.isRefresh || urgentCaseFragment.isLoadMore) { + urgentCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (urgentCaseFragment.dataBeans.size() == 0) { + urgentCaseFragment.emptyView.show("没有案卷需要处理", null); + } else { + urgentCaseFragment.emptyView.hide(); + urgentCaseFragment.adapter = new CaseHandleAdapter(urgentCaseFragment.context, urgentCaseFragment.dataBeans); + urgentCaseFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(urgentCaseFragment.context)); + urgentCaseFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(urgentCaseFragment.context, DividerItemDecoration.VERTICAL)); + urgentCaseFragment.caseRecyclerView.setAdapter(urgentCaseFragment.adapter); + urgentCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(urgentCaseFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", urgentCaseFragment.dataBeans.get(position).getId()); + urgentCaseFragment.startActivity(intent); + } + }); + } + } } } } @@ -145,43 +167,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104286); + weakReferenceHandler.sendEmptyMessage(202104286); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有案卷需要处理", null); - } else { - emptyView.hide(); - adapter = new CaseHandleAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index eef7916..8986954 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.overtime; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -117,6 +116,29 @@ //刷新之后页码重置 handledFragment.pageIndex = 1; handledFragment.overtimeCaseListPresenter.onReadyRetrofitRequest("1", handledFragment.pageIndex); + } else if (msg.what == 202104284) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("没有紧急案卷", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new OvertimeCaseAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(handledFragment.context, CaseTodoHandledDetailActivity.class); + intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); + handledFragment.startActivity(intent); + } + }); + } + } } } } @@ -141,42 +163,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104284); + weakReferenceHandler.sendEmptyMessage(202104284); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104284) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); - } else { - emptyView.hide(); - adapter = new OvertimeCaseAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseTodoHandledDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index 69ad1e0..db01e7d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.overtime; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -117,6 +116,30 @@ //刷新之后页码重置 caseTodoFragment.pageIndex = 1; caseTodoFragment.overtimeCaseListPresenter.onReadyRetrofitRequest("0", caseTodoFragment.pageIndex); + } else if (msg.what == 202104283) { + if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { + caseTodoFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (caseTodoFragment.dataBeans.size() == 0) { + caseTodoFragment.emptyView.show("没有紧急案卷", null); + } else { + caseTodoFragment.emptyView.hide(); + caseTodoFragment.adapter = new OvertimeCaseAdapter(caseTodoFragment.context, caseTodoFragment.dataBeans); + caseTodoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(caseTodoFragment.context)); + caseTodoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(caseTodoFragment.context, DividerItemDecoration.VERTICAL)); + caseTodoFragment.caseRecyclerView.setAdapter(caseTodoFragment.adapter); + caseTodoFragment.adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(caseTodoFragment.context, CaseTodoDetailActivity.class); + intent.putExtra("title", "超时督办"); + intent.putExtra("id", caseTodoFragment.dataBeans.get(position).getId()); + caseTodoFragment.startActivity(intent); + } + }); + } + } } } } @@ -141,43 +164,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104283); + weakReferenceHandler.sendEmptyMessage(202104283); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104283) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); - } else { - emptyView.hide(); - adapter = new OvertimeCaseAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new OvertimeCaseAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseTodoDetailActivity.class); - intent.putExtra("title", "超时督办"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index b329bb5..4701761 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.urgent; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -117,6 +116,29 @@ //刷新之后页码重置 handledFragment.pageIndex = 1; handledFragment.urgentCaseListPresenter.onReadyRetrofitRequest("1", handledFragment.pageIndex); + } else if (msg.what == 202104282) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("没有紧急案卷", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new UrgentCaseAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(handledFragment.context, CaseTodoHandledDetailActivity.class); + intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); + handledFragment.startActivity(intent); + } + }); + } + } } } } @@ -141,42 +163,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104282); + weakReferenceHandler.sendEmptyMessage(202104282); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104282) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); - } else { - emptyView.hide(); - adapter = new UrgentCaseAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseTodoHandledDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 0bc1b46..7cc98ca 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.urgent; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -117,6 +116,30 @@ //刷新之后页码重置 caseTodoFragment.pageIndex = 1; caseTodoFragment.urgentCaseListPresenter.onReadyRetrofitRequest("0", caseTodoFragment.pageIndex); + } else if (msg.what == 202104281) { + if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { + caseTodoFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (caseTodoFragment.dataBeans.size() == 0) { + caseTodoFragment.emptyView.show("没有紧急案卷", null); + } else { + caseTodoFragment.emptyView.hide(); + caseTodoFragment.adapter = new UrgentCaseAdapter(caseTodoFragment.context, caseTodoFragment.dataBeans); + caseTodoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(caseTodoFragment.context)); + caseTodoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(caseTodoFragment.context, DividerItemDecoration.VERTICAL)); + caseTodoFragment.caseRecyclerView.setAdapter(caseTodoFragment.adapter); + caseTodoFragment.adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(caseTodoFragment.context, CaseTodoDetailActivity.class); + intent.putExtra("title", "紧急要件"); + intent.putExtra("id", caseTodoFragment.dataBeans.get(position).getId()); + caseTodoFragment.startActivity(intent); + } + }); + } + } } } } @@ -141,43 +164,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104281); + weakReferenceHandler.sendEmptyMessage(202104281); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104281) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); - } else { - emptyView.hide(); - adapter = new UrgentCaseAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new UrgentCaseAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseTodoDetailActivity.class); - intent.putExtra("title", "紧急要件"); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index e7af03b..af00601 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.verify; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,6 +118,29 @@ //刷新之后页码重置 verifiedFragment.pageIndex = 1; verifiedFragment.caseVerifiedPresenter.onReadyRetrofitRequest(verifiedFragment.pageIndex); + } else if (msg.what == 202104254) { + if (verifiedFragment.isRefresh || verifiedFragment.isLoadMore) { + verifiedFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (verifiedFragment.dataBeans.size() == 0) { + verifiedFragment.emptyView.show("您还没有已办案卷", null); + } else { + verifiedFragment.emptyView.hide(); + verifiedFragment.adapter = new CaseVerifiedResultAdapter(verifiedFragment.context, verifiedFragment.dataBeans); + verifiedFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(verifiedFragment.context)); + verifiedFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(verifiedFragment.context, DividerItemDecoration.VERTICAL)); + verifiedFragment.caseRecyclerView.setAdapter(verifiedFragment.adapter); + verifiedFragment.adapter.setOnItemClickListener(new CaseVerifiedResultAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(verifiedFragment.context, CaseVerifiedDetailActivity.class); + intent.putExtra("id", verifiedFragment.dataBeans.get(position).getId()); + verifiedFragment.startActivity(intent); + } + }); + } + } } } } @@ -143,42 +165,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104254); + weakReferenceHandler.sendEmptyMessage(202104254); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104254) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("您还没有已办案卷", null); - } else { - emptyView.hide(); - adapter = new CaseVerifiedResultAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseVerifiedResultAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseVerifiedDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index e77db43..72d6f9c 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -1,6 +1,5 @@ package com.casic.dcms.ui.fragment.verify; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -119,6 +118,29 @@ //刷新之后页码重置 verifyFragment.pageIndex = 1; verifyFragment.caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifyFragment.pageIndex); + } else if (msg.what == 202104253) { + if (verifyFragment.isRefresh || verifyFragment.isLoadMore) { + verifyFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (verifyFragment.dataBeans.size() == 0) { + verifyFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + verifyFragment.emptyView.hide(); + verifyFragment.adapter = new CaseVerifyResultAdapter(verifyFragment.context, verifyFragment.dataBeans); + verifyFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(verifyFragment.context)); + verifyFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(verifyFragment.context, DividerItemDecoration.VERTICAL)); + verifyFragment.caseRecyclerView.setAdapter(verifyFragment.adapter); + verifyFragment.adapter.setOnItemClickListener(new CaseVerifyResultAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(verifyFragment.context, CaseVerifyDetailActivity.class); + intent.putExtra("id", verifyFragment.dataBeans.get(position).getId()); + verifyFragment.startActivity(intent); + } + }); + } + } } } } @@ -142,42 +164,10 @@ } else { dataBeans = dataRows; } - handler.sendEmptyMessage(202104253); + weakReferenceHandler.sendEmptyMessage(202104253); } } - @SuppressLint("HandlerLeak") - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == 202104253) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (dataBeans.size() == 0) { - emptyView.show("您暂时没有待办案卷", null); - } else { - emptyView.hide(); - adapter = new CaseVerifyResultAdapter(context, dataBeans); - caseRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - caseRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseVerifyResultAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(context, CaseVerifyDetailActivity.class); - intent.putExtra("id", dataBeans.get(position).getId()); - startActivity(intent); - } - }); - } - } - } - } - }; - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/casic/dcms/utils/FileUtils.java b/app/src/main/java/com/casic/dcms/utils/FileUtils.java index 51f9943..170e274 100644 --- a/app/src/main/java/com/casic/dcms/utils/FileUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/FileUtils.java @@ -1,5 +1,6 @@ package com.casic.dcms.utils; +import android.annotation.SuppressLint; import android.content.Context; import android.os.Environment; import android.util.Log; @@ -12,42 +13,62 @@ public class FileUtils { private static final String TAG = "FileUtils"; + @SuppressLint("StaticFieldLeak") + private static Context context; private static File audioDir; private static File imageDir; private static File downloadDir; public static void initFileConfig(Context context) { + FileUtils.context = context; File parentDir = new File(context.getFilesDir().getAbsolutePath(), "Casic"); if (!parentDir.exists()) { boolean mkdir = parentDir.mkdir(); if (mkdir) { Log.d(TAG, "initFileConfig: 创建Casic文件夹"); - audioDir = new File(parentDir, "AudioFile"); - if (!audioDir.exists()) { - boolean mkAudioDir = audioDir.mkdir(); - if (mkAudioDir) { - Log.d(TAG, "initFileConfig: 创建AudioFile文件夹"); - } - } - imageDir = new File(parentDir, "CompressImageFile"); - if (!imageDir.exists()) { - boolean mkImageDir = imageDir.mkdir(); - if (mkImageDir) { - Log.d(TAG, "initFileConfig: 创建CompressImageFile文件夹"); - } - } - downloadDir = new File(parentDir, "DownloadFile"); - if (!downloadDir.exists()) { - boolean mkDownDir = downloadDir.mkdir(); - if (mkDownDir) { - Log.d(TAG, "initFileConfig: 创建DownloadFile文件夹"); - } - } + } + } + audioDir = new File(parentDir, "AudioFile"); + if (!audioDir.exists()) { + boolean mkAudioDir = audioDir.mkdir(); + if (mkAudioDir) { + Log.d(TAG, "initFileConfig: 创建AudioFile文件夹"); + } + } + imageDir = new File(parentDir, "CompressImageFile"); + if (!imageDir.exists()) { + boolean mkImageDir = imageDir.mkdir(); + if (mkImageDir) { + Log.d(TAG, "initFileConfig: 创建CompressImageFile文件夹"); + } + } + downloadDir = new File(parentDir, "DownloadFile"); + if (!downloadDir.exists()) { + boolean mkDownDir = downloadDir.mkdir(); + if (mkDownDir) { + Log.d(TAG, "initFileConfig: 创建DownloadFile文件夹"); } } } static File getOutputAudioFile() { + //如果第一次初始化文件夹未创建成功,那就调用的时候再单独创建一次文件夹 + if (audioDir == null) { + File parentDir = new File(context.getFilesDir().getAbsolutePath(), "Casic"); + if (!parentDir.exists()) { + boolean mkdir = parentDir.mkdir(); + if (mkdir) { + Log.d(TAG, "getOutputAudioFile: 创建Casic文件夹"); + } + } + audioDir = new File(parentDir, "AudioFile"); + if (!audioDir.exists()) { + boolean mkAudioDir = audioDir.mkdir(); + if (mkAudioDir) { + Log.d(TAG, "getOutputAudioFile: 创建AudioFile文件夹"); + } + } + } String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); File audioFile = new File(audioDir + File.separator + "AUD_" + timeStamp + ".m4a"); if (!audioFile.exists()) { @@ -61,11 +82,43 @@ } public static String getImageCompressPath() { + if (imageDir == null) { + File parentDir = new File(context.getFilesDir().getAbsolutePath(), "Casic"); + if (!parentDir.exists()) { + boolean mkdir = parentDir.mkdir(); + if (mkdir) { + Log.d(TAG, "getImageCompressPath: 创建Casic文件夹"); + } + } + imageDir = new File(parentDir, "CompressImageFile"); + if (!imageDir.exists()) { + boolean mkImageDir = imageDir.mkdir(); + if (mkImageDir) { + Log.d(TAG, "getImageCompressPath: 创建CompressImageFile文件夹"); + } + } + } return imageDir.toString(); } //储存下载文件的目录 static String getDownloadFilePath() { + if (downloadDir == null) { + File parentDir = new File(context.getFilesDir().getAbsolutePath(), "Casic"); + if (!parentDir.exists()) { + boolean mkdir = parentDir.mkdir(); + if (mkdir) { + Log.d(TAG, "getDownloadFilePath: 创建Casic文件夹"); + } + } + downloadDir = new File(parentDir, "DownloadFile"); + if (!downloadDir.exists()) { + boolean mkDownDir = downloadDir.mkdir(); + if (mkDownDir) { + Log.d(TAG, "getDownloadFilePath: 创建DownloadFile文件夹"); + } + } + } return downloadDir.toString(); }