From f2a809944a25b69950e0b3ef52fce2a90024d744 Mon Sep 17 00:00:00 2001 From: wds Date: Wed, 11 Aug 2021 17:49:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../outdoor/adapter/FilterAdapter.java | 4 +- .../com/navinfo/outdoor/api/Constant.java | 2 +- .../navinfo/outdoor/bean/JobSearchBean.java | 6 +- .../fragment/ChargingPileFragment.java | 11 +- .../fragment/ChargingStationFragment.java | 11 +- .../outdoor/fragment/FilterFragment.java | 13 +- .../outdoor/fragment/ForgetPawFragment.java | 8 +- .../outdoor/fragment/GatherGetFragment.java | 10 + .../outdoor/fragment/OtherFragment.java | 17 +- .../navinfo/outdoor/fragment/PoiFragment.java | 11 +- .../outdoor/fragment/PoiVideoFragment.java | 41 +- .../outdoor/fragment/RegisterFragment.java | 12 +- .../outdoor/fragment/RoadFragment.java | 21 +- .../outdoor/fragment/TreasureFragment.java | 92 +- .../com/navinfo/outdoor/http/OkGoBuilder.java | 13 +- app/src/main/res/drawable/arrow_down.png | Bin 0 -> 181 bytes app/src/main/res/layout/activity_login.xml | 1 + .../res/layout/charging_pile_fragment.xml | 1439 +++++++++-------- .../main/res/layout/charging_pile_header.xml | 2 +- .../res/layout/charging_station_fragment.xml | 1203 +++++++------- .../res/layout/charging_station_header.xml | 2 +- app/src/main/res/layout/fragment_filter.xml | 5 +- app/src/main/res/layout/fragment_other.xml | 617 +++---- app/src/main/res/layout/fragment_road.xml | 467 +++--- app/src/main/res/layout/poi_fragment.xml | 1061 ++++++------ .../main/res/layout/poi_video_fragment.xml | 552 +++---- app/src/main/res/layout/poi_video_header.xml | 2 +- 28 files changed, 2911 insertions(+), 2714 deletions(-) create mode 100644 app/src/main/res/drawable/arrow_down.png diff --git a/app/build.gradle b/app/build.gradle index fd4fd97..81cf51b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 29 buildToolsVersion '29.0.2' - ndkVersion '23.0.7123448' + //ndkVersion '23.0.7123448' defaultConfig { applicationId "com.navinfo.outdoor" diff --git a/app/src/main/java/com/navinfo/outdoor/adapter/FilterAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/FilterAdapter.java index a5b606a..d1df46a 100644 --- a/app/src/main/java/com/navinfo/outdoor/adapter/FilterAdapter.java +++ b/app/src/main/java/com/navinfo/outdoor/adapter/FilterAdapter.java @@ -71,14 +71,14 @@ public class FilterAdapter extends RecyclerView.Adapter upload; + private List upload; public int getStatus() { return status; @@ -40,11 +40,11 @@ public class JobSearchBean implements Serializable { this.body = body; } - public List getUpload() { + public List getUpload() { return upload; } - public void setUpload(List upload) { + public void setUpload(List upload) { this.upload = upload; } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java index b521aba..530d422 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java @@ -39,6 +39,7 @@ import com.kongzue.dialog.util.DialogSettings; import com.kongzue.dialog.v3.MessageDialog; import com.lzy.okgo.model.HttpParams; import com.navinfo.outdoor.R; +import com.navinfo.outdoor.activity.FragmentManagement; import com.navinfo.outdoor.api.Constant; import com.navinfo.outdoor.base.BaseDrawerFragment; import com.navinfo.outdoor.bean.ChargingPileSaveBean; @@ -139,7 +140,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC @Override public void onResume() { super.onResume(); - View header = findViewById(R.id.charging_pile_header); + View header = mView.findViewById(R.id.charging_pile_header); header.findViewById(R.id.iv_charging_pile_final).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -158,6 +159,14 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC onBackPressed(); } }); + header.findViewById(R.id.tv_charging_pile_explain).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(getActivity(), FragmentManagement.class); + intent.putExtra("tag",8); + startActivity(intent); + } + }); } @Override diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java index 3264fec..e82629f 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java @@ -44,6 +44,7 @@ import com.kongzue.dialog.v3.MessageDialog; import com.lzy.okgo.OkGo; import com.lzy.okgo.model.HttpParams; import com.navinfo.outdoor.R; +import com.navinfo.outdoor.activity.FragmentManagement; import com.navinfo.outdoor.adapter.ChargingPileAdapter; import com.navinfo.outdoor.api.Constant; import com.navinfo.outdoor.base.BaseDrawerFragment; @@ -147,7 +148,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. } private void initHeader() { - View header = findViewById(R.id.charging_station_header); + View header = mView.findViewById(R.id.charging_station_header); header.findViewById(R.id.iv_charging_station_final).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -166,6 +167,14 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. onBackPressed(); } }); + header.findViewById(R.id.tv_charging_station_explain).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(getActivity(), FragmentManagement.class); + intent.putExtra("tag",8); + startActivity(intent); + } + }); } @Override diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java index 9c3e134..693bcde 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java @@ -200,6 +200,7 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi super.initData(); poiDatabase = PoiDatabase.getInstance(getContext()); poiDao = poiDatabase.getPoiDao(); + poiEntities = new ArrayList<>(); clNumber = findViewById(R.id.cl_number); clNumber.setOnClickListener(this::onClick); tvNumber = findViewById(R.id.tv_number); @@ -241,11 +242,11 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi tvType.setText("未领取"); } else if (Constant.TASK_STASTUS == 1) { tvType.setText("已领取"); - } else if (Constant.TASK_STASTUS == 2) { + }/* else if (Constant.TASK_STASTUS == 2) { tvType.setText("未保存"); } else if (Constant.TASK_STASTUS == 3) { tvType.setText("已保存"); - } + }*/ btnFilter = findViewById(R.id.btn_filter); btnFilter.setOnClickListener(this::onClick); @@ -263,7 +264,6 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi //取消上啦加载下拉刷新 recyclerFilter.setPullRefreshEnabled(false); recyclerFilter.setLoadingMoreEnabled(false); - poiEntities = new ArrayList<>(); filterAdapter = new FilterAdapter(getContext(), poiEntities); recyclerFilter.setAdapter(filterAdapter); @@ -307,6 +307,7 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi obtain.what = Constant.TREASURE_FRAGMENT; obtain.obj = true; EventBus.getDefault().post(obtain); + onBackPressed(); break; case R.id.cl_number: BottomMenu.show((AppCompatActivity) getContext(), new String[]{"200", "500", "1000"}, new OnMenuItemClickListener() { @@ -403,7 +404,7 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi break; case R.id.cl_type://任务状态 0.未领取 1.已领取，2.未保存(保存到本地但未提交成功),3.已保存(保存到本地提交成功)，4已上传（结束采集）, - BottomMenu.show((AppCompatActivity) getContext(), new String[]{"全部", "未领取", "已领取", "未保存", "已保存"}, new OnMenuItemClickListener() { + BottomMenu.show((AppCompatActivity) getContext(), new String[]{"全部", "未领取", "已领取"/*, "未保存", "已保存"*/}, new OnMenuItemClickListener() { @Override public void onClick(String text, int index) { tvType.setText(text); @@ -417,12 +418,12 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi case 2: Constant.TASK_STASTUS = 1; break; - case 3: + /* case 3: Constant.TASK_STASTUS = 2; break; case 4: Constant.TASK_STASTUS = 3; - break; + break;*/ } Message obtain = Message.obtain(); obtain.what = Constant.JOB_WORD_MONITOR; diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java index 0acc02f..f8efa68 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java @@ -19,6 +19,7 @@ import com.navinfo.outdoor.bean.UserBean; import com.navinfo.outdoor.http.Callback; import com.navinfo.outdoor.http.HttpInterface; import com.navinfo.outdoor.http.OkGoBuilder; +import com.navinfo.outdoor.util.Base64; import com.navinfo.outdoor.util.RegexUtil; import org.greenrobot.eventbus.EventBus; @@ -70,6 +71,7 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe if (!RegexUtil.isPhone(etForgetPawPhone.getText().toString())){ Toast.makeText(getContext(), "手机号错误，请重新输入", Toast.LENGTH_SHORT).show(); }else { + registerNote(); initGetNote(); } @@ -101,7 +103,11 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe Toast.makeText(getContext(), "请输入密码", Toast.LENGTH_SHORT).show(); return; } else { - httpParams.put("password", password); + try { + httpParams.put("password", Base64.desEncrypt(password)); + } catch (Exception e) { + e.printStackTrace(); + } } String conFirmPaw = etForgetPawConfirmPaw.getText().toString().trim(); if (conFirmPaw == null || conFirmPaw.equals("")) { diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java index 33566a9..51436cc 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java @@ -565,6 +565,16 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe @Override public void run() { InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiEntity); + getActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + Message obtain = Message.obtain(); + obtain.what = Constant.UN_POLY_GEN_TASK; + obtain.obj = true; + EventBus.getDefault().post(obtain); + onBackPressed(); + } + }); } }).start(); }else { 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 4970fea..c7359be 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java @@ -26,6 +26,7 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; +import androidx.core.widget.NestedScrollView; import com.bumptech.glide.Glide; import com.google.gson.Gson; @@ -40,6 +41,7 @@ import com.lzy.okgo.OkGo; import com.lzy.okgo.model.HttpParams; import com.lzy.okgo.model.Response; import com.navinfo.outdoor.R; +import com.navinfo.outdoor.activity.FragmentManagement; import com.navinfo.outdoor.api.Constant; import com.navinfo.outdoor.base.BaseDrawerFragment; import com.navinfo.outdoor.bean.Info; @@ -96,6 +98,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis private ArrayList otherUploadList; private CheckBox checkPot; private File file; + private NestedScrollView nestedScrollView; public static OtherFragment newInstance(Bundle bundle) { OtherFragment fragment = new OtherFragment(); @@ -119,7 +122,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis @Override public void onResume() { super.onResume(); - View header = findViewById(R.id.other_header); + View header =mView.findViewById(R.id.other_header); header.findViewById(R.id.iv_final).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -138,6 +141,14 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis onBackPressed(); } }); + header.findViewById(R.id.tv_explain).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(getActivity(), FragmentManagement.class); + intent.putExtra("tag",8); + startActivity(intent); + } + }); } @Override @@ -191,6 +202,10 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis } } }); + nestedScrollView = findViewById(R.id.nested_scroll_view); + if (slidingPaneLayout!=null) { + slidingPaneLayout.setScrollableView(nestedScrollView); + } editTaskName = findViewById(R.id.et_task_name); rlPicture = findViewById(R.id.rl_picture); rlPicture.setOnClickListener(this::onClick); 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 b41d69f..4ca3b69 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java @@ -42,6 +42,7 @@ import com.lzy.okgo.OkGo; import com.lzy.okgo.model.HttpParams; import com.lzy.okgo.model.Response; import com.navinfo.outdoor.R; +import com.navinfo.outdoor.activity.FragmentManagement; import com.navinfo.outdoor.api.Constant; import com.navinfo.outdoor.base.BaseDrawerFragment; import com.navinfo.outdoor.bean.Info; @@ -135,7 +136,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe @Override public void onResume() { super.onResume(); - View header = findViewById(R.id.poi_header); + View header =mView.findViewById(R.id.poi_header); header.findViewById(R.id.iv_final).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -154,6 +155,14 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe onBackPressed(); } }); + header.findViewById(R.id.tv_explain).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(getActivity(), FragmentManagement.class); + intent.putExtra("tag",8); + startActivity(intent); + } + }); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java index 03ad6f5..0e0b32e 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java @@ -26,6 +26,7 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; +import androidx.core.widget.NestedScrollView; import com.github.lazylibrary.util.FileUtils; import com.github.lazylibrary.util.StringUtils; @@ -42,6 +43,7 @@ import com.lzy.okgo.OkGo; import com.lzy.okgo.model.HttpParams; import com.lzy.okgo.model.Response; import com.navinfo.outdoor.R; +import com.navinfo.outdoor.activity.FragmentManagement; import com.navinfo.outdoor.activity.PictureActivity; import com.navinfo.outdoor.activity.PicturesActivity; import com.navinfo.outdoor.api.Constant; @@ -94,6 +96,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick private String videoPath; private File fileZip; private FrameLayout fmPoiVideoPic; + private NestedScrollView nestedScrollView; public static PoiVideoFragment newInstance(Bundle bundle) { PoiVideoFragment fragment = new PoiVideoFragment(); @@ -118,7 +121,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick @Override public void onResume() { super.onResume(); - View header = findViewById(R.id.poi_video_header); + View header =mView.findViewById(R.id.poi_video_header); header.findViewById(R.id.iv_final).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -137,6 +140,14 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick onBackPressed(); } }); + header.findViewById(R.id.tv_explain).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(getActivity(), FragmentManagement.class); + intent.putExtra("tag",8); + startActivity(intent); + } + }); } @@ -147,6 +158,10 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick poiDao = poiDatabase.getPoiDao(); tvPictures = (TextView) findViewById(R.id.tv_pictures); tvPictures.setOnClickListener(this::onClick); + nestedScrollView = findViewById(R.id.nested_scroll_view); + if (slidingPaneLayout!=null){ + slidingPaneLayout.setScrollableView(nestedScrollView); + } etRoadName = (EditText) findViewById(R.id.et_poi_video_name); ivPoiVideoPicture = (ImageView) findViewById(R.id.iv_poi_video_picture); rbCar = (RadioButton) findViewById(R.id.rb_car); @@ -256,14 +271,15 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick @Subscribe public void onEvent(Message data) { if (data.what == Constant.PICTURE_VIDEO_WORD) { - if ((boolean) data.obj) { + if ((boolean)data.obj){ - initPoiVideoSharePre(); - } + initPoiVideoSharePre(); + } } } + @Override public void onClick(View v) { switch (v.getId()) { @@ -364,6 +380,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick } + private void poiVideoUpload(int poiVideoBody, File fileZip) { if (poiVideoBody == 0) { Toast.makeText(getActivity(), "请先保存本地在上传", Toast.LENGTH_SHORT).show(); @@ -375,8 +392,8 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick } HttpParams httpParams = new HttpParams(); httpParams.put("auditId", poiVideoBody); - long time = System.currentTimeMillis(); - httpParams.put("datetime", time); + long time=System.currentTimeMillis(); + httpParams.put("datetime",time); httpParams.put("file", fileZip); showFileLoadingDialog(); setLoadingDialogText("上传中..."); @@ -552,7 +569,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick if (EventBus.getDefault().isRegistered(this))//加上判断 EventBus.getDefault().unregister(this); super.onDestroy(); - if (showPoiEntity != null) { + if (showPoiEntity!=null){ new Thread(new Runnable() { @Override public void run() { @@ -614,13 +631,13 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick poiEntity.setType(3); poiEntity.setTaskStatus(2); poiEntity.setIsLocalData(1); - if (fmPoiVideoPic.getTag() == null) { + if (fmPoiVideoPic.getTag()==null){ List videoFileListByUUID = AWMp4ParserHelper.getInstance().getVideoFileListByUUID(showPoiEntity.getId()); - if (videoFileListByUUID != null) { + if (videoFileListByUUID!=null){ fmPoiVideoPic.setTag(videoFileListByUUID); } } - if (fmPoiVideoPic.getTag() != null && !((List) fmPoiVideoPic.getTag()).isEmpty()) { + if (fmPoiVideoPic.getTag() != null &&!((List) fmPoiVideoPic.getTag()).isEmpty()) { List lineStringByVideoFileList = AWMp4ParserHelper.getInstance().getLineStringByVideoFileList((List) fmPoiVideoPic.getTag()); String lineString = GeometryTools.getLineString(lineStringByVideoFileList); Log.d("TAG", "onGranted: " + lineString); @@ -636,12 +653,12 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick @Override protected PoiCheckResult checkPoiEntity(PoiEntity entity) { PoiCheckResult poiCheckResult = new PoiCheckResult(); - if (entity.getPhoto() == null) { + if (entity.getPhoto()==null){ poiCheckResult.setCode(1); poiCheckResult.setMsg("请录像"); return poiCheckResult; } - if (entity.getWork_type() == -1) { + if (entity.getWork_type()==-1){ poiCheckResult.setCode(1); poiCheckResult.setMsg("请选择录像方式"); return poiCheckResult; diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java index c7e4483..5e0c353 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java @@ -10,7 +10,6 @@ import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; - import com.lzy.okgo.model.HttpParams; import com.navinfo.outdoor.R; import com.navinfo.outdoor.activity.LoginActivity; @@ -21,6 +20,8 @@ import com.navinfo.outdoor.bean.UserBean; import com.navinfo.outdoor.http.Callback; import com.navinfo.outdoor.http.HttpInterface; import com.navinfo.outdoor.http.OkGoBuilder; +import com.navinfo.outdoor.util.Base64; +import com.navinfo.outdoor.util.Md5Util; import com.navinfo.outdoor.util.RegexUtil; import org.greenrobot.eventbus.EventBus; @@ -95,7 +96,6 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen registerNote(); initGetNote(); } - break; } } @@ -155,7 +155,12 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen Toast.makeText(getContext(), "请输入密码", Toast.LENGTH_SHORT).show(); return; } else { - httpParams.put("password", password); + try { + httpParams.put("password", Base64.desEncrypt(password)); + } catch (Exception e) { + e.printStackTrace(); + } + } String conFirmPaw = etRegisterConfirmPaw.getText().toString().trim(); if (conFirmPaw == null || conFirmPaw.equals("")) { @@ -195,7 +200,6 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen } Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); } - @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java index d2de82e..3108024 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java @@ -27,6 +27,7 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; +import androidx.core.widget.NestedScrollView; import com.github.lazylibrary.util.FileUtils; import com.github.lazylibrary.util.StringUtils; @@ -43,6 +44,7 @@ import com.lzy.okgo.OkGo; import com.lzy.okgo.model.HttpParams; import com.lzy.okgo.model.Response; import com.navinfo.outdoor.R; +import com.navinfo.outdoor.activity.FragmentManagement; import com.navinfo.outdoor.activity.PictureActivity; import com.navinfo.outdoor.api.Constant; import com.navinfo.outdoor.base.BaseDrawerFragment; @@ -96,6 +98,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList private Button roadUpload; private File fileZip; private FrameLayout fmRoadPic; + private NestedScrollView nestedScrollView; public static RoadFragment newInstance(Bundle bundle) { RoadFragment fragment = new RoadFragment(); @@ -119,7 +122,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList @Override public void onResume() { super.onResume(); - View header = findViewById(R.id.road_header); + View header = mView.findViewById(R.id.road_header); header.findViewById(R.id.iv_final).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -136,6 +139,14 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList onBackPressed(); } }); + header.findViewById(R.id.tv_road_explain).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(getActivity(), FragmentManagement.class); + intent.putExtra("tag",8); + startActivity(intent); + } + }); } @@ -146,6 +157,10 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList poiDao = poiDatabase.getPoiDao(); tvPictures = (TextView) findViewById(R.id.tv_pictures); tvPictures.setOnClickListener(this::onClick); + nestedScrollView = findViewById(R.id.nested_scroll_view); + if (slidingPaneLayout!=null){ + slidingPaneLayout.setScrollableView(nestedScrollView); + } etRoadName = (EditText) findViewById(R.id.et_road_name); ivRoadPicture = (ImageView) findViewById(R.id.iv_road_picture); // Glide.with(getContext()).load(getLocalVideoBitmap(String.valueOf(R.drawable.bg_01))).into(ivRoadPicture); @@ -291,16 +306,12 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList showFileLoadingDialog(); setLoadingDialogText("压缩中..."); if (fmRoadPic.getTag() != null) { - Log.d("TAG", "onClick: "+"dddddddddddddddddddddddddddddddddd" - +new Date().toLocaleString()); List videoFileList = (List) fmRoadPic.getTag(); fileZip = new File(Constant.PICTURE_FOLDER, "files" + ".zip"); new Thread(new Runnable() { @Override public void run() { ZipUtil.zipFiles(videoFileList, fileZip, null); - Log.d("TAG", "onClick: "+"dddddddddddddddddddddddddddddddddd" - +new Date().toLocaleString()); PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId()); if (poiDaoPoiEntity == null || poiDaoPoiEntity.getTaskStatus() == 1 || poiDaoPoiEntity.getTaskStatus() == 2 || poiDaoPoiEntity.getTaskStatus() == 0) { dismissLoadingDialog(); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java index 09817ef..fb1ea6f 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java @@ -1,5 +1,6 @@ package com.navinfo.outdoor.fragment; +import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.ActivityInfo; @@ -25,6 +26,7 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; +import androidx.core.widget.NestedScrollView; import androidx.fragment.app.FragmentTransaction; import com.github.lazylibrary.util.DensityUtil; @@ -64,6 +66,7 @@ import com.navinfo.outdoor.util.MapManager; import com.navinfo.outdoor.util.MyTecentLocationSource; import com.navinfo.outdoor.util.NetWorkUtils; import com.navinfo.outdoor.util.ToastUtil; +import com.sothree.slidinguppanel.ScrollableViewHelper; import com.sothree.slidinguppanel.SlidingUpPanelLayout; import com.tencent.map.geolocation.TencentLocation; import com.tencent.tencentmap.mapsdk.maps.CameraUpdate; @@ -130,6 +133,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen private BitmapDescriptor bitmapDescriptor1, bitmapDescriptor2, bitmapDescriptor3, bitmapDescriptor4, bitmapDescriptor5; private Marker bigMarker; private Marker markerPile; + private List upload; public static TreasureFragment newInstance(Bundle bundle) { TreasureFragment fragment = new TreasureFragment(); @@ -187,7 +191,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen // ivMessage.setVisibility(View.GONE); // } cbMapType = (CheckBox) findViewById(R.id.cb_map_type); -// sliding_layout.setScrollableViewHelper(new NestedScrollableViewHelper()); + //sliding_layout.setScrollableViewHelper(new NestedScrollableViewHelper()); //地图转换 cbMapType.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override @@ -346,6 +350,23 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen int[] widtHeight = DensityUtil.getDeviceInfo(getActivity()); treasureMap.getLayoutParams().width = widtHeight[0]; treasureMap.getLayoutParams().height = widtHeight[1]; + + } + + private class NestedScrollableViewHelper extends ScrollableViewHelper { + public int getScrollableViewScrollPosition(View mScrollableView, boolean isSlidingUp) { + if (mScrollableView instanceof NestedScrollView) { + if(isSlidingUp){ + return mScrollableView.getScrollY(); + } else { + NestedScrollView nsv = ((NestedScrollView) mScrollableView); + View child = nsv.getChildAt(0); + return (child.getBottom() - (nsv.getHeight() + nsv.getScrollY())); + } + } else { + return 0; + } + } } private void iniUserLocation() { @@ -425,6 +446,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen public void onSuccess(JobSearchBean response, int id) { dismissLoadingDialog(); JobSearchBean.BodyBean body = response.getBody(); + upload =response.getUpload(); if (body != null) { Log.d("TAG", "onSuccess: " + response.getBody().toString() + "sssssssssssss"); for (int i = 0; i < removables.size(); i++) { @@ -444,6 +466,12 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen if (geometry.getGeometryType().equals("Point")) {//点 latLng = GeometryTools.createLatLng(geo); } else if (geometry.getGeometryType().equals("LineString")) {//线 + BitmapDescriptor bitmapLine=null; + if (Integer.valueOf(listBean.getType())==3){//poi录像 + bitmapLine= BitmapDescriptorFactory.fromResource(R.drawable.arrow_down); + }else if (Integer.valueOf(listBean.getType())==4){//道路录像 + bitmapLine=BitmapDescriptorFactory.fromResource(R.drawable.arrow_down); + } List latLineString = GeometryTools.getLatLngs(geo); // 构造 PolylineOpitons PolylineOptions polylineOptions = new PolylineOptions() @@ -453,11 +481,14 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen // 折线的颜色为绿色 .color(0xff00ff00) // 折线宽度为5像素 - .width(5) + .width(25) + .arrow(true) + .arrowSpacing(30) + .arrowTexture(bitmapLine); // 还可以添加描边颜色 - .borderColor(0xffff0000) + //.borderColor(0xffff0000) // 描边颜色的宽度，线宽还是 25 像素，不过填充的部分宽度为 `width` - 2 * `borderWidth` - .borderWidth(1); + //.borderWidth(1); // 绘制折线 Polyline polyline = tencentMap.addPolyline(polylineOptions); polyline.setZIndex(3); @@ -582,6 +613,13 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen if (geometry.getGeometryType().equals("Point")) {//点 latLng = GeometryTools.createLatLng(geo); } else if (geometry.getGeometryType().equals("LineString")) {//线 + + BitmapDescriptor bitmapLine=null; + if (poiEntity.getType()==3){//poi录像 + bitmapLine= BitmapDescriptorFactory.fromResource(R.drawable.arrow_down); + }else if (poiEntity.getType()==4){//道路录像 + bitmapLine=BitmapDescriptorFactory.fromResource(R.drawable.arrow_down); + } List latLineString = GeometryTools.getLatLngs(geo); // 构造 PolylineOpitons PolylineOptions polylineOptions = new PolylineOptions() @@ -591,11 +629,14 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen // 折线的颜色为绿色 .color(0xff00ff00) // 折线宽度为5像素 - .width(25) - // 还可以添加描边颜色 + .width(30) + .arrow(true) + .arrowSpacing(30) + .arrowTexture(bitmapLine); + /* // 还可以添加描边颜色 .borderColor(0xffff0000) // 描边颜色的宽度，线宽还是 25 像素，不过填充的部分宽度为 `width` - 2 * `borderWidth` - .borderWidth(1); + .borderWidth(1);*/ // 绘制折线 Polyline polyline = tencentMap.addPolyline(polylineOptions); polyline.setZIndex(3); @@ -669,13 +710,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen int taskStatus = Constant.TASK_STASTUS; int type = Constant.TASK_TYPE; int limit = Constant.LIMIT_TTPE; - if (taskStatus == 0) { - Message obtain = Message.obtain(); - obtain.what = Constant.JOB_SEARCH_POI_WORD; - obtain.obj = null; - EventBus.getDefault().post(obtain); - return; - } new Thread(new Runnable() { @Override public void run() { @@ -698,21 +732,29 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen if (geometry.getGeometryType().equals("Point")) {//点 latLng = GeometryTools.createLatLng(geo); } else if (geometry.getGeometryType().equals("LineString")) {//线 + BitmapDescriptor bitmapLine =null; + if (type==3){//poi录像 + bitmapLine= BitmapDescriptorFactory.fromResource(R.drawable.arrow_down); + }else if (type==4){//道路录像 + bitmapLine=BitmapDescriptorFactory.fromResource(R.drawable.arrow_down); + } List latLineString = GeometryTools.getLatLngs(geo); // 构造 PolylineOpitons PolylineOptions polylineOptions = new PolylineOptions() .alpha(0.5f) - .addAll(latLineString) // 折线设置圆形线头 .lineCap(true) .color(0xffff0000) // 折线宽度为5像素 .width(5) - // 还可以添加描边颜色 + .arrow(true) + .arrowSpacing(30) + .arrowTexture(bitmapLine); + /* // 还可以添加描边颜色 .borderColor(0xffff0000) // 描边颜色的宽度，线宽还是 25 像素，不过填充的部分宽度为 `width` - 2 * `borderWidth` - .borderWidth(1); + .borderWidth(1);*/ // 绘制折线 Polyline polyline = tencentMap.addPolyline(polylineOptions); polyline.setZIndex(3); @@ -1195,6 +1237,21 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen MapManager.getInstance().animateMapLocation2TopCenter(latLng, 0.5f, 0.25f); } + }else if (data.what== Constant.UN_POLY_GEN_TASK){//面妆任务立即采集 领取 + if ((boolean)data.obj){ + + frameLayout.setVisibility(View.GONE); + sliding_layout.setPanelHeight(0); + setMainButtonVisiable(View.VISIBLE); + sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN); + } + if (bigMarker != null) { + bigMarker.setVisible(false); + } + for (int i = 0; i < removablesMarker.size(); i++) { + removablesMarker.get(i).remove(); + } + removablesMarker.clear(); } } @@ -1214,7 +1271,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen } private void initPoiMarker(LatLng latLng) { - LatLng mapCenterPoint = getMapCenterPoint(); CameraUpdate cameraSigma = CameraUpdateFactory.newCameraPosition(new CameraPosition( latLng, //中心点坐标，地图目标经纬度 tencentMap.getCameraPosition().zoom, //目标缩放级别 diff --git a/app/src/main/java/com/navinfo/outdoor/http/OkGoBuilder.java b/app/src/main/java/com/navinfo/outdoor/http/OkGoBuilder.java index cb17a50..b34eeca 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/OkGoBuilder.java +++ b/app/src/main/java/com/navinfo/outdoor/http/OkGoBuilder.java @@ -142,12 +142,11 @@ public class OkGoBuilder { .execute(new DialogCallback(clazz) { @Override public void onSuccess(Response response) { - if (response.code() ==200 ){ + if (response.code()==200){ callback.onSuccess(response.body(), 1); }else { - Toast.makeText(activity, response.message()+"", Toast.LENGTH_SHORT).show(); + Toast.makeText(activity, response.message(), Toast.LENGTH_SHORT).show(); } - } @Override @@ -169,7 +168,6 @@ public class OkGoBuilder { } public HttpHeaders getHeader() { - HttpHeaders headers = new HttpHeaders(); try { if (token == null) { @@ -250,12 +248,11 @@ public class OkGoBuilder { .execute(new DialogCallback(clazz) { @Override public void onSuccess(Response response) { - if (response.code() ==200){ + if (response.code()==200){ callback.onSuccess(response.body(), 1); }else { - Toast.makeText(activity, response.message()+"", Toast.LENGTH_SHORT).show(); + Toast.makeText(activity, response.message(), Toast.LENGTH_SHORT).show(); } - } @Override @@ -299,7 +296,7 @@ public class OkGoBuilder { if (response.code()==200){ callback.onSuccess(response.body(), 1); }else { - Toast.makeText(activity, response.message()+"", Toast.LENGTH_SHORT).show(); + Toast.makeText(activity, response.message(), Toast.LENGTH_SHORT).show(); } } diff --git a/app/src/main/res/drawable/arrow_down.png b/app/src/main/res/drawable/arrow_down.png new file mode 100644 index 0000000000000000000000000000000000000000..88b63f29084fe350af1ae22f9e8734cefabd00ce GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^AT~P-Gmt#obT9x&X$AO%xB}_h_y3AJe-(%SX3qbC;ODRZPoDo5%2vn(s^%^U@(X78_~zoqITO=dWQ2>q zc)SD(>wCI5hHzX@K5=(%^> - - + + + - - - - - - - + android:layout_height="match_parent" + > - - - - - - - - - - - - - - - - - + android:textColor="@color/black" + android:layout_margin="10dp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_01"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + android:layout_margin="10dp" + android:layout_marginStart="10dp" + android:layout_marginEnd="10dp" + android:orientation="vertical" + app:layout_constraintTop_toBottomOf="@id/tv_02" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent"> - + + + + + + + android:background="@drawable/selector_red_bg" + android:layout_marginRight="5dp" + android:layout_marginBottom="10dp"> + + + + + + - + - + + + + + + - + + + + + - + android:layout_marginRight="5dp" + android:layout_marginBottom="10dp"> + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + android:id="@+id/iv_number" + android:layout_width="match_parent" + android:layout_height="match_parent" /> - - - - - - - - - - - - + - - - - -