From 771fce9b79f5cf487d365f59119f888e42f7184c Mon Sep 17 00:00:00 2001 From: md Date: Wed, 4 Aug 2021 14:42:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9POI=E5=BD=95=E5=83=8F?= =?UTF-8?q?=E7=9A=84=E5=B4=A9=E6=BA=83=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../fragment/ChargingStationFragment.java | 58 ++++++++------ .../outdoor/fragment/GatherGetFragment.java | 12 +-- .../outdoor/fragment/OtherFragment.java | 43 ++++++---- .../navinfo/outdoor/fragment/PoiFragment.java | 42 ++++++---- .../outdoor/fragment/PoiVideoFragment.java | 70 +++++++++-------- .../outdoor/fragment/RoadFragment.java | 70 +++++++++-------- .../outdoor/fragment/StaySubmitFragment.java | 2 +- app/src/main/res/layout/activity_user.xml | 12 +-- app/src/main/res/layout/fragment_road.xml | 78 +++++++++++-------- .../main/res/layout/poi_video_fragment.xml | 30 ++++--- app/src/main/res/values/dimens.xml | 1 + app/src/main/res/values/styles.xml | 1 + 13 files changed, 247 insertions(+), 174 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a78f9ee..43917f5 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/fragment/ChargingStationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java index f8af21a..e244e1a 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java @@ -438,9 +438,9 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. private void initShowPoi() { // 添加信息： showPoiEntity = (PoiEntity) getArguments().getSerializable("poiEntity"); - if (showPoiEntity.getTaskStatus()==1||showPoiEntity.getTaskStatus()==5){ + if (showPoiEntity.getTaskStatus() == 1 || showPoiEntity.getTaskStatus() == 5) { tvExamine.setVisibility(View.GONE); - }else { + } else { tvExamine.setVisibility(View.VISIBLE); } String name = showPoiEntity.getName();//名称 @@ -579,7 +579,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. obtain.what = Constant.CHARGING_STATION; obtain.obj = showStation; EventBus.getDefault().post(obtain); - }else { + } else { Message obtains = Message.obtain(); obtains.what = Constant.CHARGING_STATION_PILE; obtains.obj = null; @@ -1093,30 +1093,38 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. @Override public void onSuccess(ChargingStationBean chargingStationBean, int id) { dismissLoadingDialog(); - bodyId = chargingStationBean.getBody(); - poiEntity.setBodyId(bodyId); - poiEntity.setTaskStatus(3); - new Thread(new Runnable() { - @Override - public void run() { - InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiEntity); - // 充电站数据已经保存在服务上，批量保存充电桩数据 - saveChargingPileByChargingStation(poiEntity); - getActivity().runOnUiThread(new Runnable() { + if (chargingStationBean.getCode() == 200) { + bodyId = chargingStationBean.getBody(); + if (bodyId != null && bodyId != 0) { + poiEntity.setBodyId(bodyId); + poiEntity.setTaskStatus(3); + new Thread(new Runnable() { @Override public void run() { - if (isLocal) { - stationUploadByNetWork(poiEntity, chargingStationList); + InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiEntity); + // 充电站数据已经保存在服务上，批量保存充电桩数据 + saveChargingPileByChargingStation(poiEntity); + getActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + if (isLocal) { + stationUploadByNetWork(poiEntity, chargingStationList); // chargingPileUploadNetWork(chargingPileBody, fileList); - } else { - Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show(); - onBackPressed(); - } - Log.d("TAG", "onSuccess: " + chargingStationBean.getBody()); + } else { + Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show(); + onBackPressed(); + } + Log.d("TAG", "onSuccess: " + chargingStationBean.getBody()); + } + }); } - }); + }).start(); + } else { + Toast.makeText(getContext(), "" + chargingStationBean.getMessage(), Toast.LENGTH_SHORT).show(); } - }).start(); + } else { + Toast.makeText(getContext(), "" + chargingStationBean.getMessage(), Toast.LENGTH_SHORT).show(); + } } @Override @@ -1453,9 +1461,9 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. public void run() { PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId()); if (poiDaoPoiEntity != null) { - if (poiDaoPoiEntity.getTaskStatus()==5){ - poiDao.deletePoiEntity(poiDaoPoiEntity); - } + if (poiDaoPoiEntity.getTaskStatus() == 5) { + poiDao.deletePoiEntity(poiDaoPoiEntity); + } } } }).start(); 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 500965c..c36894f 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java @@ -358,8 +358,8 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe InsertAndUpdateUtils.getInstance().insertOrUpdateChargingPile(getActivity(), chargingPileEntityList); } //获取当前位置的marker - senMessageMarker(chargingStationEntity.getType(), chargingStationEntity.getY(), chargingStationEntity.getX()); - InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(),chargingStationEntity); +// senMessageMarker(chargingStationEntity.getType(), chargingStationEntity.getY(), chargingStationEntity.getX()); +// InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(),chargingStationEntity); getActivity().runOnUiThread(new Runnable() { @Override public void run() { @@ -681,8 +681,8 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe poiListEntity.setY(latPolygon.get(0).latitude + ""); } // 通知地图界面显示当前编辑数据的marker - senMessageMarker(poiEntity.getType(), poiEntity.getY(), poiEntity.getX()); - InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiListEntity); +// senMessageMarker(poiEntity.getType(), poiEntity.getY(), poiEntity.getX()); +// InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiListEntity); getActivity().runOnUiThread(new Runnable() { @Override public void run() { @@ -790,8 +790,8 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe poiListEntity.setY(latPolygon.get(0).latitude + ""); } // 通知地图界面显示当前编辑数据的marker - senMessageMarker(poiEntity.getType(), poiEntity.getY(), poiEntity.getX()); - InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiListEntity); +// senMessageMarker(poiEntity.getType(), poiEntity.getY(), poiEntity.getX()); +// InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiListEntity); getActivity().runOnUiThread(new Runnable() { @Override public void run() { 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 324e943..dcbbb54 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java @@ -526,26 +526,37 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis @Override public void onSuccess(PoiSaveBean poiSaveBean, int id) { dismissLoadingDialog(); - Integer body = poiSaveBean.getBody(); - poiEntity.setBodyId(body); - poiEntity.setTaskStatus(3); - new Thread(new Runnable() { - @Override - public void run() { - InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiEntity); - getActivity().runOnUiThread(new Runnable() { + if (poiSaveBean.getCode()==200){ + Integer body = poiSaveBean.getBody(); + if (body!=null&&body!=0){ + poiEntity.setBodyId(body); + poiEntity.setTaskStatus(3); + new Thread(new Runnable() { @Override public void run() { - if (isLocal){ - otherUploadByNet(body,otherUploadList); - }else { - Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show(); - onBackPressed(); - } + InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiEntity); + getActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + if (isLocal){ + otherUploadByNet(body,otherUploadList); + }else { + Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show(); + onBackPressed(); + } + } + }); } - }); + }).start(); + }else { + Toast.makeText(getActivity(), ""+poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); + } - }).start(); + }else { + Toast.makeText(getActivity(), ""+poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); + } + + } @Override 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 9850128..c3beeaf 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java @@ -799,26 +799,36 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe @Override public void onSuccess(PoiSaveBean poiSaveBean, int id) { dismissLoadingDialog(); - Integer body = poiSaveBean.getBody(); - poiEntity.setBodyId(body); - poiEntity.setTaskStatus(3); - new Thread(new Runnable() { - @Override - public void run() { - InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiEntity); - getActivity().runOnUiThread(new Runnable() { + if (poiSaveBean.getCode()==200){ + Integer body = poiSaveBean.getBody(); + if (body!=null&&body!=0){ + poiEntity.setBodyId(body); + poiEntity.setTaskStatus(3); + new Thread(new Runnable() { @Override public void run() { - if (isLocal) { - poiUploadByNetWork(body, poiPicList);//上传 - } else { - Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show(); - onBackPressed(); - } + InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiEntity); + getActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + if (isLocal) { + poiUploadByNetWork(body, poiPicList);//上传 + } else { + Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show(); + onBackPressed(); + } + } + }); } - }); + }).start(); + }else { + Toast.makeText(getActivity(), ""+poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); } - }).start(); + }else { + Toast.makeText(getActivity(), ""+poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); + } + + } @Override 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 723d1f6..029ebb7 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java @@ -14,6 +14,7 @@ import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.EditText; +import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.RadioButton; import android.widget.RadioGroup; @@ -91,6 +92,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick private Button btnPoiVideoUpload; private String videoPath; private File fileZip; + private FrameLayout fmPoiVideoPic; public static PoiVideoFragment newInstance(Bundle bundle) { PoiVideoFragment fragment = new PoiVideoFragment(); @@ -151,12 +153,13 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick rbWalking = (RadioButton) findViewById(R.id.rb_walking); rbManual = (RadioButton) findViewById(R.id.rb_manual); etDesc = (EditText) findViewById(R.id.et_desc); + fmPoiVideoPic = findViewById(R.id.fm_poi_video_picture); btnRoadSave = (Button) findViewById(R.id.btn_poi_video_save); btnRoadSave.setOnClickListener(this::onClick); btnPoiVideoUpload = findViewById(R.id.btn_poi_video_upload); btnPoiVideoUpload.setOnClickListener(this::onClick); rgType = (RadioGroup) findViewById(R.id.rg_type); - ivPoiVideoPicture.setOnClickListener(new View.OnClickListener() { + fmPoiVideoPic.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { if (v.getTag() == null) { @@ -164,19 +167,19 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick return; } File videoFile = (File) v.getTag(); - Intent intent = new Intent(getContext(), PicturesActivity.class); + Intent intent = new Intent(getContext(), PictureActivity.class); intent.putExtra(Constant.INTENT_VIDEO_PATH, videoFile.getAbsolutePath()); startActivityForResult(intent, 0x101); } }); - ivPoiVideoPicture.setOnLongClickListener(new View.OnLongClickListener() { + fmPoiVideoPic.setOnLongClickListener(new View.OnLongClickListener() { @Override public boolean onLongClick(View v) { DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE; MessageDialog.show((AppCompatActivity) getContext(), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { @Override public boolean onClick(BaseDialog baseDialog, View v) { - File videoFile = (File) ivPoiVideoPicture.getTag(); + File videoFile = (File) fmPoiVideoPic.getTag(); if (videoFile != null) { videoFile.delete(); //获取文件名 @@ -215,7 +218,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick if (videoFile.exists()) { // 使用glide加载视频的第一帧 AWMp4ParserHelper.getInstance().loadFirstWithGlide(getActivity(), Uri.fromFile(videoFile).toString(), ivPoiVideoPicture, 500); - ivPoiVideoPicture.setTag(videoFile); + fmPoiVideoPic.setTag(videoFile); } } } @@ -271,7 +274,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick // 根据用户点击的时间为视频名称赋值 DateFormat formatter = new SimpleDateFormat("yyyyMMddHHmmss"); String videoFormatName = formatter.format(new Date()); - Intent intent = new Intent(getContext(), PicturesActivity.class); + Intent intent = new Intent(getContext(), PictureActivity.class); intent.putExtra(Constant.INTENT_VIDEO_PATH, Constant.PICTURE_FOLDER + "/" + videoFormatName + ".mp4"); startActivityForResult(intent, 0x101); @@ -280,8 +283,8 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick case R.id.btn_poi_video_upload: showLoadingDialog(); ArrayList videoFileList = new ArrayList<>(); - if (ivPoiVideoPicture.getTag() != null) { - File videoFile = (File) ivPoiVideoPicture.getTag(); + if (fmPoiVideoPic.getTag() != null) { + File videoFile = (File) fmPoiVideoPic.getTag(); videoFileList.add(videoFile); File file = new File(videoFile.getPath()+".txt"); videoFileList.add(file); @@ -372,7 +375,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick poiEntity.setTaskId(showPoiEntity.getTaskId()); } } - File videoFile = (File) ivPoiVideoPicture.getTag(); + File videoFile = (File) fmPoiVideoPic.getTag(); if (videoFile == null ) { Toast.makeText(getActivity(), "请录像", Toast.LENGTH_SHORT).show(); return; @@ -505,31 +508,36 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick @Override public void onSuccess(PoiVideoBean poiVideoBean, int id) { dismissLoadingDialog(); - Integer poiVideoBody = poiVideoBean.getBody(); - if (poiVideoBody != null && poiVideoBody != 0) { - poiEntity.setBodyId(poiVideoBody); - poiEntity.setTaskStatus(3); - new Thread(new Runnable() { - @Override - public void run() { - InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiEntity); - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - if (isLocal) { - poiVideoUpload(poiVideoBody, fileZip); - } else { - Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show(); - onBackPressed(); + if (poiVideoBean.getCode()==200){ + Integer poiVideoBody = poiVideoBean.getBody(); + if (poiVideoBody != null && poiVideoBody != 0) { + poiEntity.setBodyId(poiVideoBody); + poiEntity.setTaskStatus(3); + new Thread(new Runnable() { + @Override + public void run() { + InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiEntity); + getActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + if (isLocal) { + poiVideoUpload(poiVideoBody, fileZip); + } else { + Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show(); + onBackPressed(); + } } - } - }); - } - }).start(); - } else { + }); + } + }).start(); + } else { + Toast.makeText(getActivity(), ""+poiVideoBean.getMessage(), Toast.LENGTH_SHORT).show(); + } + }else { Toast.makeText(getActivity(), ""+poiVideoBean.getMessage(), Toast.LENGTH_SHORT).show(); } + } @Override @@ -552,7 +560,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick File videoFile = new File(videoPath); if (videoFile.exists()) { AWMp4ParserHelper.getInstance().loadFirstWithGlide(getActivity(), Uri.fromFile(videoFile).toString(), ivPoiVideoPicture, 500); - ivPoiVideoPicture.setTag(videoFile); + fmPoiVideoPic.setTag(videoFile); } } } 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 1b537bd..4c298a6 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java @@ -14,6 +14,7 @@ import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.EditText; +import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.RadioButton; import android.widget.RadioGroup; @@ -86,6 +87,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList private Button roadUpload; private String videoPath; private File fileZip; + private FrameLayout fmRoadPic; public static RoadFragment newInstance(Bundle bundle) { RoadFragment fragment = new RoadFragment(); @@ -147,12 +149,13 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList rbWalking = (RadioButton) findViewById(R.id.rb_walking); rbManual = (RadioButton) findViewById(R.id.rb_manual); etDesc = (EditText) findViewById(R.id.et_desc); + fmRoadPic = findViewById(R.id.fm_road_picture); btnRoadSave = (Button) findViewById(R.id.btn_road_save); btnRoadSave.setOnClickListener(this::onClick); rgType = (RadioGroup) findViewById(R.id.rg_type); roadUpload = findViewById(R.id.road_upload); roadUpload.setOnClickListener(this::onClick); - ivRoadPicture.setOnClickListener(new View.OnClickListener() { + fmRoadPic.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { if (v.getTag() == null) { @@ -192,7 +195,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList if (videoFile.exists()) { // 使用glide加载视频的第一帧 AWMp4ParserHelper.getInstance().loadFirstWithGlide(getActivity(), Uri.fromFile(videoFile).toString(), ivRoadPicture, 500); - ivRoadPicture.setTag(videoFile); + fmRoadPic.setTag(videoFile); } } } @@ -263,9 +266,9 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList case R.id.road_upload: showLoadingDialog(); ArrayList videoFileList = new ArrayList<>(); - if (ivRoadPicture.getTag() != null) { + if (fmRoadPic.getTag() != null) { - File videoFile = (File) ivRoadPicture.getTag(); + File videoFile = (File) fmRoadPic.getTag(); videoFileList.add(videoFile); File file = new File(videoFile.getPath() + ".txt"); videoFileList.add(file); @@ -346,11 +349,11 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList poiEntity.setTaskId(showPoiEntity.getTaskId()); } } - if (ivRoadPicture.getTag() == null) { + if (fmRoadPic.getTag() == null) { Toast.makeText(getActivity(), "请录像", Toast.LENGTH_SHORT).show(); return; } else { - File videoFile = (File) ivRoadPicture.getTag(); + File videoFile = (File) fmRoadPic.getTag(); String path = videoFile.getPath() + ".txt"; poiEntity.setPhoto(videoFile.getAbsolutePath()); List strings = FileUtils.readFileToList(path, "utf-8"); @@ -482,30 +485,35 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList @Override public void onSuccess(RoadSaveBean roadSaveBean, int id) { dismissLoadingDialog(); - Integer roadBody = roadSaveBean.getBody(); - if (roadBody!=null&&roadBody!=0){ - poiEntity.setBodyId(roadBody); - poiEntity.setTaskStatus(3); - new Thread(new Runnable() { - @Override - public void run() { - InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiEntity); - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - if (isLocal) { - poiVideoUpload(roadBody, fileZip); - } else { - Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show(); - onBackPressed(); - } - } - }); - } - }).start(); - }else { - Toast.makeText(getContext(), ""+roadSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); - } + if (roadSaveBean.getCode()==200){ + Integer roadBody = roadSaveBean.getBody(); + if (roadBody!=null&&roadBody!=0){ + poiEntity.setBodyId(roadBody); + poiEntity.setTaskStatus(3); + new Thread(new Runnable() { + @Override + public void run() { + InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiEntity); + getActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + if (isLocal) { + poiVideoUpload(roadBody, fileZip); + } else { + Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show(); + onBackPressed(); + } + } + }); + } + }).start(); + }else { + Toast.makeText(getContext(), ""+roadSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); + } + }else { + Toast.makeText(getContext(), ""+roadSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); + } + } @@ -530,7 +538,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList File videoFile = new File(videoPath); if (videoFile.exists()) { AWMp4ParserHelper.getInstance().loadFirstWithGlide(getActivity(), Uri.fromFile(videoFile).toString(), ivRoadPicture, 500); - ivRoadPicture.setTag(videoFile); + fmRoadPic.setTag(videoFile); } } } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java index a086bbd..a50e5e6 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java @@ -203,7 +203,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList @Override public boolean onClick(BaseDialog baseDialog, View v) { staySubmitAdapter.setAllCheckedDelete(); - refreshData(); +// refreshData(); return false; } }); diff --git a/app/src/main/res/layout/activity_user.xml b/app/src/main/res/layout/activity_user.xml index 657e471..ea06a0a 100644 --- a/app/src/main/res/layout/activity_user.xml +++ b/app/src/main/res/layout/activity_user.xml @@ -72,8 +72,8 @@