xiaoyan159/NavinfoOutDoor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

Browse Source
This commit is contained in:
md
2021-07-22 18:22:03 +08:00
parent f8805da00e
commit e1993e8e54
49 changed files with 517 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/build.gradle
View File

@@ -125,4 +125,7 @@ dependencies {
implementation 'com.googlecode.mp4parser:isoparser:1.1.21' implementation 'com.googlecode.mp4parser:isoparser:1.1.21'
// Android常用库 // Android常用库
implementation 'com.github.lazylibrary:lazylibrary:1.0.2' implementation 'com.github.lazylibrary:lazylibrary:1.0.2'
//屏幕的适配百分比
//https://www.jianshu.com/p/0c2a8db91bda?utm_campaign=maleskine&utm_content=note&utm_medium=seo_notes&utm_source=recommendation
implementation 'com.android.support:percent:27.0.2'
} }

7
app/src/main/java/com/navinfo/outdoor/adapter/TaskExplainAdapter2.java
View File

@@ -24,8 +24,11 @@ public class TaskExplainAdapter2 extends RecyclerView.Adapter<TaskExplainAdapter
} }
public void setExplainList2(List<TaskExplainInfo.BodyBean.DataBean> explainList2) { public void setExplainList2(List<TaskExplainInfo.BodyBean.DataBean> explainList2) {
this.explainList2.addAll(explainList2); if (explainList2!=null){
notifyDataSetChanged(); this.explainList2.addAll(explainList2);
notifyDataSetChanged();
}
} }
@NonNull @NonNull

28
app/src/main/java/com/navinfo/outdoor/api/Constant.java
View File

@@ -1,5 +1,7 @@
package com.navinfo.outdoor.api; package com.navinfo.outdoor.api;
import android.widget.TextView;
import com.navinfo.outdoor.R; import com.navinfo.outdoor.R;
import com.navinfo.outdoor.bean.JobSearchBean; import com.navinfo.outdoor.bean.JobSearchBean;
import com.navinfo.outdoor.util.SdkFolderCreate; import com.navinfo.outdoor.util.SdkFolderCreate;
@@ -22,17 +24,17 @@ public class Constant {
* 位置权限 * 位置权限
*/ */
public static final String SET_LOCATION_PERMISSION = "请在“设置”中给予“TengXunMap”位置权限,否则当前功能将不可使用"; public static final String SET_LOCATION_PERMISSION = "请在“设置”中给予“TengXunMap”位置权限,否则当前功能将不可使用";
public static final String SET_LOCATION= "请在“设置”中给予权限否则当前功能将不可使用"; public static final String SET_LOCATION = "请在“设置”中给予权限否则当前功能将不可使用";
public static final String GET_ERR_MESSAGE1 = "设备缺少使用腾讯定位服务需要的基本条件"; public static final String GET_ERR_MESSAGE1 = "设备缺少使用腾讯定位服务需要的基本条件";
public static final String GET_ERR_MESSAGE2 = "manifest 中配置的 key 不正确"; public static final String GET_ERR_MESSAGE2 = "manifest 中配置的 key 不正确";
public static final String GET_ERR_MESSAGE3 = "自动加载libtencentloc.so失败"; public static final String GET_ERR_MESSAGE3 = "自动加载libtencentloc.so失败";
public static final String BASE_FOLDER = SdkFolderCreate.getSDPath()+"/navinfoOutDoor"; public static final String BASE_FOLDER = SdkFolderCreate.getSDPath() + "/navinfoOutDoor";
// 保存图片的目录 // 保存图片的目录
public static final String PICTURE_FOLDER = BASE_FOLDER+"/picture"; public static final String PICTURE_FOLDER = BASE_FOLDER + "/picture";
public static final String VIDEOS_ = BASE_FOLDER+"/videos"; public static final String VIDEOS_ = BASE_FOLDER + "/videos";
public static final String POI_DAO = BASE_FOLDER+"/BaseDao/"; public static final String POI_DAO = BASE_FOLDER + "/BaseDao/";
// 申请权限的RequestCode // 申请权限的RequestCode
public static final int PERMISSION_REQUEST_CODE = 0x100; public static final int PERMISSION_REQUEST_CODE = 0x100;
@@ -43,7 +45,6 @@ public class Constant {
public static final String DATA_FILE = "dataFile"; public static final String DATA_FILE = "dataFile";
//message word 值 //message word 值
public static final int TREASURE_FRAGMENT = 100;//抽屉界面的展示和隐藏 public static final int TREASURE_FRAGMENT = 100;//抽屉界面的展示和隐藏
public static final int TREASURE_WORD = 39;//poi 对地图页面marker 的一个展示 编辑 public static final int TREASURE_WORD = 39;//poi 对地图页面marker 的一个展示 编辑
@@ -76,18 +77,19 @@ public class Constant {
public static final int GATHER_GET_MAP = 30;//地图点击marker 后弹窗点击开始采集 public static final int GATHER_GET_MAP = 30;//地图点击marker 后弹窗点击开始采集
public static final int HOME_MINE = 32;//点击我的实时监听刷新 public static final int HOME_MINE = 32;//点击我的实时监听刷新
public static final int HOME_TREASURE = 33;//点击寻宝实时监听刷新 public static final int HOME_TREASURE = 33;//点击寻宝实时监听刷新
public static final int JOB_WORD_MONITOR=34;//筛选条件的刷新 public static final int JOB_WORD_MONITOR = 34;//筛选条件的刷新
public static final int EVENT_WHAT_LOCATION_CHANGE = 35; // 定位位置更新的Event的What值 public static final int EVENT_WHAT_LOCATION_CHANGE = 35; // 定位位置更新的Event的What值
public static final int CHARGING_PILE_BODY=36;//充电装的body public static final int CHARGING_PILE_BODY = 36;//充电装的body
public static final int CHARGING_PILE_PHONE = 37;//充电桩的照片 public static final int CHARGING_PILE_PHONE = 37;//充电桩的照片
public static final int EVENT_WHAT_CURRENT_MARKER = 41; // 显示当前正在编辑的POI类型数据的Event的What值 public static final int EVENT_WHAT_CURRENT_MARKER = 41; // 显示当前正在编辑的POI类型数据的Event的What值
public static String USER_ATTESTATION_NAME; //实名认证姓名 银行卡 public static String USER_ATTESTATION_NAME; //实名认证姓名 银行卡
public static int NUMBER = 200; //任务个数 public static int NUMBER = 200; //任务个数
public static int LIMIT_TTPE = -1; //权限类型，普通任务-0，专属任务-1 public static int LIMIT_TTPE = -1; //权限类型，普通任务-0，专属任务-1
public static int TASK_TYPE = -1; // 任务类型 public static int TASK_TYPE = -1; // 任务类型
public static int TASK_STASTUS = -1; // 任务状态 public static int TASK_STASTUS = -1; // 任务状态
public static String CODE =""; //区号 public static String CODE = ""; //区号
/** /**
* 用户当前位置 * 用户当前位置
*/ */
@@ -105,4 +107,6 @@ public class Constant {
public static MapView treasureMap; public static MapView treasureMap;
public static final String INTENT_VIDEO_PATH = "INTENT_VIDEO_PATH"; // 拍照界面指定的视频文件保存位置 public static final String INTENT_VIDEO_PATH = "INTENT_VIDEO_PATH"; // 拍照界面指定的视频文件保存位置
public static boolean IS_FILTER_LIST_ITEM =true;//poi页面的查重
} }

1
app/src/main/java/com/navinfo/outdoor/base/BaseFragment.java
View File

@@ -9,6 +9,7 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.IdRes; import androidx.annotation.IdRes;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;

17
app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java
View File

@@ -105,6 +105,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
private Integer chargingPileBody; private Integer chargingPileBody;
private ArrayList<File> phoneLists; private ArrayList<File> phoneLists;
private PoiEntity poiEntity;
public static ChargingPileFragment newInstance(Bundle bundle) { public static ChargingPileFragment newInstance(Bundle bundle) {
ChargingPileFragment fragment = new ChargingPileFragment(); ChargingPileFragment fragment = new ChargingPileFragment();
@@ -133,7 +134,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
obtain.what = Constant.MAIN_HEADER; obtain.what = Constant.MAIN_HEADER;
obtain.obj = header; obtain.obj = header;
EventBus.getDefault().post(obtain); EventBus.getDefault().post(obtain);
header.findViewById(R.id.iv_final).setOnClickListener(new View.OnClickListener() { header.findViewById(R.id.iv_charging_pile_final).setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Bundle arguments = getArguments(); Bundle arguments = getArguments();
@@ -398,7 +399,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
private void initShowPileSharePre() { private void initShowPileSharePre() {
station = getArguments().getString("station"); station = getArguments().getString("station");
if (station!=null){ if (station!=null){
PoiEntity poiEntity = new Gson().fromJson(station, PoiEntity.class); poiEntity = new Gson().fromJson(station, PoiEntity.class);
pid = poiEntity.getId(); pid = poiEntity.getId();
taskId = poiEntity.getTaskId(); taskId = poiEntity.getTaskId();
String x = poiEntity.getX(); String x = poiEntity.getX();
@@ -569,13 +570,17 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
if (all) { if (all) {
//保存数据库： //保存数据库：
ChargingPileEntity chargingPileEntity = new ChargingPileEntity(); ChargingPileEntity chargingPileEntity = new ChargingPileEntity();
ArrayList<String> photoBean; photoBean = new ArrayList<>(); ArrayList<String> photoBean;
photoBean = new ArrayList<>();
if (latLng == null || latLng.equals("")) { if (latLng == null || latLng.equals("")) {
Toast.makeText(getActivity(), "请确定点位", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请确定点位", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
String encode = Geohash.getInstance().encode(latLng.latitude,latLng.longitude); String encode = Geohash.getInstance().encode(latLng.latitude,latLng.longitude);
chargingPileEntity.setP(encode); chargingPileEntity.setP(encode);
poiEntity.setX(String.valueOf(latLng.longitude));
poiEntity.setY(String.valueOf(latLng.latitude));
} }
String name = tvNameContent.getText().toString().trim();//名称 String name = tvNameContent.getText().toString().trim();//名称
if (name == null || name.equals("")) { if (name == null || name.equals("")) {
@@ -600,7 +605,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
} }
String tagEquipment = (String) ivEquipment.getTag(); String tagEquipment = (String) ivEquipment.getTag();
if (tagEquipment == null ) { if (tagEquipment == null ) {
Toast.makeText(getActivity(), "请拍照 设备编码", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请拍照 设备标牌", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
photoBean.add(tagEquipment); photoBean.add(tagEquipment);
@@ -608,7 +613,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
String tagFacility = (String) ivFacility.getTag(); String tagFacility = (String) ivFacility.getTag();
if (sign_exist != 0) { if (sign_exist != 0) {
if (tagFacility == null) { if (tagFacility == null) {
Toast.makeText(getActivity(), "请拍照 设备编码", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请拍照 设备标牌", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
photoBean.add(tagFacility); photoBean.add(tagFacility);
@@ -632,7 +637,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
String tagDevice = (String) ivDevice.getTag(); String tagDevice = (String) ivDevice.getTag();
if (sign_exist == 1) { if (sign_exist == 1) {
if (tagDevice == null) { if (tagDevice == null) {
Toast.makeText(getActivity(), "请拍照 设备编码", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请拍照 设备标牌", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
photoBean.add(tagDevice); photoBean.add(tagDevice);

47
app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java
View File

@@ -135,7 +135,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
obtain.what = Constant.MAIN_HEADER; obtain.what = Constant.MAIN_HEADER;
obtain.obj = header; obtain.obj = header;
EventBus.getDefault().post(obtain); EventBus.getDefault().post(obtain);
header.findViewById(R.id.iv_final).setOnClickListener(new View.OnClickListener() { header.findViewById(R.id.iv_charging_station_final).setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Bundle arguments = getArguments(); Bundle arguments = getArguments();
@@ -149,6 +149,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
obtain.what = Constant.TREASURE_FRAGMENT; obtain.what = Constant.TREASURE_FRAGMENT;
obtain.obj = isSliding; obtain.obj = isSliding;
EventBus.getDefault().post(obtain); EventBus.getDefault().post(obtain);
Message mainButtonVisiableMsg = Message.obtain(); Message mainButtonVisiableMsg = Message.obtain();
mainButtonVisiableMsg.what = Constant.MAIN_BUTTON_VISIABLE; mainButtonVisiableMsg.what = Constant.MAIN_BUTTON_VISIABLE;
mainButtonVisiableMsg.obj = View.VISIBLE; mainButtonVisiableMsg.obj = View.VISIBLE;
@@ -176,7 +177,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
obtain.what = Constant.MAIN_HEADER; obtain.what = Constant.MAIN_HEADER;
obtain.obj = header; obtain.obj = header;
EventBus.getDefault().post(obtain); EventBus.getDefault().post(obtain);
header.findViewById(R.id.iv_final).setOnClickListener(new View.OnClickListener() { header.findViewById(R.id.iv_charging_station_final).setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Bundle arguments = getArguments(); Bundle arguments = getArguments();
@@ -370,14 +371,32 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
String[] phones = telPhone.split("\\|"); String[] phones = telPhone.split("\\|");
for (int i = 0; i < phones.length; i++) { for (int i = 0; i < phones.length; i++) {
if (i == 0) { if (i == 0) {
if (!StringUtils.isEmpty(phones[i])) { if (!StringUtils.isEmpty(phones[i])) if (!StringUtils.isEmpty(phones[i])) {
String[] split = phones[i].split("-"); if (phones[i].contains("-")) { // 包含区号数据的电话
if (split[0] == phones[i]) { String[] split = phones[i].split("-");
poiBeans.add(new PhoneBean("电话*", phones[i], "", R.drawable.icon_add_bg)); if (split!=null&&split.length>1) {
poiBeans.add(new PhoneBean("电话", split[1] + "", split[0] + "", R.drawable.icon_add_bg));
} else {
poiBeans.add(new PhoneBean("电话", "", "", R.drawable.icon_add_bg));
}
} else { } else {
poiBeans.add(new PhoneBean("电话*", split[1], split[0], R.drawable.icon_add_bg)); if (!StringUtils.isEmpty(phones[i])) {
if (phones[i].contains("-")) { // 包含区号数据的电话
String[] split = phones[i].split("-");
if (split!=null&&split.length>1) {
poiBeans.add(new PhoneBean("", split[1] + "", split[0] + "", R.drawable.icon_del_bg));
} else {
poiBeans.add(new PhoneBean("", "", "", R.drawable.icon_del_bg));
}
} else {
if (phones[i]!=null) {
poiBeans.add(new PhoneBean("", phones[i] + "", "", R.drawable.icon_del_bg));
} else {
poiBeans.add(new PhoneBean("", "", "", R.drawable.icon_del_bg));
}
}
}
} }
} }
} else { } else {
if (!StringUtils.isEmpty(phones[i])) { if (!StringUtils.isEmpty(phones[i])) {
@@ -453,6 +472,9 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
if (showPoiEntity.getId() != 0) { if (showPoiEntity.getId() != 0) {
initPile(); initPile();
} }
if (showPoiEntity.getTaskStatus()==3){
disables();
}
} }
private void initPile() { private void initPile() {
@@ -740,28 +762,28 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
} }
String tagName = (String) ivName.getTag(); String tagName = (String) ivName.getTag();
if (tagName == null) { if (tagName == null) {
Toast.makeText(getActivity(), "请拍照 充电桩编码", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请拍照 名称照片", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
infoPhoto.add(new Info(tagName)); infoPhoto.add(new Info(tagName));
} }
String tagInternal = (String) ivInternal.getTag(); String tagInternal = (String) ivInternal.getTag();
if (tagInternal == null) { if (tagInternal == null) {
Toast.makeText(getActivity(), "请拍照 设备编码", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请拍照 服务说明", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
infoPhoto.add(new Info(tagInternal)); infoPhoto.add(new Info(tagInternal));
} }
String tagElse = (String) ivElse.getTag(); String tagElse = (String) ivElse.getTag();
if (tagElse == null) { if (tagElse == null) {
Toast.makeText(getActivity(), "请拍照 设备编码", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请拍照 充电站指引牌", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
infoPhoto.add(new Info(tagElse)); infoPhoto.add(new Info(tagElse));
} }
String tagScutcheon = (String) ivScutcheon.getTag(); String tagScutcheon = (String) ivScutcheon.getTag();
if (tagScutcheon == null) { if (tagScutcheon == null) {
Toast.makeText(getActivity(), "请拍照 设备编码", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请拍照 停车收费标牌", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
infoPhoto.add(new Info(tagScutcheon)); infoPhoto.add(new Info(tagScutcheon));
@@ -890,6 +912,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
chargingPileUploadNetWork(chargingPileBody, fileList); chargingPileUploadNetWork(chargingPileBody, fileList);
} else { } else {
Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show();
onBackPressed();
} }
Log.d("TAG", "onSuccess: " + chargingStationBean.getBody()); Log.d("TAG", "onSuccess: " + chargingStationBean.getBody());
} }

16
app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java
View File

@@ -36,7 +36,9 @@ import org.greenrobot.eventbus.Subscribe;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
/**
* 筛选的Fragment
* */
public class FilterFragment extends BaseDrawerFragment implements View.OnClickListener { public class FilterFragment extends BaseDrawerFragment implements View.OnClickListener {
private Button btnFilter; private Button btnFilter;
private XRecyclerView recyclerFilter; private XRecyclerView recyclerFilter;
@@ -58,13 +60,13 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
@Override @Override
public void onHiddenChanged(boolean hidden) { public void onHiddenChanged(boolean hidden) {
super.onHiddenChanged(hidden); super.onHiddenChanged(hidden);
if (!hidden) { if (hidden) {
View header = LayoutInflater.from(getActivity()).inflate(R.layout.filter_header, null); View header1 = LayoutInflater.from(getActivity()).inflate(R.layout.filter_header, null);
Message obtain = Message.obtain(); Message obtain = Message.obtain();
obtain.what = Constant.MAIN_HEADER; obtain.what = Constant.MAIN_HEADER;
obtain.obj = header; obtain.obj = header1;
EventBus.getDefault().post(obtain); EventBus.getDefault().post(obtain);
header.findViewById(R.id.iv_final).setOnClickListener(new View.OnClickListener() { header1.findViewById(R.id.iv_filter_final).setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Bundle arguments = getArguments(); Bundle arguments = getArguments();
@@ -86,6 +88,7 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
} }
onBackPressed(); onBackPressed();
} }
}); });
} }
} }
@@ -107,7 +110,7 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
obtain.what = Constant.MAIN_HEADER; obtain.what = Constant.MAIN_HEADER;
obtain.obj = header; obtain.obj = header;
EventBus.getDefault().post(obtain); EventBus.getDefault().post(obtain);
header.findViewById(R.id.iv_final).setOnClickListener(new View.OnClickListener() { header.findViewById(R.id.iv_filter_final).setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Bundle arguments = getArguments(); Bundle arguments = getArguments();
@@ -305,6 +308,7 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
obtain.what = Constant.FILTER_LIST_ITEM; obtain.what = Constant.FILTER_LIST_ITEM;
obtain.obj = poiEntity; obtain.obj = poiEntity;
EventBus.getDefault().post(obtain); EventBus.getDefault().post(obtain);
} }
} }
}); });

259
app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java
View File

@@ -45,6 +45,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
private PoiDao poiDao; private PoiDao poiDao;
private ChargingPileDao chargingPileDao; private ChargingPileDao chargingPileDao;
public static GatherGetFragment newInstance(Bundle bundle) { public static GatherGetFragment newInstance(Bundle bundle) {
GatherGetFragment fragment = new GatherGetFragment(); GatherGetFragment fragment = new GatherGetFragment();
fragment.setArguments(bundle); fragment.setArguments(bundle);
@@ -129,16 +130,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
initViewByTaskStatus(taskStatus); initViewByTaskStatus(taskStatus);
} }
} }
/**
* btnGetTask.setVisibility(View.GONE);领取任务
* // btnCancelGet.setVisibility(View.VISIBLE);取消领取
* //btnFinishGather.setVisibility(View.VISIBLE);结束采集
* //btnGather.setVisibility(View.GONE);立即采集
* btnGetTask.setVisibility(View.GONE);
* btnCancelGet.setVisibility(View.VISIBLE);
* btnFinishGather.setVisibility(View.GONE);
* btnGather.setVisibility(View.VISIBLE);
* */
private void initViewByTaskStatus(int taskStatus) { private void initViewByTaskStatus(int taskStatus) {
switch (taskStatus) { switch (taskStatus) {
@@ -264,12 +256,12 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
getActivity().runOnUiThread(new Runnable() { getActivity().runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
// poiEntity.setTaskStatus(0); poiEntity.setTaskStatus(0);
// initViewByTaskStatus(0); initViewByTaskStatus(0);
btnGetTask.setVisibility(View.VISIBLE); // btnGetTask.setVisibility(View.VISIBLE);
btnCancelGet.setVisibility(View.GONE); // btnCancelGet.setVisibility(View.GONE);
btnGather.setVisibility(View.VISIBLE); // btnGather.setVisibility(View.VISIBLE);
btnFinishGather.setVisibility(View.GONE); // btnFinishGather.setVisibility(View.GONE);
} }
}); });
} }
@@ -295,73 +287,84 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
@Override @Override
public void onSuccess(ReceivedBean response, int id) { public void onSuccess(ReceivedBean response, int id) {
dismissLoadingDialog(); dismissLoadingDialog();
ReceivedBean.BodyBean listBean = response.getBody(); if (response.getCode() == 200){
PoiEntity chargingListEntity = new PoiEntity(); ReceivedBean.BodyBean listBean = response.getBody();
chargingListEntity.setTaskId(taskId); PoiEntity chargingListEntity = new PoiEntity();
chargingListEntity.setStation_type(listBean.getSptype()); if (listBean!=null){
chargingListEntity.setName(listBean.getName()); chargingListEntity.setTaskId(taskId);
chargingListEntity.setPrecision(listBean.getPrice() + ""); chargingListEntity.setStation_type(listBean.getSptype());
chargingListEntity.setAddress(listBean.getAddress()); chargingListEntity.setName(listBean.getName());
chargingListEntity.setTelPhone(listBean.getTelephone() + ""); chargingListEntity.setPrecision(listBean.getPrice() + "");
chargingListEntity.setType(Integer.valueOf(listBean.getType())); chargingListEntity.setAddress(listBean.getAddress());
chargingListEntity.setTaskStatus(1); chargingListEntity.setTelPhone(listBean.getTelephone() + "");
chargingListEntity.setIsLocalData(1); chargingListEntity.setType(Integer.valueOf(listBean.getType()));
String geo = listBean.getGeo(); chargingListEntity.setTaskStatus(1);
chargingListEntity.setGeoWkt(geo); chargingListEntity.setIsLocalData(1);
Geometry geometry = GeometryTools.createGeometry(geo); String geo = listBean.getGeo();
if (geometry.getGeometryType().equals("Point")) {//点 chargingListEntity.setGeoWkt(geo);
LatLng latLng = GeometryTools.createLatLng(geo); Geometry geometry = GeometryTools.createGeometry(geo);
chargingListEntity.setX(latLng.longitude + ""); if (geometry.getGeometryType().equals("Point")) {//点
chargingListEntity.setY(latLng.latitude + ""); LatLng latLng = GeometryTools.createLatLng(geo);
} else if (geometry.getGeometryType().equals("LineString")) {//线 chargingListEntity.setX(latLng.longitude + "");
List<LatLng> latLineString = GeometryTools.getLatLngs(geo); chargingListEntity.setY(latLng.latitude + "");
chargingListEntity.setX(latLineString.get(0).longitude + ""); } else if (geometry.getGeometryType().equals("LineString")) {//线
chargingListEntity.setY(latLineString.get(0).latitude + ""); List<LatLng> latLineString = GeometryTools.getLatLngs(geo);
} else if (geometry.getGeometryType().equals("Polygon")) {//面 chargingListEntity.setX(latLineString.get(0).longitude + "");
List<LatLng> latPolygon = GeometryTools.getLatLngs(geo); chargingListEntity.setY(latLineString.get(0).latitude + "");
chargingListEntity.setX(latPolygon.get(0).longitude + ""); } else if (geometry.getGeometryType().equals("Polygon")) {//面
chargingListEntity.setY(latPolygon.get(0).latitude + ""); List<LatLng> latPolygon = GeometryTools.getLatLngs(geo);
} chargingListEntity.setX(latPolygon.get(0).longitude + "");
//充电桩 chargingListEntity.setY(latPolygon.get(0).latitude + "");
List<ReceivedBean.BodyBean.CsTaskListBean> csTaskList = response.getBody().getCsTaskList(); }
for (int i = 0; i < csTaskList.size(); i++) { }
ChargingPileEntity chargingPileEntity = new ChargingPileEntity();
chargingPileEntity.setFid(taskId); //充电桩
chargingPileEntity.setName(csTaskList.get(i).getName()); List<ReceivedBean.BodyBean.CsTaskListBean> csTaskList = response.getBody().getCsTaskList();
chargingPileEntity.setMemo(csTaskList.get(i).getAddress()); if (csTaskList!=null){
chargingPileEntity.setP(csTaskList.get(i).getGeo());
}
for (int i = 0; i < csTaskList.size(); i++) {
ChargingPileEntity chargingPileEntity = new ChargingPileEntity();
chargingPileEntity.setFid(taskId);
chargingPileEntity.setName(csTaskList.get(i).getName());
chargingPileEntity.setMemo(csTaskList.get(i).getAddress());
chargingPileEntity.setP(csTaskList.get(i).getGeo());
new Thread(new Runnable() {
@Override
public void run() {
chargingPileDao.insertChargingPileEntity(chargingPileEntity);
}
}).start();
}
//获取当前位置的marker
senMessageMarker(chargingListEntity.getType(),chargingListEntity.getY(),chargingListEntity.getX());
new Thread(new Runnable() { new Thread(new Runnable() {
@Override @Override
public void run() { public void run() {
chargingPileDao.insertChargingPileEntity(chargingPileEntity); InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), chargingListEntity);
} getActivity().runOnUiThread(new Runnable() {
}).start(); @Override
} public void run() {
//获取当前位置的marker
senMessageMarker(chargingListEntity.getType(),chargingListEntity.getY(),chargingListEntity.getX());
new Thread(new Runnable() {
@Override
public void run() {
InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), chargingListEntity);
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
// poiEntity.setTaskStatus(1); // poiEntity.setTaskStatus(1);
// initViewByTaskStatus(1); // initViewByTaskStatus(1);
btnGetTask.setVisibility(View.GONE); btnGetTask.setVisibility(View.GONE);
btnCancelGet.setVisibility(View.VISIBLE); btnCancelGet.setVisibility(View.VISIBLE);
btnFinishGather.setVisibility(View.VISIBLE); btnFinishGather.setVisibility(View.VISIBLE);
btnGather.setVisibility(View.GONE); btnGather.setVisibility(View.GONE);
if (isSaver) { if (isSaver) {
Message obtain = Message.obtain(); Message obtain = Message.obtain();
obtain.what = Constant.GATHER_GET_MAP; obtain.what = Constant.GATHER_GET_MAP;
obtain.obj = chargingListEntity; obtain.obj = chargingListEntity;
EventBus.getDefault().post(obtain); EventBus.getDefault().post(obtain);
}
} }
} });
}); }
} }).start();
}).start(); }else {
Toast.makeText(getActivity(), "本任务已锁定", Toast.LENGTH_SHORT).show();
}
} }
@Override @Override
@@ -395,25 +398,28 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
if (response.getCode() == 200) {// 0.未领取 1.已领取，2.未保存(保存到本地但未提交成功),3.已保存(保存到本地提交成功)，4已上传（结束采集）, if (response.getCode() == 200) {// 0.未领取 1.已领取，2.未保存(保存到本地但未提交成功),3.已保存(保存到本地提交成功)，4已上传（结束采集）,
PolygonTaskBean.BodyBean listBean = response.getBody(); PolygonTaskBean.BodyBean listBean = response.getBody();
PoiEntity polygonEntity = new PoiEntity(); PoiEntity polygonEntity = new PoiEntity();
polygonEntity.setTaskId(listBean.getId()); if (listBean!=null){
polygonEntity.setName(listBean.getName()); polygonEntity.setTaskId(listBean.getId());
polygonEntity.setType(Integer.valueOf(listBean.getType())); polygonEntity.setName(listBean.getName());
String geo = listBean.getGeo(); polygonEntity.setType(Integer.valueOf(listBean.getType()));
polygonEntity.setGeoWkt(geo); String geo = listBean.getGeo();
Geometry geometry = GeometryTools.createGeometry(geo); polygonEntity.setGeoWkt(geo);
if (geometry.getGeometryType().equals("Point")) {//点 Geometry geometry = GeometryTools.createGeometry(geo);
LatLng latLng = GeometryTools.createLatLng(geo); if (geometry.getGeometryType().equals("Point")) {//点
polygonEntity.setX(latLng.longitude + ""); LatLng latLng = GeometryTools.createLatLng(geo);
polygonEntity.setY(latLng.latitude + ""); polygonEntity.setX(latLng.longitude + "");
} else if (geometry.getGeometryType().equals("LineString")) {//线 polygonEntity.setY(latLng.latitude + "");
List<LatLng> latLineString = GeometryTools.getLatLngs(geo); } else if (geometry.getGeometryType().equals("LineString")) {//线
polygonEntity.setX(latLineString.get(0).longitude + ""); List<LatLng> latLineString = GeometryTools.getLatLngs(geo);
polygonEntity.setY(latLineString.get(0).latitude + ""); polygonEntity.setX(latLineString.get(0).longitude + "");
} else if (geometry.getGeometryType().equals("Polygon")) {//面 polygonEntity.setY(latLineString.get(0).latitude + "");
List<LatLng> latPolygon = GeometryTools.getLatLngs(geo); } else if (geometry.getGeometryType().equals("Polygon")) {//面
polygonEntity.setX(latPolygon.get(0).longitude + ""); List<LatLng> latPolygon = GeometryTools.getLatLngs(geo);
polygonEntity.setY(latPolygon.get(0).latitude + ""); polygonEntity.setX(latPolygon.get(0).longitude + "");
polygonEntity.setY(latPolygon.get(0).latitude + "");
}
} }
polygonEntity.setTaskStatus(1); polygonEntity.setTaskStatus(1);
new Thread(new Runnable() { new Thread(new Runnable() {
@Override @Override
@@ -569,6 +575,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
public void run() { public void run() {
poiEntity.setTaskStatus(0); poiEntity.setTaskStatus(0);
initViewByTaskStatus(0); initViewByTaskStatus(0);
onBackPressed();
// btnGather.setVisibility(View.VISIBLE); // btnGather.setVisibility(View.VISIBLE);
// btnFinishGather.setVisibility(View.GONE); // btnFinishGather.setVisibility(View.GONE);
@@ -648,6 +655,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
// btnCancelGet.setVisibility(View.VISIBLE); // btnCancelGet.setVisibility(View.VISIBLE);
// btnFinishGather.setVisibility(View.GONE); // btnFinishGather.setVisibility(View.GONE);
// btnGather.setVisibility(View.VISIBLE); // btnGather.setVisibility(View.VISIBLE);
if (isSaver) { if (isSaver) {
Message obtain = Message.obtain(); Message obtain = Message.obtain();
obtain.what = Constant.GATHER_GET_MAP; obtain.what = Constant.GATHER_GET_MAP;
@@ -697,30 +705,33 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
if (response.getCode()==200){ if (response.getCode()==200){
TaskByNetBean.BodyBean listBean = response.getBody(); TaskByNetBean.BodyBean listBean = response.getBody();
PoiEntity poiListEntity = new PoiEntity(); PoiEntity poiListEntity = new PoiEntity();
poiListEntity.setTaskId(taskId); if (listBean!=null){
poiListEntity.setName(listBean.getName()); poiListEntity.setTaskId(taskId);
poiListEntity.setAddress(listBean.getAddress()); poiListEntity.setName(listBean.getName());
poiListEntity.setType(Integer.valueOf(listBean.getType())); poiListEntity.setAddress(listBean.getAddress());
poiListEntity.setPrecision(String.valueOf(listBean.getPrice())); poiListEntity.setType(Integer.valueOf(listBean.getType()));
poiListEntity.setIsExclusive(listBean.getIsExclusive()); poiListEntity.setPrecision(String.valueOf(listBean.getPrice()));
poiListEntity.setTaskStatus(1); poiListEntity.setIsExclusive(listBean.getIsExclusive());
poiListEntity.setIsLocalData(1); poiListEntity.setTaskStatus(1);
String geo = listBean.getGeo(); poiListEntity.setIsLocalData(1);
poiListEntity.setGeoWkt(geo); String geo = listBean.getGeo();
Geometry geometry = GeometryTools.createGeometry(geo); poiListEntity.setGeoWkt(geo);
if (geometry.getGeometryType().equals("Point")) {//点 Geometry geometry = GeometryTools.createGeometry(geo);
LatLng latLng = GeometryTools.createLatLng(geo); if (geometry.getGeometryType().equals("Point")) {//点
poiListEntity.setX(latLng.longitude + ""); LatLng latLng = GeometryTools.createLatLng(geo);
poiListEntity.setY(latLng.latitude + ""); poiListEntity.setX(latLng.longitude + "");
} else if (geometry.getGeometryType().equals("LineString")) {//线 poiListEntity.setY(latLng.latitude + "");
List<LatLng> latLineString = GeometryTools.getLatLngs(geo); } else if (geometry.getGeometryType().equals("LineString")) {//线
poiListEntity.setX(latLineString.get(0).longitude + ""); List<LatLng> latLineString = GeometryTools.getLatLngs(geo);
poiListEntity.setY(latLineString.get(0).latitude + ""); poiListEntity.setX(latLineString.get(0).longitude + "");
} else if (geometry.getGeometryType().equals("Polygon")) {//面 poiListEntity.setY(latLineString.get(0).latitude + "");
List<LatLng> latPolygon = GeometryTools.getLatLngs(geo); } else if (geometry.getGeometryType().equals("Polygon")) {//面
poiListEntity.setX(latPolygon.get(0).longitude + ""); List<LatLng> latPolygon = GeometryTools.getLatLngs(geo);
poiListEntity.setY(latPolygon.get(0).latitude + ""); poiListEntity.setX(latPolygon.get(0).longitude + "");
poiListEntity.setY(latPolygon.get(0).latitude + "");
}
} }
//获取当前位置的marker //获取当前位置的marker
senMessageMarker(poiListEntity.getType(),poiListEntity.getY(),poiListEntity.getX()); senMessageMarker(poiListEntity.getType(),poiListEntity.getY(),poiListEntity.getX());
new Thread(new Runnable() { new Thread(new Runnable() {
@@ -730,12 +741,12 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
getActivity().runOnUiThread(new Runnable() { getActivity().runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
// poiEntity.setTaskStatus(1); poiEntity.setTaskStatus(1);
// initViewByTaskStatus(1); initViewByTaskStatus(1);
btnGetTask.setVisibility(View.GONE); // btnGetTask.setVisibility(View.GONE);
btnCancelGet.setVisibility(View.VISIBLE); // btnCancelGet.setVisibility(View.VISIBLE);
btnFinishGather.setVisibility(View.VISIBLE); // btnFinishGather.setVisibility(View.VISIBLE);
btnGather.setVisibility(View.GONE); // btnGather.setVisibility(View.GONE);
if (isSaver) { if (isSaver) {
Message obtain = Message.obtain(); Message obtain = Message.obtain();
obtain.what = Constant.GATHER_GET_MAP; obtain.what = Constant.GATHER_GET_MAP;

24
app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java
View File

@@ -91,6 +91,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
private String takePhotoPath; private String takePhotoPath;
private String takePhotoPath2; private String takePhotoPath2;
private ArrayList<File> otherUploadList; private ArrayList<File> otherUploadList;
private CheckBox checkPot;
public static OtherFragment newInstance(Bundle bundle) { public static OtherFragment newInstance(Bundle bundle) {
OtherFragment fragment = new OtherFragment(); OtherFragment fragment = new OtherFragment();
@@ -175,7 +176,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
} }
}); });
CheckBox checkPot = findViewById(R.id.check_pot); checkPot = findViewById(R.id.check_pot);
checkPot.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { checkPot.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override @Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
@@ -210,9 +211,21 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
btnOtherUploading.setOnClickListener(this::onClick); btnOtherUploading.setOnClickListener(this::onClick);
//数据展示 //数据展示
initShowPoi(); initShowPoi();
//禁用所有操作控件
//disables();
} }
private void disables() {
spinnerOther.setEnabled(false);
checkPot.setEnabled(false);
editTaskName.setEnabled(false);
rlPicture.setEnabled(false);
rlPictures.setEnabled(false);
editOtherDescribe.setEnabled(false);
btnOtherLocal.setEnabled(false);
}
@Subscribe @Subscribe
public void onEvent(Message data) { public void onEvent(Message data) {
if (data.what == Constant.OTHER_WORD) { if (data.what == Constant.OTHER_WORD) {
@@ -245,7 +258,10 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
editOtherDescribe.setText(describe); editOtherDescribe.setText(describe);
} }
int station_type = showPoiEntity.getStation_type(); int station_type = showPoiEntity.getStation_type();
spinnerOther.setSelection(station_type, true);
spinnerOther.setSelection(station_type, true);
if (showPoiEntity.getPhotoInfo() != null) { if (showPoiEntity.getPhotoInfo() != null) {
for (int i = 0; i < showPoiEntity.getPhotoInfo().size(); i++) { for (int i = 0; i < showPoiEntity.getPhotoInfo().size(); i++) {
String photo = showPoiEntity.getPhotoInfo().get(i).getPhoto(); String photo = showPoiEntity.getPhotoInfo().get(i).getPhoto();
@@ -260,6 +276,9 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
} }
} }
} }
if (showPoiEntity.getTaskStatus()==3){
disables();
}
} }
@Override @Override
@@ -471,6 +490,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
otherUploadByNet(body,otherUploadList); otherUploadByNet(body,otherUploadList);
}else { }else {
Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show();
onBackPressed();
} }
} }
}); });

62
app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java
View File

@@ -81,7 +81,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
private EditText editDescribe; private EditText editDescribe;
private RelativeLayout rlPanorama, rlName, rlInternalPhotos, rlCard, rlElse; private RelativeLayout rlPanorama, rlName, rlInternalPhotos, rlCard, rlElse;
private ImageView ivPanorama, ivName, ivInternal, ivCard, ivElse; private ImageView ivPanorama, ivName, ivInternal, ivCard, ivElse;
private TextView tvExamine; public TextView tvExamine;
private EditText editNameContent, editSiteContent; private EditText editNameContent, editSiteContent;
private ArrayList<PhoneBean> poiBeans; private ArrayList<PhoneBean> poiBeans;
private Button btnSaveLocal; private Button btnSaveLocal;
@@ -97,6 +97,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
private RelativeLayout linearExist; private RelativeLayout linearExist;
private Spinner spinnerExist; private Spinner spinnerExist;
//获取的拍照图片 //获取的拍照图片
private String takePhotoPath2; private String takePhotoPath2;
private String takePhotoPath5; private String takePhotoPath5;
@@ -158,6 +159,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
onBackPressed(); onBackPressed();
} }
}); });
} }
@Override @Override
@@ -216,6 +218,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
rlElse.setOnClickListener(this::onClick); rlElse.setOnClickListener(this::onClick);
linearExist = findViewById(R.id.linear_exist); linearExist = findViewById(R.id.linear_exist);
spinnerExist = findViewById(R.id.spinner_exist); spinnerExist = findViewById(R.id.spinner_exist);
ArrayAdapter<String> adapterExist = new ArrayAdapter<>(getContext(), android.R.layout.simple_spinner_item, spinner); ArrayAdapter<String> adapterExist = new ArrayAdapter<>(getContext(), android.R.layout.simple_spinner_item, spinner);
adapterExist.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); //设置下拉列表框的下拉选项样式 adapterExist.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); //设置下拉列表框的下拉选项样式
spinnerExist.setAdapter(adapterExist); spinnerExist.setAdapter(adapterExist);
@@ -250,6 +253,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
//禁用所有可操作控件 //禁用所有可操作控件
//disables(); //disables();
} }
private void initShowPoi() { private void initShowPoi() {
@@ -282,31 +286,45 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
for (int i = 0; i < phones.length; i++) { for (int i = 0; i < phones.length; i++) {
if (i == 0) { if (i == 0) {
if (!StringUtils.isEmpty(phones[i])) { if (!StringUtils.isEmpty(phones[i])) {
String[] split = phones[i].split("-"); if (phones[i].contains("-")) { // 包含区号数据的电话
if (split[0] == phones[i]) { String[] split = phones[i].split("-");
poiBeans.add(new PhoneBean("电话*", phones[i] + "", "", R.drawable.icon_add_bg)); if (split!=null&&split.length>1) {
poiBeans.add(new PhoneBean("电话", split[1] + "", split[0] + "", R.drawable.icon_add_bg));
} else {
poiBeans.add(new PhoneBean("电话", "", "", R.drawable.icon_add_bg));
}
} else { } else {
poiBeans.add(new PhoneBean("电话*", split[1] + "", split[0] + "", R.drawable.icon_add_bg)); if (phones[i]!=null) {
poiBeans.add(new PhoneBean("电话", phones[i] + "", "", R.drawable.icon_add_bg));
} else {
poiBeans.add(new PhoneBean("电话", "", "", R.drawable.icon_add_bg));
}
} }
} }
} else { } else {
if (!StringUtils.isEmpty(phones[i])) { if (!StringUtils.isEmpty(phones[i])) {
String[] split = phones[i].split("-"); if (phones[i].contains("-")) { // 包含区号数据的电话
if (split[0] == phones[i]) { String[] split = phones[i].split("-");
poiBeans.add(new PhoneBean("", phones[i] + "", "", R.drawable.icon_del_bg)); if (split!=null&&split.length>1) {
poiBeans.add(new PhoneBean("", split[1] + "", split[0] + "", R.drawable.icon_del_bg));
} else {
poiBeans.add(new PhoneBean("", "", "", R.drawable.icon_del_bg));
}
} else { } else {
poiBeans.add(new PhoneBean("", split[1] + "", split[0] + "", R.drawable.icon_del_bg)); if (phones[i]!=null) {
poiBeans.add(new PhoneBean("", phones[i] + "", "", R.drawable.icon_del_bg));
} else {
poiBeans.add(new PhoneBean("", "", "", R.drawable.icon_del_bg));
}
} }
} }
} }
} }
} else { } else {
if (Constant.CODE == null || Constant.CODE.equals("")) { if (Constant.CODE == null || Constant.CODE.equals("")) {
poiBeans.add(new PhoneBean("电话*", "", "", R.drawable.icon_add_bg)); poiBeans.add(new PhoneBean("电话", "", "", R.drawable.icon_add_bg));
} else { } else {
poiBeans.add(new PhoneBean("电话*", "", Constant.CODE, R.drawable.icon_add_bg)); poiBeans.add(new PhoneBean("电话", "", Constant.CODE, R.drawable.icon_add_bg));
} }
} }
@@ -339,6 +357,10 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
} }
} }
} }
if (showPoiEntity.getTaskStatus() == 3){
disables();
}
} }
/** /**
@@ -377,10 +399,15 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
//禁用所有可操作性控件 //禁用所有可操作性控件
private void disables() { public void disables() {
checkBoxLife.setEnabled(false); checkBoxLife.setEnabled(false);
editNameContent.setEnabled(false); editNameContent.setEnabled(false);
tvExamine.setEnabled(false); tvExamine.setEnabled(false);
rlPanorama.setEnabled(false);//禁用拍照全景
rlName.setEnabled(false);
rlCard.setEnabled(false);
rlInternalPhotos.setEnabled(false);
rlElse.setEnabled(false);
editSiteContent.setEnabled(false); editSiteContent.setEnabled(false);
linearContact.setEnabled(false); linearContact.setEnabled(false);
ivPanorama.setEnabled(false); ivPanorama.setEnabled(false);
@@ -437,6 +464,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
if (tagCard != null) { if (tagCard != null) {
poiPicList.add(new File(tagCard)); poiPicList.add(new File(tagCard));
} }
new Thread(new Runnable() { new Thread(new Runnable() {
@Override @Override
public void run() { public void run() {
@@ -529,7 +557,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
} }
String tagName = (String) ivName.getTag(); String tagName = (String) ivName.getTag();
if (tagName == null) { if (tagName == null) {
Toast.makeText(getActivity(), "请拍照 充电桩编码", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请拍照 名称", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
infoPhoto.add(new Info(tagName)); infoPhoto.add(new Info(tagName));
@@ -569,7 +597,6 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
}); });
} }
}).start(); }).start();
// onBackPressed();
} else { } else {
Toast.makeText(getActivity(), "没有申请权限，请手动申请", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "没有申请权限，请手动申请", Toast.LENGTH_SHORT).show();
} }
@@ -658,11 +685,14 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
getActivity().runOnUiThread(new Runnable() { getActivity().runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
if (isLocal) { if (isLocal) {
poiUploadByNetWork(body, poiPicList);//上传 poiUploadByNetWork(body, poiPicList);//上传
} else { } else {
Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show();
onBackPressed();
} }
} }
}); });
} }

9
app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java
View File

@@ -76,7 +76,7 @@ import java.util.List;
public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClickListener { public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClickListener {
private TextView tvPictures; private TextView tvPictures;
private TextView etRoadName; private EditText etRoadName;
private ImageView ivPoiVideoPicture; private ImageView ivPoiVideoPicture;
private RadioButton rbCar; private RadioButton rbCar;
private RadioButton rbBicycle; private RadioButton rbBicycle;
@@ -145,7 +145,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
poiDao = poiDatabase.getPoiDao(); poiDao = poiDatabase.getPoiDao();
tvPictures = (TextView) findViewById(R.id.tv_pictures); tvPictures = (TextView) findViewById(R.id.tv_pictures);
tvPictures.setOnClickListener(this::onClick); tvPictures.setOnClickListener(this::onClick);
etRoadName = (TextView) findViewById(R.id.et_poi_video_name); etRoadName = (EditText) findViewById(R.id.et_poi_video_name);
ivPoiVideoPicture = (ImageView) findViewById(R.id.iv_poi_video_picture); ivPoiVideoPicture = (ImageView) findViewById(R.id.iv_poi_video_picture);
rbCar = (RadioButton) findViewById(R.id.rb_car); rbCar = (RadioButton) findViewById(R.id.rb_car);
rbBicycle = (RadioButton) findViewById(R.id.rb_bicycle); rbBicycle = (RadioButton) findViewById(R.id.rb_bicycle);
@@ -225,6 +225,9 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
} }
} }
} }
if (showPoiEntity.getTaskStatus() == 3){
disables();
}
} }
private void disables() { private void disables() {
@@ -341,6 +344,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
@Override @Override
public void run() { public void run() {
etRoadName.setText(sb); etRoadName.setText(sb);
etRoadName.setEnabled(false);
} }
}); });
} }
@@ -508,6 +512,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
poiVideoUpload(poiVideoBody,fileZip); poiVideoUpload(poiVideoBody,fileZip);
}else { }else {
Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show();
onBackPressed();
} }
} }
}); });

11
app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java
View File

@@ -201,17 +201,24 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
} }
} }
} }
if (showPoiEntity.getTaskStatus() == 3){
disables();
}
} }
//禁用控件 //禁用控件
private void disables() throws JSONException { private void disables() {
etRoadName.setEnabled(false); etRoadName.setEnabled(false);
rgType.setEnabled(false); rgType.setEnabled(false);
ivRoadPicture.setEnabled(false); ivRoadPicture.setEnabled(false);
tvPictures.setEnabled(false); tvPictures.setEnabled(false);
etDesc.setEnabled(false); etDesc.setEnabled(false);
btnRoadSave.setEnabled(false); btnRoadSave.setEnabled(false);
rbCar.setEnabled(false);
rbBicycle.setEnabled(false);
rbManual.setEnabled(false);
rbWalking.setEnabled(false);
} }
@Override @Override
@@ -319,6 +326,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
@Override @Override
public void run() { public void run() {
etRoadName.setText(sb); etRoadName.setText(sb);
etRoadName.setEnabled(false);
} }
}); });
} }
@@ -491,6 +499,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
} }
}).start(); }).start();
Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show();
onBackPressed();
} }
@Override @Override

104
app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
View File

@@ -132,11 +132,11 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
@Override @Override
protected void initView() { protected void initView() {
super.initView(); super.initView();
bitmapDescriptor1 = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_bg); bitmapDescriptor1 = BitmapDescriptorFactory.fromResource(R.mipmap.datouzhen);
bitmapDescriptor2 = BitmapDescriptorFactory.fromResource(R.drawable.poi_video_bg); bitmapDescriptor2 = BitmapDescriptorFactory.fromResource(R.mipmap.datouzhen);
bitmapDescriptor3 = BitmapDescriptorFactory.fromResource(R.drawable.marker_road_bg); bitmapDescriptor3 = BitmapDescriptorFactory.fromResource(R.mipmap.datouzhen);
bitmapDescriptor4 = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge_bg); bitmapDescriptor4 = BitmapDescriptorFactory.fromResource(R.mipmap.datouzhen);
bitmapDescriptor5 = BitmapDescriptorFactory.fromResource(R.drawable.marker_other_bg); bitmapDescriptor5 = BitmapDescriptorFactory.fromResource(R.mipmap.datouzhen);
EventBus.getDefault().register(this); EventBus.getDefault().register(this);
//fragment 管理器 //fragment 管理器
@@ -156,13 +156,14 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
ivMessage.setOnClickListener(this::onClick); ivMessage.setOnClickListener(this::onClick);
treasureMap = (MapView) findViewById(R.id.treasure_map); treasureMap = (MapView) findViewById(R.id.treasure_map);
tencentMap = treasureMap.getMap(); tencentMap = treasureMap.getMap();
// if (getClass().getCanonicalName().equals("PioFragment")){ // if (getClass().getCanonicalName().equals("PioFragment")){
// ivMessage.setVisibility(View.VISIBLE); // ivMessage.setVisibility(View.VISIBLE);
// }else { // }else {
// ivMessage.setVisibility(View.GONE); // ivMessage.setVisibility(View.GONE);
// } // }
cbMapType = (CheckBox) findViewById(R.id.cb_map_type); cbMapType = (CheckBox) findViewById(R.id.cb_map_type);
cbFootType = (CheckBox) findViewById(R.id.cb_foot_type);
// sliding_layout.setScrollableViewHelper(new NestedScrollableViewHelper()); // sliding_layout.setScrollableViewHelper(new NestedScrollableViewHelper());
//地图转换 //地图转换
cbMapType.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { cbMapType.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@@ -219,10 +220,13 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
case 1: case 1:
PoiFragment poiFragment = PoiFragment.newInstance(bundle); PoiFragment poiFragment = PoiFragment.newInstance(bundle);
showSlidingFragment(poiFragment); showSlidingFragment(poiFragment);
break; break;
case 2: case 2:
ChargingStationFragment chargingStationFragment = ChargingStationFragment.newInstance(bundle); ChargingStationFragment chargingStationFragment = ChargingStationFragment.newInstance(bundle);
showSlidingFragment(chargingStationFragment); showSlidingFragment(chargingStationFragment);
break; break;
case 3: case 3:
PoiVideoFragment poiVideoFragment = PoiVideoFragment.newInstance(bundle); PoiVideoFragment poiVideoFragment = PoiVideoFragment.newInstance(bundle);
@@ -242,32 +246,35 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
} }
} else { } else {
JobSearchBean.BodyBean.ListBean listBean = (JobSearchBean.BodyBean.ListBean) marker.getTag(); JobSearchBean.BodyBean.ListBean listBean = (JobSearchBean.BodyBean.ListBean) marker.getTag();
PoiEntity poiListEntity = new PoiEntity(); if (listBean != null) {
poiListEntity.setTaskId(listBean.getId()); PoiEntity poiListEntity = new PoiEntity();
poiListEntity.setGeoWkt(listBean.getGeo()); poiListEntity.setTaskId(listBean.getId());
poiListEntity.setName(listBean.getName()); poiListEntity.setGeoWkt(listBean.getGeo());
poiListEntity.setAddress(listBean.getAddress()); poiListEntity.setName(listBean.getName());
poiListEntity.setTelPhone(listBean.getTelephone() + ""); poiListEntity.setAddress(listBean.getAddress());
poiListEntity.setPrecision(listBean.getPrice()); poiListEntity.setTelPhone(listBean.getTelephone() + "");
poiListEntity.setDist(listBean.getDist()); poiListEntity.setPrecision(listBean.getPrice());
poiListEntity.setType(Integer.valueOf(listBean.getType())); poiListEntity.setDist(listBean.getDist());
String geo = listBean.getGeo(); poiListEntity.setType(Integer.valueOf(listBean.getType()));
poiListEntity.setGeoWkt(geo); String geo = listBean.getGeo();
Geometry geometry = GeometryTools.createGeometry(geo); poiListEntity.setGeoWkt(geo);
if (geometry.getGeometryType().equals("Point")) {//点 Geometry geometry = GeometryTools.createGeometry(geo);
LatLng latLng = GeometryTools.createLatLng(geo); if (geometry.getGeometryType().equals("Point")) {//点
poiListEntity.setX(latLng.longitude + ""); LatLng latLng = GeometryTools.createLatLng(geo);
poiListEntity.setY(latLng.latitude + ""); poiListEntity.setX(latLng.longitude + "");
} else if (geometry.getGeometryType().equals("LineString")) {//线 poiListEntity.setY(latLng.latitude + "");
List<LatLng> latLineString = GeometryTools.getLatLngs(geo); } else if (geometry.getGeometryType().equals("LineString")) {//线
poiListEntity.setX(latLineString.get(0).longitude + ""); List<LatLng> latLineString = GeometryTools.getLatLngs(geo);
poiListEntity.setY(latLineString.get(0).latitude + ""); poiListEntity.setX(latLineString.get(0).longitude + "");
} else if (geometry.getGeometryType().equals("Polygon")) {//面 poiListEntity.setY(latLineString.get(0).latitude + "");
List<LatLng> latPolygon = GeometryTools.getLatLngs(geo); } else if (geometry.getGeometryType().equals("Polygon")) {//面
poiListEntity.setX(latPolygon.get(0).longitude + ""); List<LatLng> latPolygon = GeometryTools.getLatLngs(geo);
poiListEntity.setY(latPolygon.get(0).latitude + ""); poiListEntity.setX(latPolygon.get(0).longitude + "");
poiListEntity.setY(latPolygon.get(0).latitude + "");
}
initMarker(poiListEntity);
} }
initMarker(poiListEntity);
} }
return false; return false;
} }
@@ -520,6 +527,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
} }
switch (Integer.valueOf(poiEntity.getType())) { switch (Integer.valueOf(poiEntity.getType())) {
case 1://poi case 1://poi
BitmapDescriptor poiDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_have_bg); BitmapDescriptor poiDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_have_bg);
Marker poiMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiDescriptor).alpha(0.9f) Marker poiMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiDescriptor).alpha(0.9f)
.flat(true) .flat(true)
@@ -528,6 +536,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
poiMarker.setTitle(poiEntity.getName() + ""); poiMarker.setTitle(poiEntity.getName() + "");
poiMarker.setTag(poiEntity); poiMarker.setTag(poiEntity);
removablesLocality.add(poiMarker); removablesLocality.add(poiMarker);
break; break;
case 2://充电站 case 2://充电站
BitmapDescriptor chargeDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge_have_bg); BitmapDescriptor chargeDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge_have_bg);
@@ -716,14 +726,14 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
FilterFragment filterFragment = (FilterFragment) supportFragmentManager.findFragmentByTag(FilterFragment.class.getName()); FilterFragment filterFragment = (FilterFragment) supportFragmentManager.findFragmentByTag(FilterFragment.class.getName());
if (filterFragment != null) { if (filterFragment != null) {
fragmentTransaction.remove(filterFragment); fragmentTransaction.remove(filterFragment);
fragmentTransaction.commit(); // fragmentTransaction.commit();
} }
} else if (data.what == Constant.GATHER_GET) { //筛选item 点击开始采集 } else if (data.what == Constant.GATHER_GET) { //筛选item 点击开始采集
// 如果当前fragment是筛选，则移除该fragment // 如果当前fragment是筛选，则移除该fragment
FilterFragment filterFragment = (FilterFragment) supportFragmentManager.findFragmentByTag(FilterFragment.class.getName()); FilterFragment filterFragment = (FilterFragment) supportFragmentManager.findFragmentByTag(FilterFragment.class.getName());
if (filterFragment != null) { if (filterFragment != null) {
fragmentTransaction.remove(filterFragment); fragmentTransaction.remove(filterFragment);
fragmentTransaction.commit(); //fragmentTransaction.commit();
} }
PoiEntity poiEntity = (PoiEntity) data.obj; PoiEntity poiEntity = (PoiEntity) data.obj;
@@ -754,6 +764,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
} }
frameLayout.setVisibility(View.GONE); frameLayout.setVisibility(View.GONE);
fragmentTransaction.remove(gatherGetFragment); fragmentTransaction.remove(gatherGetFragment);
fragmentTransaction.commit();
} else if (data.what == Constant.GATHER_GET_MAP) { //地图界面点击采集 点击开始采集 } else if (data.what == Constant.GATHER_GET_MAP) { //地图界面点击采集 点击开始采集
PoiEntity poiEntity = (PoiEntity) data.obj; PoiEntity poiEntity = (PoiEntity) data.obj;
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
@@ -810,7 +821,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
if ((boolean) data.obj) { if ((boolean) data.obj) {
initCheckedMarker(Constant.OTHER_WORD); initCheckedMarker(Constant.OTHER_WORD);
} }
} else if (data.what == Constant.TREASURE_FRAGMENT) { } else if (data.what == Constant.TREASURE_FRAGMENT) {//抽屉界面的展示和隐藏
if ((boolean) data.obj == true) { if ((boolean) data.obj == true) {
frameLayout.setVisibility(View.GONE); frameLayout.setVisibility(View.GONE);
sliding_layout.setPanelHeight(0); sliding_layout.setPanelHeight(0);
@@ -819,17 +830,18 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
markerPoi.remove(); markerPoi.remove();
} }
} }
} else if (data.what == Constant.MAIN_BUTTON_VISIABLE) { } else if (data.what == Constant.MAIN_BUTTON_VISIABLE) {//控制主界面各个按钮显隐状态的what值
setMainButtonVisiable((Integer) data.obj); setMainButtonVisiable((Integer) data.obj);
} else if (data.what == Constant.MAIN_HEADER) { } else if (data.what == Constant.MAIN_HEADER) {// 控制主界面各个header
View view = (View) data.obj; View view = (View) data.obj;
initHeader(view); initHeader(view);
} else if (data.what == Constant.MAIN_REMOVE) { } else if (data.what == Constant.MAIN_REMOVE) {//// 控制主界面各个header移除
if ((boolean) data.obj) { if ((boolean) data.obj) {
dragView.removeAllViews(); dragView.removeAllViews();
} }
} else if (data.what == Constant.GATHER_GET_RETURN) {//item 点击页面的返回事件的处理 } else if (data.what == Constant.GATHER_GET_RETURN) {//item 点击页面的返回事件的处理
if ((boolean) data.obj) { if ((boolean) data.obj) {
frameLayout.setVisibility(View.GONE); frameLayout.setVisibility(View.GONE);
sliding_layout.setPanelHeight(1000); sliding_layout.setPanelHeight(1000);
sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED); sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
@@ -837,6 +849,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
setMainButtonVisiable(View.VISIBLE); setMainButtonVisiable(View.VISIBLE);
frameLayout.setVisibility(View.GONE); frameLayout.setVisibility(View.GONE);
fragmentTransaction.remove(gatherGetFragment); fragmentTransaction.remove(gatherGetFragment);
} }
} else if (data.what == Constant.CHARGING_STATION) {//充电站的充电桩 } else if (data.what == Constant.CHARGING_STATION) {//充电站的充电桩
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
@@ -845,7 +858,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
if (chargingPileEntity != null) { if (chargingPileEntity != null) {
bundle.putSerializable("chargingPileEntity", chargingPileEntity); bundle.putSerializable("chargingPileEntity", chargingPileEntity);
} }
BitmapDescriptor pileDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_pile_bg); BitmapDescriptor pileDescriptor = BitmapDescriptorFactory.fromResource(R.mipmap.datouzhen);
LatLng mapCenterPoint = getMapCenterPoint(); LatLng mapCenterPoint = getMapCenterPoint();
markerPoi = tencentMap.addMarker(new MarkerOptions(mapCenterPoint).icon(pileDescriptor)); markerPoi = tencentMap.addMarker(new MarkerOptions(mapCenterPoint).icon(pileDescriptor));
ChargingPileFragment chargingPileFragment = ChargingPileFragment.newInstance(bundle); ChargingPileFragment chargingPileFragment = ChargingPileFragment.newInstance(bundle);
@@ -892,9 +905,9 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
ivLocation.setVisibility(visiable); ivLocation.setVisibility(visiable);
ivRefish.setVisibility(visiable); ivRefish.setVisibility(visiable);
cbMapType.setVisibility(visiable); cbMapType.setVisibility(visiable);
cbFootType.setVisibility(visiable);
ivSubmit.setVisibility(visiable); ivSubmit.setVisibility(visiable);
ivFilter.setVisibility(visiable); ivFilter.setVisibility(visiable);
ivMessage.setVisibility(visiable);
} }
private void initFilterMarker(List<PoiEntity> poiEntities) { private void initFilterMarker(List<PoiEntity> poiEntities) {
@@ -919,7 +932,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
screenPosition = tencentMap.getProjection().toScreenLocation(latLng); screenPosition = tencentMap.getProjection().toScreenLocation(latLng);
sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED); sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
//创建Marker对象之前，设置属性 //创建Marker对象之前，设置属性
if (markerPoi!=null){ if (markerPoi != null) {
markerPoi.setFixingPoint(screenPosition.x, screenPosition.y); markerPoi.setFixingPoint(screenPosition.x, screenPosition.y);
} }
@@ -1098,7 +1111,9 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
public void run() { public void run() {
showPoiMarkerByType(1, mapCenterPoint); showPoiMarkerByType(1, mapCenterPoint);
PoiFragment poiFragment = PoiFragment.newInstance(bundle); PoiFragment poiFragment = PoiFragment.newInstance(bundle);
showSlidingFragment(poiFragment); showSlidingFragment(poiFragment);
ivMessage.setVisibility(View.GONE);
} }
}); });
} }
@@ -1117,6 +1132,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
showPoiMarkerByType(2, mapCenterPoint); showPoiMarkerByType(2, mapCenterPoint);
PoiVideoFragment poiVideoFragment = PoiVideoFragment.newInstance(bundle); PoiVideoFragment poiVideoFragment = PoiVideoFragment.newInstance(bundle);
showSlidingFragment(poiVideoFragment); showSlidingFragment(poiVideoFragment);
ivMessage.setVisibility(View.GONE);
} }
}); });
} }
@@ -1197,13 +1213,13 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
private void showPoiMarkerByType(int type, LatLng latLng) { private void showPoiMarkerByType(int type, LatLng latLng) {
if (type == 1) { if (type == 1) {
markerPoi = tencentMap.addMarker(new MarkerOptions(latLng).icon(bitmapDescriptor1)); markerPoi = tencentMap.addMarker(new MarkerOptions(latLng).icon(bitmapDescriptor1));
}else if (type == 2){ } else if (type == 2) {
markerPoi = tencentMap.addMarker(new MarkerOptions(latLng).icon(bitmapDescriptor2)); markerPoi = tencentMap.addMarker(new MarkerOptions(latLng).icon(bitmapDescriptor2));
}else if (type == 3){ } else if (type == 3) {
markerPoi = tencentMap.addMarker(new MarkerOptions(latLng).icon(bitmapDescriptor3)); markerPoi = tencentMap.addMarker(new MarkerOptions(latLng).icon(bitmapDescriptor3));
}else if (type == 4){ } else if (type == 4) {
markerPoi = tencentMap.addMarker(new MarkerOptions(latLng).icon(bitmapDescriptor4)); markerPoi = tencentMap.addMarker(new MarkerOptions(latLng).icon(bitmapDescriptor4));
}else if (type == 5){ } else if (type == 5) {
markerPoi = tencentMap.addMarker(new MarkerOptions(latLng).icon(bitmapDescriptor5)); markerPoi = tencentMap.addMarker(new MarkerOptions(latLng).icon(bitmapDescriptor5));
} }

8
app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java
View File

@@ -260,8 +260,8 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic
takePhotoPath2 = PhotoPathUtil.getTakePhotoPath(data, "a", ""); takePhotoPath2 = PhotoPathUtil.getTakePhotoPath(data, "a", "");
ivAttestation2.setTag(takePhotoPath2); ivAttestation2.setTag(takePhotoPath2);
ivAttestation2.setImageBitmap(bitmap);//显示图像 ivAttestation2.setImageBitmap(bitmap);//显示图像
ivHera1.setVisibility(View.GONE); ivHera2.setVisibility(View.GONE);
tvCard1.setVisibility(View.GONE); tvCard2.setVisibility(View.GONE);
} }
} }
if (requestCode == 300 && resultCode == RESULT_OK) { if (requestCode == 300 && resultCode == RESULT_OK) {
@@ -284,8 +284,8 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic
takePhotoPath3 = PhotoPathUtil.getTakePhotoPath(data, "a", ""); takePhotoPath3 = PhotoPathUtil.getTakePhotoPath(data, "a", "");
ivAttestation3.setTag(takePhotoPath3); ivAttestation3.setTag(takePhotoPath3);
ivAttestation3.setImageBitmap(bitmap);//显示图像 ivAttestation3.setImageBitmap(bitmap);//显示图像
ivHera1.setVisibility(View.GONE); ivHera3.setVisibility(View.GONE);
tvCard1.setVisibility(View.GONE); tvCard3.setVisibility(View.GONE);
} }
} }
} }

8
app/src/main/res/color/test_color_selector.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:color="#ff0000ff"/> <!-- pressed 看下的颜色-->
<item android:state_focused="true"
android:color="#D8D7D7"/> <!-- focused -->
<item android:color="#ff000000"/> <!-- default 默认颜色 -->
</selector>

BIN
app/src/main/res/drawable/bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 186 KiB

8
app/src/main/res/drawable/color_backgroud.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:color="#ffff0000"/> <!-- pressed -->
<item android:state_focused="true"
android:color="#ff0000ff"/> <!-- focused -->
<item android:color="#ff000000"/> <!-- default -->
</selector>

BIN
app/src/main/res/drawable/iv_message.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

2
app/src/main/res/layout/activity_home.xml
View File

@@ -22,7 +22,7 @@
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
app:tabRippleColor="@android:color/transparent" app:tabRippleColor="@android:color/transparent"
app:tabIndicatorHeight="0dp" app:tabIndicatorHeight="0dp"
app:tabTextColor="#F0686666" app:tabTextColor="#F08A8888"
app:tabSelectedTextColor="#000000" app:tabSelectedTextColor="#000000"
android:background="#ffff" android:background="#ffff"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"

3
app/src/main/res/layout/activity_login.xml
View File

@@ -4,7 +4,8 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@mipmap/bg" app:layout_heightPercent="100%"
android:background="@drawable/bg"
tools:context="activity.LoginActivity"> tools:context="activity.LoginActivity">
<TextView <TextView

2
app/src/main/res/layout/activity_picture.xml
View File

@@ -20,7 +20,7 @@
<com.tencent.tencentmap.mapsdk.maps.TextureMapView <com.tencent.tencentmap.mapsdk.maps.TextureMapView
android:id="@+id/iv_map" android:id="@+id/iv_map"
android:layout_width="200dp" android:layout_width="200dp"
android:layout_height="100dp" android:layout_height="157dp"
app:layout_constraintHeight_default="percent" app:layout_constraintHeight_default="percent"
app:layout_constraintHeight_percent="0.4" app:layout_constraintHeight_percent="0.4"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"

14
app/src/main/res/layout/charging_pile_fragment.xml
View File

@@ -17,6 +17,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="01.基本资料填写" android:text="01.基本资料填写"
android:textSize="15sp"
android:textColor="@color/black"
android:layout_margin="10dp" android:layout_margin="10dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@@ -114,7 +116,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="开放状态" android:text="开放状态"
android:textSize="18sp" android:textSize="16sp"
android:textStyle="normal" android:textStyle="normal"
android:textColor="#333" android:textColor="#333"
android:layout_margin="10dp" android:layout_margin="10dp"
@@ -179,7 +181,7 @@
<CheckBox <CheckBox
android:id="@+id/check_button5" android:id="@+id/check_button5"
android:layout_width="250dp" android:layout_width="250dp"
android:layout_height="80dp" android:layout_height="40dp"
android:text="对除环卫,公交,出租,品牌,之外的其他 特种车辆开放" android:text="对除环卫,公交,出租,品牌,之外的其他 特种车辆开放"
/> />
</LinearLayout> </LinearLayout>
@@ -286,6 +288,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="02.拍照" android:text="02.拍照"
android:textSize="15sp"
android:textColor="@color/black"
android:layout_margin="10dp" android:layout_margin="10dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/linear_type" /> app:layout_constraintTop_toBottomOf="@id/linear_type" />
@@ -737,6 +741,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="03.描述" android:text="03.描述"
android:textSize="15sp"
android:textColor="@color/black"
android:layout_margin="10dp" android:layout_margin="10dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/linear_photograph" /> app:layout_constraintTop_toBottomOf="@id/linear_photograph" />
@@ -755,9 +761,11 @@
android:id="@+id/edit_describe" android:id="@+id/edit_describe"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingBottom="30dp" android:paddingBottom="40dp"
android:layout_margin="2dp" android:layout_margin="2dp"
android:gravity="top" android:gravity="top"
android:paddingTop="10dp"
android:paddingLeft="10dp"
android:focusable="true" android:focusable="true"
android:focusableInTouchMode="true" android:focusableInTouchMode="true"
android:background="@color/white" android:background="@color/white"

2
app/src/main/res/layout/charging_pile_header.xml
View File

@@ -15,7 +15,7 @@
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<ImageView <ImageView
android:id="@+id/iv_final" android:id="@+id/iv_charging_pile_final"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="45dp" android:layout_height="45dp"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"

44
app/src/main/res/layout/charging_station_fragment.xml
View File

@@ -18,6 +18,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="01.基本资料填写" android:text="01.基本资料填写"
android:textSize="15sp"
android:textColor="@color/black"
android:layout_margin="10dp" android:layout_margin="10dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@@ -114,7 +116,7 @@
android:id="@+id/tv_examine" android:id="@+id/tv_examine"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="查看" android:text="查重"
android:layout_margin="4dp" android:layout_margin="4dp"
android:textColor="@color/design_default_color_primary" android:textColor="@color/design_default_color_primary"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
@@ -195,7 +197,7 @@
android:id="@+id/tv_type" android:id="@+id/tv_type"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:text="类型*" android:text="类型"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:textColor="#333" android:textColor="#333"
@@ -273,7 +275,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="02.拍照" android:text="02.拍照"
android:textSize="15sp"
android:layout_margin="10dp" android:layout_margin="10dp"
android:textColor="@color/black"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/linear_exist" /> app:layout_constraintTop_toBottomOf="@id/linear_exist" />
<LinearLayout <LinearLayout
@@ -299,7 +303,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:background="#03A9F4" android:background="#03A9F4"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:layout_marginBottom="10dp"> android:layout_marginBottom="10dp">
<ImageView <ImageView
android:id="@+id/image_panorama" android:id="@+id/image_panorama"
@@ -333,7 +337,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:background="#03A9F4" android:background="#03A9F4"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:layout_marginBottom="10dp"> android:layout_marginBottom="10dp">
<ImageView <ImageView
android:id="@+id/image_name" android:id="@+id/image_name"
@@ -367,7 +371,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:background="#03A9F4" android:background="#03A9F4"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:layout_marginBottom="10dp"> android:layout_marginBottom="10dp">
<ImageView <ImageView
android:id="@+id/image_internal" android:id="@+id/image_internal"
@@ -407,7 +411,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:background="#03A9F4" android:background="#03A9F4"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:layout_marginBottom="10dp"> android:layout_marginBottom="10dp">
<ImageView <ImageView
android:id="@+id/image_else" android:id="@+id/image_else"
@@ -441,7 +445,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:background="#03A9F4" android:background="#03A9F4"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:layout_marginBottom="10dp"> android:layout_marginBottom="10dp">
<ImageView <ImageView
android:id="@+id/image_scutcheon" android:id="@+id/image_scutcheon"
@@ -473,7 +477,7 @@
android:layout_weight="1" android:layout_weight="1"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:layout_marginBottom="10dp"> android:layout_marginBottom="10dp">
</RelativeLayout> </RelativeLayout>
@@ -486,6 +490,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="10dp" android:layout_margin="10dp"
android:text="03.添加" android:text="03.添加"
android:textSize="15sp"
android:textColor="@color/black"
app:layout_constraintBottom_toTopOf="@+id/recycler_station" app:layout_constraintBottom_toTopOf="@+id/recycler_station"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/linear_photograph" /> app:layout_constraintTop_toBottomOf="@id/linear_photograph" />
@@ -503,14 +509,17 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="10dp" android:layout_margin="10dp"
android:background="@drawable/underline" android:padding="3dp"
android:orientation="vertical" android:background="@drawable/shape_red_radius_bg"
app:layout_constraintEnd_toEndOf="parent" android:orientation="horizontal"
app:layout_constraintTop_toBottomOf="@+id/linear_photograph"> app:layout_constraintTop_toTopOf="@+id/tv_03"
app:layout_constraintBottom_toBottomOf="@+id/tv_03"
app:layout_constraintRight_toRightOf="parent"
>
<ImageView <ImageView
android:layout_width="30dp" android:layout_width="20dp"
android:layout_height="30dp" android:layout_height="20dp"
android:layout_gravity="center" android:layout_gravity="center"
android:background="@drawable/plus" /> android:background="@drawable/plus" />
@@ -518,6 +527,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:textSize="12sp"
android:textColor="@color/white"
android:layout_marginRight="10dp"
android:text="添加桩" /> android:text="添加桩" />
</LinearLayout> </LinearLayout>
<TextView <TextView
@@ -525,6 +537,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="04.描述" android:text="04.描述"
android:textColor="@color/black"
android:textSize="15sp"
android:layout_margin="10dp" android:layout_margin="10dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/recycler_station" /> app:layout_constraintTop_toBottomOf="@id/recycler_station" />
@@ -550,6 +564,8 @@
android:focusableInTouchMode="true" android:focusableInTouchMode="true"
android:background="@color/white" android:background="@color/white"
android:hint="任务描述" android:hint="任务描述"
android:paddingTop="10dp"
android:paddingLeft="10dp"
android:textSize="15sp" android:textSize="15sp"
/> />

2
app/src/main/res/layout/charging_station_header.xml
View File

@@ -15,7 +15,7 @@
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<ImageView <ImageView
android:id="@+id/iv_final" android:id="@+id/iv_charging_station_final"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="45dp" android:layout_height="45dp"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"

2
app/src/main/res/layout/filter_header.xml
View File

@@ -16,7 +16,7 @@
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<ImageView <ImageView
android:id="@+id/iv_final" android:id="@+id/iv_filter_final"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="45dp" android:layout_height="45dp"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"

1
app/src/main/res/layout/fragment_filter.xml
View File

@@ -130,7 +130,6 @@
android:background="@drawable/ic_baseline_arrow_forward" android:background="@drawable/ic_baseline_arrow_forward"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/textView2"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layout/fragment_forget_paw.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@mipmap/bg" android:background="@drawable/bg"
tools:context=".fragment.ForgetPawFragment"> tools:context=".fragment.ForgetPawFragment">
<LinearLayout <LinearLayout

3
app/src/main/res/layout/fragment_gather_get.xml
View File

@@ -13,8 +13,7 @@
android:text="众包录像 测试3" android:text="众包录像 测试3"
android:textColor="#333" android:textColor="#333"
android:layout_margin="20dp" android:layout_margin="20dp"
android:textSize="20sp" android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />

41
app/src/main/res/layout/fragment_other.xml
View File

@@ -250,40 +250,43 @@
android:id="@+id/tv_03" android:id="@+id/tv_03"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="10dp" android:layout_marginTop="10dp"
android:text="04概述" android:text="04概述"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintLeft_toLeftOf="@+id/tv_other_picture"
app:layout_constraintTop_toBottomOf="@id/ll_image_picture" /> app:layout_constraintTop_toBottomOf="@id/ll_image_picture" />
<LinearLayout <!-- <LinearLayout-->
android:id="@+id/linear_describe" <!-- android:id="@+id/linear_describe"-->
android:layout_width="match_parent" <!-- android:layout_width="match_parent"-->
android:layout_height="wrap_content" <!-- android:layout_height="wrap_content"-->
android:layout_margin="10dp" <!-- -->
android:layout_marginStart="10dp" <!-- -->
android:layout_marginEnd="10dp" <!-- android:layout_marginEnd="10dp"-->
android:background="@drawable/underline" <!-- -->
app:layout_constraintEnd_toEndOf="parent" <!-- app:layout_constraintEnd_toEndOf="parent"-->
app:layout_constraintStart_toStartOf="parent" <!-- app:layout_constraintStart_toStartOf="parent"-->
app:layout_constraintTop_toBottomOf="@id/tv_03"> <!-- app:layout_constraintTop_toBottomOf="@id/tv_03">-->
<EditText <EditText
android:id="@+id/edit_other_describe" android:id="@+id/edit_other_describe"
android:layout_width="match_parent" android:layout_width="320dp"
android:layout_height="match_parent" android:layout_height="100dp"
android:layout_margin="2dp" android:layout_marginTop="10dp"
android:background="@color/white" android:background="@drawable/underline"
android:focusable="true" android:focusable="true"
android:focusableInTouchMode="true" android:focusableInTouchMode="true"
android:gravity="top" android:gravity="top"
android:hint="任务描述" android:hint="任务描述"
android:paddingTop="10dp"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingBottom="30dp" android:paddingBottom="30dp"
app:layout_constraintLeft_toLeftOf="@+id/tv_03"
app:layout_constraintTop_toBottomOf="@+id/tv_03"
android:textSize="15sp" android:textSize="15sp"
/> />
</LinearLayout> <!-- </LinearLayout>-->
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -296,7 +299,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/linear_describe"> app:layout_constraintTop_toBottomOf="@id/edit_other_describe">
<Button <Button
android:id="@+id/btn_other_local" android:id="@+id/btn_other_local"

2
app/src/main/res/layout/fragment_register.xml
View File

@@ -4,7 +4,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@mipmap/bg" android:background="@drawable/bg"
tools:context=".fragment.RegisterFragment"> tools:context=".fragment.RegisterFragment">
<LinearLayout <LinearLayout

6
app/src/main/res/layout/fragment_road.xml
View File

@@ -75,6 +75,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:layout_marginLeft="2dp"
android:orientation="horizontal" android:orientation="horizontal"
app:layout_constraintTop_toBottomOf="@id/tv_mode"> app:layout_constraintTop_toBottomOf="@id/tv_mode">
@@ -174,10 +175,11 @@
android:id="@+id/et_desc" android:id="@+id/et_desc"
android:layout_width="320dp" android:layout_width="320dp"
android:layout_height="100dp" android:layout_height="100dp"
android:layout_gravity="center_horizontal" android:layout_marginLeft="10dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:background="@drawable/road_shape" android:background="@drawable/road_shape"
android:hint=" 任务描述" android:hint="任务描述"
android:paddingLeft="10dp"
android:paddingBottom="50dp" /> android:paddingBottom="50dp" />
</LinearLayout> </LinearLayout>

2
app/src/main/res/layout/fragment_task_ex_web.xml
View File

@@ -8,6 +8,6 @@
<ImageView <ImageView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:src="@mipmap/bg"/> android:src="@drawable/bg"/>
</LinearLayout> </LinearLayout>

24
app/src/main/res/layout/item_filter.xml
View File

@@ -8,14 +8,14 @@
<TextView <TextView
android:id="@+id/tv_name" android:id="@+id/tv_name"
android:layout_width="wrap_content" android:layout_width="300dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="20dp" android:layout_margin="20dp"
android:text="测试彼此" android:text="测试彼此"
android:textColor="#333" android:textColor="#333"
android:textSize="18sp" android:textSize="15sp"
android:maxLength="10"
android:lines="1" android:lines="1"
app:layout_constraintRight_toLeftOf="@+id/tv_money"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@@ -23,15 +23,15 @@
android:id="@+id/tv_form" android:id="@+id/tv_form"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="10dp"
android:text="道路" android:text="道路"
android:padding="5dp" android:padding="5dp"
android:textColor="#00BCD4" android:textColor="#00BCD4"
android:background="@drawable/underline" android:background="@drawable/underline"
android:textSize="15sp" android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="@+id/tv_name" android:layout_marginTop="5dp"
app:layout_constraintStart_toEndOf="@+id/tv_name" android:layout_marginLeft="20dp"
app:layout_constraintTop_toTopOf="@+id/tv_name" /> app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_name"/>
<TextView <TextView
android:id="@+id/tv_task_status" android:id="@+id/tv_task_status"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -39,7 +39,7 @@
android:layout_margin="10dp" android:layout_margin="10dp"
android:padding="5dp" android:padding="5dp"
android:background="@drawable/underline" android:background="@drawable/underline"
android:textSize="15sp" android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="@+id/tv_form" app:layout_constraintBottom_toBottomOf="@+id/tv_form"
app:layout_constraintStart_toEndOf="@+id/tv_form" app:layout_constraintStart_toEndOf="@+id/tv_form"
app:layout_constraintTop_toTopOf="@+id/tv_form" /> app:layout_constraintTop_toTopOf="@+id/tv_form" />
@@ -48,8 +48,8 @@
android:id="@+id/tv_task_id" android:id="@+id/tv_task_id"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" android:layout_marginTop="40dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="20dp"
android:text="任务id:11315" android:text="任务id:11315"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/tv_name" app:layout_constraintStart_toStartOf="@+id/tv_name"
@@ -63,7 +63,7 @@
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:text="￥3.5" android:text="￥3.5"
android:textColor="#000" android:textColor="#000"
android:textSize="15sp" android:textSize="20sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />

25
app/src/main/res/layout/mine_fragment.xml
View File

@@ -23,8 +23,8 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout" android:id="@+id/constraintLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="145dp" android:layout_height="140dp"
android:background="@mipmap/bg" android:background="@drawable/bg"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rl_mine"> app:layout_constraintTop_toBottomOf="@+id/rl_mine">
@@ -33,11 +33,11 @@
android:id="@+id/image_heard" android:id="@+id/image_heard"
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_margin="20dp" android:layout_marginLeft="20dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.3" /> app:layout_constraintVertical_bias="0.2" />
<TextView <TextView
android:id="@+id/tv_name" android:id="@+id/tv_name"
@@ -57,8 +57,9 @@
android:layout_width="30dp" android:layout_width="30dp"
android:layout_height="30dp" android:layout_height="30dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginRight="15dp" android:layout_marginRight="40dp"
android:background="@drawable/shares" android:background="@drawable/shares"
app:layout_constraintBottom_toTopOf="@+id/tv_name"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@@ -66,18 +67,16 @@
android:id="@+id/image_sign" android:id="@+id/image_sign"
android:layout_width="30dp" android:layout_width="30dp"
android:layout_height="30dp" android:layout_height="30dp"
android:layout_marginTop="15dp"
android:background="@drawable/sign" android:background="@drawable/sign"
app:layout_constraintBottom_toBottomOf="@+id/image_heard"
app:layout_constraintEnd_toEndOf="@+id/image_share" app:layout_constraintEnd_toEndOf="@+id/image_share"
app:layout_constraintTop_toBottomOf="@+id/image_share" /> app:layout_constraintTop_toBottomOf="@+id/tv_name" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="100dp" android:layout_height="80dp"
android:layout_marginLeft="35dp" android:layout_marginLeft="35dp"
android:layout_marginTop="95dp" android:layout_marginTop="90dp"
android:layout_marginRight="35dp" android:layout_marginRight="35dp"
app:layout_constraintBottom_toTopOf="@+id/linearLayout" app:layout_constraintBottom_toTopOf="@+id/linearLayout"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@@ -93,7 +92,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:layout_marginTop="20dp" android:layout_marginTop="10dp"
android:text="总资产（元）" android:text="总资产（元）"
android:textColor="#333" android:textColor="#333"
android:textSize="15sp" android:textSize="15sp"
@@ -106,7 +105,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="0.0" android:text="0.0"
android:textColor="#000" android:textColor="#000"
android:textSize="40sp" android:textSize="30sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/tv_title" app:layout_constraintStart_toStartOf="@+id/tv_title"
@@ -143,7 +142,7 @@
android:id="@+id/rl_grade" android:id="@+id/rl_grade"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginTop="10dp" android:layout_marginTop="8dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:layout_weight="1" android:layout_weight="1"
android:background="?android:attr/selectableItemBackground"> android:background="?android:attr/selectableItemBackground">

17
app/src/main/res/layout/poi_fragment.xml
View File

@@ -20,6 +20,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="01基本资料填写" android:text="01基本资料填写"
android:textColor="@color/black"
android:layout_margin="10dp" android:layout_margin="10dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/> app:layout_constraintTop_toTopOf="parent"/>
@@ -111,12 +112,13 @@
android:layout_toEndOf="@id/tv_name" android:layout_toEndOf="@id/tv_name"
android:layout_toStartOf="@id/tv_examine" android:layout_toStartOf="@id/tv_examine"
android:textSize="15sp" android:textSize="15sp"
android:textColor="#333" /> android:textColor="@color/test_color_selector" />
<!-- android:textColor="#333" -->
<TextView <TextView
android:id="@+id/tv_examine" android:id="@+id/tv_examine"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="查看" android:text="查重"
android:layout_margin="4dp" android:layout_margin="4dp"
android:textColor="@color/design_default_color_primary" android:textColor="@color/design_default_color_primary"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
@@ -233,6 +235,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="02拍照" android:text="02拍照"
android:textColor="@color/black"
android:layout_margin="10dp" android:layout_margin="10dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/linear_exist" /> app:layout_constraintTop_toBottomOf="@id/linear_exist" />
@@ -259,7 +262,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:background="#03A9F4" android:background="#03A9F4"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:layout_marginBottom="10dp"> android:layout_marginBottom="10dp">
<ImageView <ImageView
android:id="@+id/image_panorama" android:id="@+id/image_panorama"
@@ -293,7 +296,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:background="#03A9F4" android:background="#03A9F4"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:layout_marginBottom="10dp"> android:layout_marginBottom="10dp">
<ImageView <ImageView
android:id="@+id/image_name" android:id="@+id/image_name"
@@ -367,7 +370,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:background="#EFEDED" android:background="#EFEDED"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:layout_marginBottom="10dp"> android:layout_marginBottom="10dp">
<ImageView <ImageView
android:id="@+id/image_card" android:id="@+id/image_card"
@@ -443,6 +446,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="03描述" android:text="03描述"
android:textColor="@color/black"
android:layout_margin="10dp" android:layout_margin="10dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/linear_photograph" /> app:layout_constraintTop_toBottomOf="@id/linear_photograph" />
@@ -464,12 +468,15 @@
android:paddingBottom="30dp" android:paddingBottom="30dp"
android:layout_margin="2dp" android:layout_margin="2dp"
android:gravity="top" android:gravity="top"
android:paddingLeft="10dp"
android:paddingTop="10dp"
android:focusable="true" android:focusable="true"
android:focusableInTouchMode="true" android:focusableInTouchMode="true"
android:background="@color/white" android:background="@color/white"
android:hint="任务描述" android:hint="任务描述"
android:textSize="15sp" android:textSize="15sp"
/> />
</LinearLayout> </LinearLayout>

9
app/src/main/res/layout/poi_video_fragment.xml
View File

@@ -47,7 +47,7 @@
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="15sp" /> android:textSize="15sp" />
<TextView <EditText
android:id="@+id/et_poi_video_name" android:id="@+id/et_poi_video_name"
android:layout_width="200dp" android:layout_width="200dp"
android:textSize="14sp" android:textSize="14sp"
@@ -71,6 +71,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:layout_marginLeft="2dp"
app:layout_constraintTop_toBottomOf="@id/tv_mode"> app:layout_constraintTop_toBottomOf="@id/tv_mode">
<RadioGroup <RadioGroup
android:id="@+id/rg_type" android:id="@+id/rg_type"
@@ -141,6 +142,7 @@
android:layout_width="100dp" android:layout_width="100dp"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
app:layout_constraintLeft_toLeftOf="@id/ll_pictures" app:layout_constraintLeft_toLeftOf="@id/ll_pictures"
app:layout_constraintTop_toBottomOf="@id/ll_pictures" /> app:layout_constraintTop_toBottomOf="@id/ll_pictures" />
<LinearLayout <LinearLayout
@@ -208,10 +210,11 @@
android:id="@+id/et_desc" android:id="@+id/et_desc"
android:layout_width="320dp" android:layout_width="320dp"
android:layout_height="100dp" android:layout_height="100dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:background="@drawable/road_shape" android:background="@drawable/road_shape"
android:hint=" 任务描述" android:hint="任务描述"
android:paddingLeft="10dp"
android:layout_marginLeft="10dp"
android:paddingBottom="50dp" /> android:paddingBottom="50dp" />
</LinearLayout> </LinearLayout>

30
app/src/main/res/layout/treasure_fragment.xml
View File

@@ -37,7 +37,7 @@
android:id="@+id/iv_message" android:id="@+id/iv_message"
android:layout_width="25dp" android:layout_width="25dp"
android:layout_height="25dp" android:layout_height="25dp"
android:layout_marginTop="60dp" android:layout_marginTop="80dp"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:background="@drawable/iv_message" android:background="@drawable/iv_message"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
@@ -77,17 +77,17 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
/> />
<CheckBox <!-- <CheckBox-->
android:id="@+id/cb_foot_type" <!-- android:id="@+id/cb_foot_type"-->
android:layout_width="40dp" <!-- android:layout_width="40dp"-->
android:layout_height="40dp" <!-- android:layout_height="40dp"-->
android:layout_marginTop="15dp" <!-- android:layout_marginTop="15dp"-->
android:background="@drawable/foot_selector" <!-- android:background="@drawable/foot_selector"-->
android:button="@null" <!-- android:button="@null"-->
android:checked="false" <!-- android:checked="false"-->
app:layout_constraintRight_toRightOf="@id/cb_map_type" <!-- app:layout_constraintRight_toRightOf="@id/cb_map_type"-->
app:layout_constraintTop_toBottomOf="@id/cb_map_type" <!-- app:layout_constraintTop_toBottomOf="@id/cb_map_type"-->
/> <!-- />-->
<ImageView <ImageView
android:id="@+id/iv_submit" android:id="@+id/iv_submit"
@@ -95,7 +95,7 @@
android:layout_height="50dp" android:layout_height="50dp"
android:src="@mipmap/submit" android:src="@mipmap/submit"
app:layout_constraintBottom_toBottomOf="@id/iv_refrish" app:layout_constraintBottom_toBottomOf="@id/iv_refrish"
app:layout_constraintLeft_toLeftOf="@id/cb_foot_type" app:layout_constraintLeft_toLeftOf="@id/cb_map_type"
app:layout_constraintTop_toTopOf="@id/iv_zoom_del" app:layout_constraintTop_toTopOf="@id/iv_zoom_del"
/> />
@@ -105,7 +105,7 @@
android:layout_height="50dp" android:layout_height="50dp"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:src="@mipmap/filter" android:src="@mipmap/filter"
app:layout_constraintLeft_toLeftOf="@id/cb_foot_type" app:layout_constraintLeft_toLeftOf="@id/cb_map_type"
app:layout_constraintTop_toBottomOf="@id/iv_submit" app:layout_constraintTop_toBottomOf="@id/iv_submit"
/> />
@@ -117,7 +117,7 @@
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:src="@mipmap/zoom_add" android:src="@mipmap/zoom_add"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/cb_foot_type" app:layout_constraintTop_toBottomOf="@id/cb_map_type"
/> />
<ImageView <ImageView

2
app/src/main/res/layout/withdraw_fragment.xml
View File

@@ -45,7 +45,7 @@
<ImageView <ImageView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="150dp" android:layout_height="150dp"
android:background="@mipmap/bg" android:background="@drawable/bg"
app:layout_constraintTop_toBottomOf="@+id/rl_withdraw" /> app:layout_constraintTop_toBottomOf="@+id/rl_withdraw" />
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout

BIN
app/src/main/res/mipmap-ldpi/article.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB

BIN
app/src/main/res/mipmap-ldpi/article_select.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
app/src/main/res/mipmap-ldpi/bg.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 64 KiB

BIN
app/src/main/res/mipmap-ldpi/map.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

BIN
app/src/main/res/mipmap-ldpi/map_select.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB

BIN
app/src/main/res/mipmap-ldpi/mine.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

BIN
app/src/main/res/mipmap-ldpi/mine_select.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

BIN
app/src/main/res/mipmap-ldpi/task.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
app/src/main/res/mipmap-ldpi/task_select.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
app/src/main/res/mipmap-xhdpi/datouzhen.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB