From ce4e734199f2799ab9ee713ff5dffb7605cabaff Mon Sep 17 00:00:00 2001 From: md Date: Thu, 8 Jul 2021 15:31:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E2=80=98=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E2=80=99=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../navinfo/outdoor/fragment/OtherFragment.java | 10 ++++++---- .../com/navinfo/outdoor/fragment/PoiFragment.java | 9 +++++---- .../main/res/drawable/ic_baseline_add_alert.xml | 5 +++++ app/src/main/res/drawable/small_bell_text.xml | 11 +++++++++++ app/src/main/res/layout/treasure_fragment.xml | 14 +++++++++++--- app/src/main/res/values/colors.xml | 1 + 6 files changed, 39 insertions(+), 11 deletions(-) create mode 100644 app/src/main/res/drawable/ic_baseline_add_alert.xml create mode 100644 app/src/main/res/drawable/small_bell_text.xml diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java index 8f40c19..50011ae 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java @@ -94,6 +94,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis private ArrayList otheruploadList; private String takePhotoPath; private String takePhotoPath2; + private PoiEntity poiEntity; public static OtherFragment newInstance(Bundle bundle) { OtherFragment fragment = new OtherFragment(); @@ -299,7 +300,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis public void onGranted(List permissions, boolean all) { if (all) { //保存数据库： - PoiEntity poiEntity = new PoiEntity(); + poiEntity = new PoiEntity(); List infoList = new ArrayList<>(); String name = editTaskName.getText().toString().trim();//名称 @@ -379,12 +380,13 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis break; case R.id.btn_other_uploading: - otherUploadByNet(); + + otherUploadByNet(poiEntity); break; } } - private void otherUploadByNet() { + private void otherUploadByNet(PoiEntity poiEntity) { showLoadingDialog(); otheruploadList = new ArrayList<>(); File otherUploadFile = new File(takePhotoPath); @@ -399,7 +401,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis // 请求方式和请求url .post(HttpInterface.USER_AUTH_ADD) // 请求的 tag, 主要用于取消对应的请求 - .params("userid", "1") + .params("auditId", poiEntity.getTaskId()) .addFileParams("file", otheruploadList) .tag(this) .execute(new DialogCallback(NameAuthenticationBean.class) { diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java index 96f6b3f..81ba653 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java @@ -108,6 +108,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe private String takePhotoPath4; private String takePhotoPath3; private String takePhotoPath1; + private PoiEntity poiEntity; public static PoiFragment newInstance(Bundle bundle) { PoiFragment fragment = new PoiFragment(); @@ -371,7 +372,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe public void onGranted(List permissions, boolean all) { if (all) { //保存数据库： - PoiEntity poiEntity = new PoiEntity(); + poiEntity = new PoiEntity(); ArrayList infoPhoto = new ArrayList<>(); String name = editNameContent.getText().toString().trim();//名称 if (name == null || name.equals("")) { @@ -477,7 +478,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe obtain.what = Constant.TREASURE_FRAGMENT; obtain.obj = false; EventBus.getDefault().post(obtain); - poiUploadByNetWork(); + poiUploadByNetWork(poiEntity); break; case R.id.tv_examine: Toast.makeText(getContext(), editNameContent.getText().toString(), Toast.LENGTH_SHORT).show(); @@ -506,7 +507,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe } } - private void poiUploadByNetWork() { + private void poiUploadByNetWork(PoiEntity poiEntity) { poiUploadList = new ArrayList<>(); File poiUploadFile1 = new File(takePhotoPath1); File poiUploadFile2 = new File(takePhotoPath2); @@ -526,7 +527,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe // 请求方式和请求url .post(HttpInterface.USER_AUTH_ADD) // 请求的 tag, 主要用于取消对应的请求 - .params("auditId", "1") + .params("auditId", poiEntity.getTaskId()) .addFileParams("file",poiUploadList) .tag(this) .execute(new DialogCallback(NameAuthenticationBean.class) { diff --git a/app/src/main/res/drawable/ic_baseline_add_alert.xml b/app/src/main/res/drawable/ic_baseline_add_alert.xml new file mode 100644 index 0000000..6d5ddb1 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_add_alert.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/small_bell_text.xml b/app/src/main/res/drawable/small_bell_text.xml new file mode 100644 index 0000000..b7ae372 --- /dev/null +++ b/app/src/main/res/drawable/small_bell_text.xml @@ -0,0 +1,11 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/treasure_fragment.xml b/app/src/main/res/layout/treasure_fragment.xml index f7cd612..231df10 100644 --- a/app/src/main/res/layout/treasure_fragment.xml +++ b/app/src/main/res/layout/treasure_fragment.xml @@ -35,15 +35,23 @@ + + + + + + + + #95CAF6 #F44236 #87CDF6 + #ED1931 \ No newline at end of file