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

Merge branch 'master' of gitee.com:navinfo-out-door/navinfo-out-door-data-collect

Browse Source
This commit is contained in:
XiaoYan 2021-07-26 21:13:49 +08:00
commit bb5714ea4d
44 changed files with 455 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/com/navinfo/outdoor/activity/WebActivity.java
View File

@ -27,18 +27,18 @@ public class WebActivity extends BaseActivity implements View.OnClickListener {
private WebView nWebView;
private String content = "<div>\n" +
"<a>测试</a>\n" +
// "\n" +
// "<p>\n" +
// "\t<img src=\"https://exp-picture.cdn.bcebos.com/560be432939c2cf72dff4caa452c5b1b1fde12e1.jpg?x-bce-process=image%2Fresize%2Cm_lfit%2Cw_500%2Climit_1%2Fformat%2Cf_jpg%2Fquality%2Cq_80\">\n" +
// "</p>\n" +
// "\n" +
// "<p style=\"color: red; margin-left: 20px\">&lt;style&gt; 标签用于为 HTML 文档定义样式信息。</p>\n" +
// "\n" +
// "<p style=\"background-color: lightblue; margin-left: 20px\">在 style 中，您可以规定在浏览器中如何呈现 HTML 文档。</p>\n" +
// "\n" +
// "<p style=\"font-family: verdana; margin-left: 20px\">type 属性是必需的，定义 style 元素的内容。唯一可能的值是 \"text/css\"。</p>\n" +
// "\n" +
// "<p style=\"font-size: 20px; margin-left: 20px\">style 元素位于 head 部分中。</p>\n" +
"\n" +
"<p>\n" +
"\t<img src=\"https://exp-picture.cdn.bcebos.com/560be432939c2cf72dff4caa452c5b1b1fde12e1.jpg?x-bce-process=image%2Fresize%2Cm_lfit%2Cw_500%2Climit_1%2Fformat%2Cf_jpg%2Fquality%2Cq_80\">\n" +
"</p>\n" +
"\n" +
"<p style=\"color: red; margin-left: 20px\">&lt;style&gt; 标签用于为 HTML 文档定义样式信息。</p>\n" +
"\n" +
"<p style=\"background-color: lightblue; margin-left: 20px\">在 style 中，您可以规定在浏览器中如何呈现 HTML 文档。</p>\n" +
"\n" +
"<p style=\"font-family: verdana; margin-left: 20px\">type 属性是必需的，定义 style 元素的内容。唯一可能的值是 \"text/css\"。</p>\n" +
"\n" +
"<p style=\"font-size: 20px; margin-left: 20px\">style 元素位于 head 部分中。</p>\n" +
"</div>";
@Override
protected int getLayout() {

18
app/src/main/java/com/navinfo/outdoor/adapter/MessageAdapter.java
View File

@ -43,6 +43,15 @@ public class MessageAdapter extends RecyclerView.Adapter<MessageAdapter.ViewHold
holder.tvMessageTitle.setText(messageList.get(position).getTitle());
holder.tvMessageDest.setText(messageList.get(position).getSubtitle());
holder.tvMessageTime.setText(messageList.get(position).getCreatetime());
holder.itemView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (messageClickItem!=null){
messageClickItem.item(messageList.get(position).getId());
}
}
});
}
@Override
@ -63,4 +72,13 @@ public class MessageAdapter extends RecyclerView.Adapter<MessageAdapter.ViewHold
tvMessageTime = itemView.findViewById(R.id.tv_message_time);
}
}
public messageClickItem messageClickItem;
public void setMessageClickItem(MessageAdapter.messageClickItem messageClickItem) {
this.messageClickItem = messageClickItem;
}
public interface messageClickItem{
void item(int aInt);
}
}

35
app/src/main/java/com/navinfo/outdoor/adapter/StaySubmitAdapter.java
View File

@ -8,26 +8,20 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.navinfo.outdoor.R;
import com.navinfo.outdoor.bean.CapacityMeasureBean;
import com.navinfo.outdoor.room.PoiDatabase;
import com.navinfo.outdoor.room.PoiEntity;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import static com.tencent.mapsdk.internal.aaa.getContext;
public class StaySubmitAdapter extends RecyclerView.Adapter<StaySubmitAdapter.ViewHolder> {
private List<PoiEntity> allRoad = new ArrayList<>();
@ -91,6 +85,25 @@ public class StaySubmitAdapter extends RecyclerView.Adapter<StaySubmitAdapter.Vi
allRoad.get(position).setChecked(isChecked);
}
});
if (poiEntity.getIsLocalData() == 1){
holder.itemView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (onClickItem!=null){
onClickItem.item(position,poiEntity);
}
}
});
}else {
holder.itemView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (onClickItem!=null){
onClickItem.item(position,poiEntity);
}
}
});
}
}
@ -124,4 +137,14 @@ public class StaySubmitAdapter extends RecyclerView.Adapter<StaySubmitAdapter.Vi
}
}
};
public onClickItem onClickItem ;
public void setOnClickItem(StaySubmitAdapter.onClickItem onClickItem) {
this.onClickItem = onClickItem;
}
public interface onClickItem {
void item(int position, PoiEntity allRoad);
}
}

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

@ -82,6 +82,8 @@ public class Constant {
// public static final int CHARGING_PILE_BODY = 36;//充电装的body
// public static final int CHARGING_PILE_PHOTO = 37;//充电桩的照片
public static final int EVENT_WHAT_CURRENT_MARKER = 41; // 显示当前正在编辑的POI类型数据的Event的What值
//CompleteTask
public static final int EVENT_WHAT_COMPLETE_TASK = 42; // 点击记录跳转开始采集
public static String USER_ATTESTATION_NAME; //实名认证姓名 银行卡

9
app/src/main/java/com/navinfo/outdoor/bean/UserPriceExchangeBean.java
View File

@ -4,6 +4,7 @@ public class UserPriceExchangeBean {
private Integer code;
private String message;
private Integer body;
public Integer getCode() {
return code;
@ -20,4 +21,12 @@ public class UserPriceExchangeBean {
public void setMessage(String message) {
this.message = message;
}
public Integer getBody() {
return body;
}
public void setBody(Integer body) {
this.body = body;
}
}

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

@ -1,5 +1,6 @@
package com.navinfo.outdoor.fragment;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.ImageView;
@ -8,6 +9,7 @@ import android.widget.RelativeLayout;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
import com.navinfo.outdoor.R;
import com.navinfo.outdoor.activity.WebActivity;
import com.navinfo.outdoor.base.BaseFragment;
/**
@ -54,10 +56,16 @@ public class AboutFragment extends BaseFragment implements View.OnClickListener
getActivity().finish();
break;
case R.id.rl_about:
Intent intent = new Intent(getContext(), WebActivity.class);
startActivity(intent);
break;
case R.id.rl_serve:
Intent serveIntent = new Intent(getContext(), WebActivity.class);
startActivity(serveIntent);
break;
case R.id.rl_privilege:
Intent privilegeIntent = new Intent(getContext(), WebActivity.class);
startActivity(privilegeIntent);
break;
}
}

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

@ -88,7 +88,7 @@ import static android.app.Activity.RESULT_OK;
public class ChargingStationFragment extends BaseDrawerFragment implements View.OnClickListener {
private EditText editDescribe;
private RelativeLayout rlPanorama, rlName, rlInternalPhotos, rlElse, rlScutcheon;
private RelativeLayout rlPanorama, rlName, rlInternalPhotos, rlElse, rlScutcheon,rlNull;
private ImageView ivPanorama, ivName, ivInternal, ivElse, ivScutcheon;
private TextView tvExamine;
private EditText editNameContent, editSiteContent;
@ -240,6 +240,8 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
rlName.setOnClickListener(this::onClick);
rlInternalPhotos = findViewById(R.id.rl_internal_photos);
rlInternalPhotos.setOnClickListener(this::onClick);
rlNull = findViewById(R.id.rl_null);
rlElse = findViewById(R.id.rl_else);
rlElse.setOnClickListener(this::onClick);
rlScutcheon = findViewById(R.id.rl_scutcheon);
@ -327,6 +329,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
rlInternalPhotos.setVisibility(View.VISIBLE);
rlElse.setVisibility(View.VISIBLE);
rlScutcheon.setVisibility(View.VISIBLE);
rlNull.setVisibility(View.VISIBLE);
existence = 0;
break;
case 1:
@ -334,6 +337,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
rlInternalPhotos.setVisibility(View.GONE);
rlElse.setVisibility(View.GONE);
rlScutcheon.setVisibility(View.GONE);
rlNull.setVisibility(View.GONE);
existence = 1;
break;
case 2:
@ -341,6 +345,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
rlInternalPhotos.setVisibility(View.GONE);
rlElse.setVisibility(View.GONE);
rlScutcheon.setVisibility(View.GONE);
rlNull.setVisibility(View.GONE);
existence = 2;
break;
}
@ -427,9 +432,9 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
}
} else {
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 {
poiBeans.add(new PhoneBean("电话*", "", Constant.CODE, R.drawable.icon_add_bg));
poiBeans.add(new PhoneBean("电话", "", Constant.CODE, R.drawable.icon_add_bg));
}
}
contactView = new ContactView(getActivity(), linearContact, poiBeans);

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

@ -308,7 +308,6 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
obtain.what = Constant.FILTER_LIST_ITEM;
obtain.obj = poiEntity;
EventBus.getDefault().post(obtain);
}
}
});

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

@ -224,7 +224,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
initCompleteTask(HttpInterface.COMPLETE, poiEntity.getTaskId(), taskIdPoiEntity);
initCompleteTask(HttpInterface.COMPLETE, poiEntity.getTaskId(),true, taskIdPoiEntity);
}
});
}
@ -259,10 +259,6 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
public void run() {
poiEntity.setTaskStatus(0);
initViewByTaskStatus(0);
// btnGetTask.setVisibility(View.VISIBLE);
// btnCancelGet.setVisibility(View.GONE);
// btnGather.setVisibility(View.VISIBLE);
// btnFinishGather.setVisibility(View.GONE);
}
});
}
@ -349,12 +345,8 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
// poiEntity.setTaskStatus(1);
// initViewByTaskStatus(1);
btnGetTask.setVisibility(View.GONE);
btnCancelGet.setVisibility(View.VISIBLE);
btnFinishGather.setVisibility(View.VISIBLE);
btnGather.setVisibility(View.GONE);
poiEntity.setTaskStatus(1);
initViewByTaskStatus(1);
if (isSaver) {
Message obtain = Message.obtain();
obtain.what = Constant.GATHER_GET_MAP;
@ -434,10 +426,12 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
public void run() {
// poiEntity.setTaskStatus(1);
// initViewByTaskStatus(1);
btnGetTask.setVisibility(View.GONE);
btnCancelGet.setVisibility(View.VISIBLE);
if (aBoolean) {
initCompleteTask(HttpInterface.COMPLETE, GatherGetFragment.this.poiEntity.getTaskId(), polygonEntity);
initCompleteTask(HttpInterface.COMPLETE, GatherGetFragment.this.poiEntity.getTaskId(), true, polygonEntity);
}
}
});
@ -505,8 +499,10 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
/**
* @param url 面妆任务立即采集
* @param b
*
*/
private void initCompleteTask(String url, int taskId, PoiEntity poiEntity) {
private void initCompleteTask(String url, int taskId, boolean b, PoiEntity poiEntity) {
if (taskId == 0) {
Toast.makeText(getContext(), "无此任务", Toast.LENGTH_SHORT).show();
return;
@ -530,9 +526,9 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
// onBackPressed();
// poiEntity.setTaskStatus(3);
// initViewByTaskStatus(3);
// poiEntity.setTaskStatus(1);
// initViewByTaskStatus(1);
btnGather.setVisibility(View.GONE);
btnFinishGather.setVisibility(View.VISIBLE);
@ -749,10 +745,6 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
public void run() {
poiEntity.setTaskStatus(1);
initViewByTaskStatus(1);
// btnGetTask.setVisibility(View.GONE);
// btnCancelGet.setVisibility(View.VISIBLE);
// btnFinishGather.setVisibility(View.VISIBLE);
// btnGather.setVisibility(View.GONE);
if (isSaver) {
Message obtain = Message.obtain();
obtain.what = Constant.GATHER_GET_MAP;

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

@ -1,5 +1,6 @@
package com.navinfo.outdoor.fragment;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
@ -12,6 +13,7 @@ import com.jcodecraeer.xrecyclerview.ProgressStyle;
import com.jcodecraeer.xrecyclerview.XRecyclerView;
import com.lzy.okgo.model.HttpParams;
import com.navinfo.outdoor.R;
import com.navinfo.outdoor.activity.WebActivity;
import com.navinfo.outdoor.adapter.MessageAdapter;
import com.navinfo.outdoor.adapter.TaskPrefectureAdapter;
import com.navinfo.outdoor.base.BaseFragment;
@ -56,7 +58,16 @@ public class MessageFragment extends BaseFragment implements View.OnClickListene
messageRecycler.setLoadingMoreEnabled(false);
messageAdapter = new MessageAdapter(getContext());
messageRecycler.setAdapter(messageAdapter);
messageAdapter.setMessageClickItem(new MessageAdapter.messageClickItem() {
@Override
public void item(int id) {
Intent intent = new Intent(getContext(), WebActivity.class);
intent.putExtra("id", id);
startActivity(intent);
}
});
messageRecycler.getDefaultFootView().setNoMoreHint("已全部加载完毕");
messageRecycler.setLoadingListener(new XRecyclerView.LoadingListener() {
@Override
public void onRefresh() {

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

@ -107,6 +107,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
private LinearLayout linearContact;
private ContactView contactView;
private ArrayList<File> poiPicList;
private String tagPanorama;
public static PoiFragment newInstance(Bundle bundle) {
PoiFragment fragment = new PoiFragment();
@ -252,7 +253,20 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
initShowPoi();
//禁用所有可操作控件
//disables();
// ivPanorama.setOnLongClickListener(new View.OnLongClickListener() {
// @Override
// public boolean onLongClick(View v) {
// DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
// MessageDialog.show((AppCompatActivity) getContext(), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
// @Override
// public boolean onClick(BaseDialog baseDialog, View v) {
// tagPanorama.isEmpty();
// return false;
// }
// });
// return true;
// }
// });
}
@ -288,13 +302,13 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
if (!StringUtils.isEmpty(phones[i])) {
if (phones[i].contains("-")) { // 包含区号数据的电话
String[] split = phones[i].split("-");
if (split!=null&&split.length>1) {
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 {
if (phones[i]!=null) {
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));
@ -305,13 +319,13 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
if (!StringUtils.isEmpty(phones[i])) {
if (phones[i].contains("-")) { // 包含区号数据的电话
String[] split = phones[i].split("-");
if (split!=null&&split.length>1) {
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) {
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));
@ -357,10 +371,11 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
}
}
}
if (showPoiEntity.getTaskStatus() == 3){
if (showPoiEntity.getTaskStatus() == 3) {
disables();
}
}
/**
@ -548,7 +563,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
String list = contactView.getList();
poiEntity.setTelPhone(list);
}
String tagPanorama = (String) ivPanorama.getTag();
tagPanorama = (String) ivPanorama.getTag();
if (tagPanorama == null) {
Toast.makeText(getActivity(), "请拍照 全景图", Toast.LENGTH_SHORT).show();
return;

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

@ -312,7 +312,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
String formats = formatters.format(calendars.getTime());
String city = Constant.currentLocation.getCity();//返回当前位置的城市.
String district = Constant.currentLocation.getDistrict();//返回当前位置的区县.
StringBuffer sb = new StringBuffer("poi录像上报");
StringBuffer sb = new StringBuffer("道路录像上报");
if (city != null && !"".equals(city)) {
sb.append("-");
sb.append(city);
@ -420,7 +420,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
}
OkGo
// 请求方式和请求url
.<OtherUploadPicBean>post(HttpInterface.POI_VIDEO_UPLOAD_PIC)
.<OtherUploadPicBean>post(HttpInterface.ROAD_TASK_UPLOAD_PIC)
// 请求的 tag, 主要用于取消对应的请求
.params("auditId", body)
.params("file", fileZip)

46
app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java
View File

@ -2,7 +2,6 @@ package com.navinfo.outdoor.fragment;
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.util.Log;
import android.view.View;
@ -12,18 +11,12 @@ import android.widget.CompoundButton;
import android.widget.TextView;
import android.widget.Toast;
import java.text.SimpleDateFormat;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.google.gson.Gson;
import com.jcodecraeer.xrecyclerview.ProgressStyle;
import com.jcodecraeer.xrecyclerview.XRecyclerView;
import com.kongzue.dialog.interfaces.OnDialogButtonClickListener;
import com.kongzue.dialog.interfaces.OnMenuItemClickListener;
import com.kongzue.dialog.util.BaseDialog;
@ -31,19 +24,17 @@ import com.kongzue.dialog.util.DialogSettings;
import com.kongzue.dialog.v3.BottomMenu;
import com.kongzue.dialog.v3.MessageDialog;
import com.navinfo.outdoor.R;
import com.navinfo.outdoor.activity.FragmentManagement;
import com.navinfo.outdoor.adapter.StaySubmitAdapter;
import com.navinfo.outdoor.api.UserApplication;
import com.navinfo.outdoor.api.Constant;
import com.navinfo.outdoor.base.BaseFragment;
import com.navinfo.outdoor.room.PoiDao;
import com.navinfo.outdoor.room.PoiDatabase;
import com.navinfo.outdoor.room.PoiEntity;
import org.jetbrains.annotations.NotNull;
import org.greenrobot.eventbus.EventBus;
import java.sql.Date;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
/**
@ -90,6 +81,20 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
stayXrv.addItemDecoration(new DividerItemDecoration(getContext(), DividerItemDecoration.VERTICAL));
staySubmitAdapter = new StaySubmitAdapter(getContext());
stayXrv.setAdapter(staySubmitAdapter);
staySubmitAdapter.setOnClickItem(new StaySubmitAdapter.onClickItem() {
@Override
public void item(int position, PoiEntity poiEntity) {
// Intent subIntent = new Intent(getActivity(), FragmentManagement.class);
// subIntent.putExtra("poiEntity", poiEntity);
// subIntent.putExtra("tag", 4);
// startActivity(subIntent);
// Message obtain = Message.obtain();
// obtain.what = Constant.EVENT_WHAT_COMPLETE_TASK;
// obtain.obj = poiEntity;
// EventBus.getDefault().post(obtain);
}
});
cbSelect.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
@ -105,14 +110,15 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
// super.initData();
// }
public List<PoiEntity> initRoadWord(int type){
public List<PoiEntity> initRoadWord(int type) {
newEntities.clear();
for (int i = 0; i < roadEntities.size(); i++) {
PoiEntity poiEntity = roadEntities.get(i);
if (type==0){
if (type == 0) {
newEntities.add(poiEntity);
}else {
if (poiEntity.getType()==type){
} else {
if (poiEntity.getType() == type) {
newEntities.add(poiEntity);
}
}
@ -125,10 +131,10 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
public void onClick(View v) {
switch (v.getId()) {
case R.id.cl_stay_type://1 "POI"2 "充电站"3 "POI录像"4 "道路录像"5 "其他"6 "面状任务"
BottomMenu.show((AppCompatActivity) getContext(), new String[]{"全部","poi", "充电站", "poi录像", "道路录像","其他","面状任务"}, new OnMenuItemClickListener() {
BottomMenu.show((AppCompatActivity) getContext(), new String[]{"全部", "poi", "充电站", "poi录像", "道路录像", "其他", "面状任务"}, new OnMenuItemClickListener() {
@Override
public void onClick(String text, int index) {
switch (index){
switch (index) {
case 0:
List<PoiEntity> entities = initRoadWord(0);
staySubmitAdapter.setAllRoad(entities);
@ -138,7 +144,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
staySubmitAdapter.setAllRoad(poiEntities);
break;
case 2:
List<PoiEntity> stationEntities= initRoadWord(2);
List<PoiEntity> stationEntities = initRoadWord(2);
staySubmitAdapter.setAllRoad(stationEntities);
break;
case 3:
@ -179,7 +185,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
public void refreshData() {
roadDatabase = PoiDatabase.getInstance(getContext());
roadDao = roadDatabase.getPoiDao();
if (roadEntities ==null) {
if (roadEntities == null) {
roadEntities = new ArrayList<>();
}
if (newEntities == null) {

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

@ -462,7 +462,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
});
}
public void initMarker(PoiEntity poiEntity) {
sliding_layout.setPanelHeight(0);
sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN);
@ -546,7 +545,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
switch (Integer.valueOf(poiEntity.getType())) {
case 1://poi
BitmapDescriptor poiDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_have_bg);
BitmapDescriptor poiDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.graypoi);
Marker poiMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiDescriptor).alpha(0.9f)
.flat(true)
.clockwise(false));
@ -558,7 +557,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
break;
case 2://充电站
BitmapDescriptor chargeDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge_have_bg);
BitmapDescriptor chargeDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.graycharge);
Marker stationMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(chargeDescriptor).alpha(0.9f)
.flat(true)
.clockwise(false));
@ -578,7 +577,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
removablesLocality.add(poiVideoMarker);
break;
case 4://道路录像
BitmapDescriptor roadDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_road_have_bg);
BitmapDescriptor roadDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.grayroad);
Marker roadMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(roadDescriptor).alpha(0.9f)
.flat(true)
.clockwise(false));
@ -859,7 +858,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
}
} else if (data.what == Constant.GATHER_GET_RETURN) {//item 点击页面的返回事件的处理
if ((boolean) data.obj) {
frameLayout.setVisibility(View.GONE);
sliding_layout.setPanelHeight(1000);
sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
@ -911,6 +909,40 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
int type = data.arg1;
showPoiMarkerByType(type, latLng);
}
// else if (data.what == Constant.EVENT_WHAT_COMPLETE_TASK){
// // 如果当前fragment是筛选，则移除该fragment
// FilterFragment filterFragment = (FilterFragment) supportFragmentManager.findFragmentByTag(FilterFragment.class.getName());
// if (filterFragment != null) {
// fragmentTransaction.remove(filterFragment);
// //fragmentTransaction.commit();
// }
// PoiEntity poiEntity = (PoiEntity) data.obj;
// Bundle bundle = new Bundle();
// bundle.putSerializable("poiEntity", poiEntity);
// switch (poiEntity.getType()) {
// case 1:
// PoiFragment poiFragment = PoiFragment.newInstance(bundle);
// showSlidingFragment(poiFragment);
// break;
// case 2:
// ChargingStationFragment chargingStationFragment = ChargingStationFragment.newInstance(bundle);
// showSlidingFragment(chargingStationFragment);
// break;
// case 3:
// PoiVideoFragment poiVideoFragment = PoiVideoFragment.newInstance(bundle);
// showSlidingFragment(poiVideoFragment);
// break;
// case 4:
// RoadFragment roadFragment = RoadFragment.newInstance(bundle);
// showSlidingFragment(roadFragment);
// break;
// case 5:
// OtherFragment otherFragment = OtherFragment.newInstance(bundle);
// showSlidingFragment(otherFragment);
// break;
// }
// frameLayout.setVisibility(View.VISIBLE);
// }
}
@ -930,7 +962,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
private void initFilterMarker(List<PoiEntity> poiEntities) {
sliding_layout.setPanelHeight(1000);
sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN);
for (int i = 0; i < poiEntities.size(); i++) {
LatLng position = new LatLng(Double.valueOf(poiEntities.get(i).getY()), Double.valueOf(poiEntities.get(i).getX()));
tencentMap.addMarker(new MarkerOptions(position));

3
app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java
View File

@ -163,8 +163,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
@Override
public void onSuccess(UserPriceExchangeBean response, int id) {
dismissLoadingDialog();
// Toast.makeText(getContext(), "获取成功", Toast.LENGTH_SHORT).show();
Toast.makeText(getContext(), "提现成功", Toast.LENGTH_SHORT).show();
Log.d("TAG", "onSuccess: " + response.toString() + "tttttttt");
}

10
app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java
View File

@ -64,10 +64,16 @@ public class HttpInterface {
public static final String RECEIVED_POI_VIDEO_TASK = IPm6 + "poivideotask/1/receivedPoivideotask";//poi录像任务获取
// 172.23.139.4:8003/poivideotask/1/submitPoivideotask
public static final String INSIDE_API_LIST = IPm6 + "poivideotask/1/submitPoivideotask";//poi录像 保存
//172.23.139.4:8003/roadtask/1/submitRoadtask?taskId=0&name=段哥&address=二娃&memo=1rn7exd5uhxy&workType=2
public static final String ROAD_TASK_SUBMIT = IPm6+"roadtask/1/submitRoadtask";
//172.23.139.4:8003/poivideotask/1/uploadpic
public static final String POI_VIDEO_UPLOAD_PIC = IPm6 + "poivideotask/1/uploadpic";//poi录像-上传
//172.23.139.4:8003/roadtask/1/submitRoadtask?taskId=0&name=段哥&address=二娃&memo=1rn7exd5uhxy&workType=2
public static final String ROAD_TASK_SUBMIT = IPm6+"roadtask/1/submitRoadtask";//道路录像-保存本地
//172.23.139.4:8003/roadtask/1/uploadpic
public static final String ROAD_TASK_UPLOAD_PIC=IPm6+"roadtask/1/uploadpic";//道路录像—上传
//http://172.23.139.4:8003/m4/task/1/getPhone?geo=1rn7exd5uhxy
public static final String GET_PHONE = IPm6 + "m4/task/1/getPhone"; //任务搜索
//http://172.23.139.4:8003/m4/task/1/getPhone?geo=1rn7exd5uhxy

4
app/src/main/res/color/test_color_selector.xml
View File

@ -3,6 +3,8 @@
<item android:state_pressed="true"
android:color="#ff0000ff"/> <!-- pressed 看下的颜色-->
<item android:state_focused="true"
android:color="#D8D7D7"/> <!-- focused -->
android:color="#ff000000"/> <!-- focused -->
<item android:state_enabled="false"
android:color="@color/colorGray"/> <!-- focused -->
<item android:color="#ff000000"/> <!-- default 默认颜色 -->
</selector>

BIN
app/src/main/res/drawable-hdpi/graycharge.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
app/src/main/res/drawable-hdpi/grayother.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
app/src/main/res/drawable-hdpi/graypoi.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
app/src/main/res/drawable-hdpi/grayroad.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

30
app/src/main/res/drawable-hdpi/ic_launcher_foreground.xml Normal file
View File

@ -0,0 +1,30 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="85.84757"
android:endY="92.4963"
android:startX="42.9492"
android:startY="49.59793"
android:type="linear">
<item
android:color="#44000000"
android:offset="0.0" />
<item
android:color="#00000000"
android:offset="1.0" />
</gradient>
</aapt:attr>
</path>
<path
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
android:strokeWidth="1"
android:strokeColor="#00000000" />
</vector>

0
app/src/main/res/drawable/icon_add_bg.png → app/src/main/res/drawable-hdpi/icon_add_bg.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 165 B

After

Width:  |  Height:  |  Size: 165 B

0
app/src/main/res/drawable/icon_del_bg.png → app/src/main/res/drawable-hdpi/icon_del_bg.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 126 B

After

Width:  |  Height:  |  Size: 126 B

0
app/src/main/res/drawable/marker_charge_bg1.png → app/src/main/res/drawable-hdpi/marker_charge_bg1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

0
app/src/main/res/drawable/marker_other_bg1.png → app/src/main/res/drawable-hdpi/marker_other_bg1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

0
app/src/main/res/drawable/marker_poi_bg1.png → app/src/main/res/drawable-hdpi/marker_poi_bg1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

0
app/src/main/res/drawable/marker_poi_video_bg1.png → app/src/main/res/drawable-hdpi/marker_poi_video_bg1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

8
app/src/main/res/drawable/selector_hui_bg.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:drawable="@drawable/shape_red_radius_bg_disable" android:state_checked="true" />
<item android:drawable="@drawable/shape_red_radius_bg_disable" android:state_selected="true" />
<item android:drawable="@drawable/shape_red_radius_bg_disable" android:state_pressed="true" />
<item android:drawable="@drawable/shape_red_radius_bg_disable" android:state_enabled="false"/>
<item android:drawable="@drawable/shape_hui_bg" />
</selector>

8
app/src/main/res/drawable/selector_red_bg.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:drawable="@drawable/shape_red_radius_bg_disable" android:state_checked="true" />
<item android:drawable="@drawable/shape_red_radius_bg_disable" android:state_selected="true" />
<item android:drawable="@drawable/shape_red_radius_bg_disable" android:state_pressed="true" />
<item android:drawable="@drawable/shape_red_radius_bg_disable" android:state_enabled="false"/>
<item android:drawable="@drawable/shape_radius_bg" />
</selector>

4
app/src/main/res/drawable/shap_red_bg.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/colorPrimaryBlue" />
</shape>

5
app/src/main/res/drawable/shape_hui_bg.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color=" #EFEDED" />
</shape>

5
app/src/main/res/drawable/shape_radius_bg.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/colorPrimaryBlue" />
</shape>

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

@ -144,12 +144,14 @@
android:layout_width="150dp"
android:layout_height="wrap_content"
android:text="对所有车辆开放"
android:textColor="@color/test_color_selector"
/>
<CheckBox
android:id="@+id/check_button2"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:text="对环卫车开放"
android:textColor="@color/test_color_selector"
/>
</LinearLayout>
@ -163,12 +165,14 @@
android:layout_width="150dp"
android:layout_height="wrap_content"
android:text="对公交车开放"
android:textColor="@color/test_color_selector"
/>
<CheckBox
android:id="@+id/check_button4"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:text="对出租车开放"
android:textColor="@color/test_color_selector"
/>
</LinearLayout>
@ -182,6 +186,7 @@
android:id="@+id/check_button5"
android:layout_width="250dp"
android:layout_height="40dp"
android:textColor="@color/test_color_selector"
android:text="对除环卫,公交,出租,品牌,之外的其他 特种车辆开放"
/>
</LinearLayout>
@ -313,7 +318,7 @@
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginTop="10dp"
android:background="#03A9F4"
android:background="@drawable/selector_red_bg"
android:layout_alignParentLeft="true"
android:layout_marginRight="5dp"
android:layout_marginBottom="10dp">
@ -338,6 +343,7 @@
<ImageView
android:id="@+id/iv_panorama"
android:layout_centerInParent="true"
android:scaleType="fitXY"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
@ -348,7 +354,7 @@
android:layout_height="100dp"
android:layout_marginTop="10dp"
android:layout_centerHorizontal="true"
android:background="#03A9F4"
android:background="@drawable/selector_red_bg"
android:layout_marginRight="5dp"
android:layout_marginBottom="10dp">
<ImageView
@ -372,6 +378,7 @@
<ImageView
android:id="@+id/iv_coding"
android:layout_centerInParent="true"
android:scaleType="fitXY"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
@ -428,7 +435,7 @@
android:layout_height="100dp"
android:layout_alignParentLeft="true"
android:layout_marginTop="10dp"
android:background="#03A9F4"
android:background="@drawable/selector_red_bg"
android:layout_marginRight="5dp"
android:layout_marginBottom="10dp">
<ImageView
@ -453,6 +460,7 @@
android:id="@+id/iv_equipment"
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:scaleType="fitXY"
android:layout_height="match_parent"
/>
</RelativeLayout>
@ -461,7 +469,7 @@
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginTop="10dp"
android:background="#EFEDED"
android:background="@drawable/selector_hui_bg"
android:layout_centerHorizontal="true"
android:layout_marginRight="5dp"
android:layout_marginBottom="10dp">
@ -487,6 +495,7 @@
android:id="@+id/iv_facility"
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:scaleType="fitXY"
android:layout_height="match_parent"
/>
</RelativeLayout>
@ -495,7 +504,7 @@
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginTop="10dp"
android:background="#03A9F4"
android:background="@drawable/selector_red_bg"
android:visibility="gone"
android:layout_alignParentRight="true"
android:layout_centerHorizontal="true"
@ -520,6 +529,7 @@
android:layout_below="@id/image_scutcheon"
/>
<ImageView
android:scaleType="fitXY"
android:id="@+id/iv_scutcheon"
android:layout_centerInParent="true"
android:layout_width="match_parent"
@ -532,7 +542,7 @@
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginTop="10dp"
android:background="#03A9F4"
android:background="@drawable/selector_red_bg"
android:visibility="gone"
android:layout_centerHorizontal="true"
android:layout_marginRight="5dp"
@ -560,6 +570,7 @@
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"
/>
</RelativeLayout>
<RelativeLayout
@ -612,7 +623,7 @@
android:id="@+id/rl_usable"
android:layout_width="100dp"
android:layout_height="match_parent"
android:background="#03A9F4"
android:background="@drawable/selector_red_bg"
android:layout_alignParentLeft="true"
>
<ImageView
@ -637,6 +648,7 @@
<ImageView
android:id="@+id/iv_usable"
android:layout_width="match_parent"
android:scaleType="fitXY"
android:layout_height="match_parent" />
</RelativeLayout>
<RelativeLayout
@ -644,7 +656,7 @@
android:layout_width="100dp"
android:layout_centerHorizontal="true"
android:layout_height="match_parent"
android:background="#EFEDED">
android:background="@drawable/selector_hui_bg">
<ImageView
android:id="@+id/image_available"
android:layout_centerHorizontal="true"
@ -668,6 +680,7 @@
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"
/>
</RelativeLayout>
<RelativeLayout
@ -675,7 +688,7 @@
android:layout_width="100dp"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:background="#03A9F4">
android:background="@drawable/selector_red_bg">
<ImageView
android:id="@+id/image_parking"
android:layout_centerHorizontal="true"
@ -699,6 +712,7 @@
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"
/>
</RelativeLayout>
@ -707,7 +721,7 @@
android:id="@+id/rl_number"
android:layout_width="100dp"
android:layout_height="100dp"
android:background="#EFEDED"
android:background="@drawable/selector_hui_bg"
android:layout_marginTop="10dp"
android:layout_alignParentLeft="true"
>
@ -731,6 +745,7 @@
/>
<ImageView
android:scaleType="fitXY"
android:id="@+id/iv_number"
android:layout_width="match_parent"
android:layout_height="match_parent" />
@ -771,6 +786,7 @@
android:background="@color/white"
android:hint="任务描述"
android:textSize="15sp"
android:textColor="@color/test_color_selector"
/>
</LinearLayout>

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

@ -111,7 +111,7 @@
android:layout_toEndOf="@id/tv_name"
android:layout_toStartOf="@id/tv_examine"
android:textSize="15sp"
android:textColor="#333" />
android:textColor="@color/test_color_selector" />
<TextView
android:id="@+id/tv_examine"
android:layout_width="wrap_content"
@ -137,7 +137,7 @@
android:id="@+id/tv_site"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="地址*"
android:text="地址"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:textColor="#333"
@ -157,7 +157,7 @@
android:background="@color/white"
android:hint="地址"
android:textSize="15sp"
android:textColor="#333" />
android:textColor="@color/test_color_selector" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/linear_phone"
@ -302,7 +302,7 @@
android:layout_weight="1"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:background="#03A9F4"
android:background="@drawable/selector_red_bg"
android:layout_marginRight="10dp"
android:layout_marginBottom="10dp">
<ImageView
@ -326,6 +326,7 @@
<ImageView
android:id="@+id/iv_panorama"
android:layout_centerInParent="true"
android:scaleType="fitXY"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
@ -336,7 +337,7 @@
android:layout_weight="1"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:background="#03A9F4"
android:background="@drawable/selector_red_bg"
android:layout_marginRight="10dp"
android:layout_marginBottom="10dp">
<ImageView
@ -360,6 +361,7 @@
<ImageView
android:id="@+id/iv_name"
android:layout_centerInParent="true"
android:scaleType="fitXY"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
@ -370,7 +372,7 @@
android:layout_weight="1"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:background="#03A9F4"
android:background="@drawable/selector_red_bg"
android:layout_marginRight="10dp"
android:layout_marginBottom="10dp">
<ImageView
@ -394,6 +396,7 @@
<ImageView
android:id="@+id/iv_internal"
android:layout_centerInParent="true"
android:scaleType="fitXY"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
@ -410,7 +413,7 @@
android:layout_weight="1"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:background="#03A9F4"
android:background="@drawable/selector_red_bg"
android:layout_marginRight="10dp"
android:layout_marginBottom="10dp">
<ImageView
@ -436,6 +439,7 @@
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"
/>
</RelativeLayout>
<RelativeLayout
@ -444,7 +448,7 @@
android:layout_weight="1"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:background="#03A9F4"
android:background="@drawable/selector_red_bg"
android:layout_marginRight="10dp"
android:layout_marginBottom="10dp">
<ImageView
@ -470,9 +474,11 @@
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"
/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_null"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"
@ -510,7 +516,7 @@
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:padding="3dp"
android:background="@drawable/shape_red_radius_bg"
android:background="@drawable/selector_red_radius_bg"
android:orientation="horizontal"
app:layout_constraintTop_toTopOf="@+id/tv_03"
app:layout_constraintBottom_toBottomOf="@+id/tv_03"
@ -590,7 +596,7 @@
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_weight="1"
android:background="@drawable/shape_red_radius_bg"
android:background="@drawable/selector_red_radius_bg"
android:text="保存本地"
android:textColor="@color/white" />

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

@ -8,13 +8,14 @@
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_width="280dp"
android:layout_height="wrap_content"
android:text="众包录像 测试3"
android:textColor="#333"
android:layout_margin="20dp"
android:textSize="18sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView

18
app/src/main/res/layout/fragment_message.xml
View File

@ -13,6 +13,7 @@
android:background="#fff"
android:paddingTop="@dimen/top_pind_sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
@ -21,24 +22,27 @@
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:padding="10dp"
android:src="@drawable/ic_arrow_left" />
<!-- style="@style/text_style_toolbar_title"-->
<TextView
android:id="@+id/tv_message"
style="@style/text_style_toolbar_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginLeft="50dp"
android:text="消息"
android:textColor="#000" />
<TextView
android:id="@+id/tv_read"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="全部已读"
android:layout_marginTop="10dp"
android:textColor="@color/black"
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"/>
android:layout_marginTop="20dp"
android:layout_marginRight="10dp"
android:text="全部已读"
android:textColor="@color/black" />
</RelativeLayout>
<com.jcodecraeer.xrecyclerview.XRecyclerView
android:id="@+id/message_recycler"

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

@ -150,6 +150,7 @@
android:layout_marginLeft="15dp"
android:background="@null"
android:hint="任务名称"
android:textColor="@color/test_color_selector"
android:textSize="12sp" />
</LinearLayout>
@ -184,7 +185,7 @@
android:layout_width="150dp"
android:layout_height="100dp"
android:layout_margin="10dp"
android:background="#03A9F4"
android:background="@drawable/selector_red_bg"
android:gravity="center">
<ImageView
@ -217,7 +218,7 @@
android:layout_width="150dp"
android:layout_height="100dp"
android:layout_margin="10dp"
android:background="#03A9F4"
android:background="@drawable/selector_red_bg"
android:gravity="center">
<ImageView
@ -256,37 +257,38 @@
app:layout_constraintLeft_toLeftOf="@+id/tv_other_picture"
app:layout_constraintTop_toBottomOf="@id/ll_image_picture" />
<!-- <LinearLayout-->
<!-- android:id="@+id/linear_describe"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- -->
<!-- -->
<!-- android:layout_marginEnd="10dp"-->
<!-- -->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@id/tv_03">-->
<LinearLayout
android:id="@+id/linear_describe"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:background="@drawable/underline"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_03">
<EditText
android:id="@+id/edit_other_describe"
android:layout_width="320dp"
android:layout_height="100dp"
android:layout_marginTop="10dp"
android:background="@drawable/underline"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="2dp"
android:background="@color/white"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="top"
android:hint="任务描述"
android:paddingTop="10dp"
android:paddingLeft="10dp"
android:paddingTop="10dp"
android:paddingBottom="30dp"
app:layout_constraintLeft_toLeftOf="@+id/tv_03"
app:layout_constraintTop_toBottomOf="@+id/tv_03"
android:textColor="@color/test_color_selector"
android:textSize="15sp"
/>
<!-- </LinearLayout>-->
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
@ -299,7 +301,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/edit_other_describe">
app:layout_constraintTop_toBottomOf="@id/linear_describe">
<Button
android:id="@+id/btn_other_local"
@ -307,7 +309,7 @@
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_weight="1"
android:background="@drawable/shape_red_radius_bg"
android:background="@drawable/selector_red_radius_bg"
android:text="保存本地"
android:textColor="@color/white" />

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

@ -56,6 +56,7 @@
android:layout_width="200dp"
android:gravity="center_vertical"
android:layout_height="match_parent"
android:textSize="14sp"
android:background="@null" />
</LinearLayout>
@ -91,11 +92,13 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="@color/test_color_selector"
android:text="车行" />
<RadioButton
android:id="@+id/rb_bicycle"
android:layout_width="0dp"
android:textColor="@color/test_color_selector"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="自行车" />
@ -103,6 +106,7 @@
<RadioButton
android:id="@+id/rb_walking"
android:layout_width="0dp"
android:textColor="@color/test_color_selector"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="步行" />
@ -110,6 +114,7 @@
<RadioButton
android:id="@+id/rb_manual"
android:layout_width="0dp"
android:textColor="@color/test_color_selector"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="手动" />
@ -170,17 +175,36 @@
android:text="03.描述"
android:textColor="@color/black"
android:textSize="16sp" />
<LinearLayout
android:id="@+id/linear_describe"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:background="@drawable/underline"
app:layout_constraintTop_toBottomOf="@id/tv_03"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<EditText
android:id="@+id/et_desc"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="30dp"
android:layout_margin="2dp"
android:gravity="top"
android:paddingLeft="10dp"
android:paddingTop="10dp"
android:focusable="true"
android:focusableInTouchMode="true"
android:background="@color/white"
android:hint="任务描述"
android:textSize="15sp"
android:textColor="@color/test_color_selector"
<EditText
android:id="@+id/et_desc"
android:layout_width="320dp"
android:layout_height="100dp"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:background="@drawable/road_shape"
android:hint="任务描述"
android:paddingLeft="10dp"
android:paddingBottom="50dp" />
/>
</LinearLayout>
</LinearLayout>
<LinearLayout

10
app/src/main/res/layout/fragment_stay_submit.xml
View File

@ -9,7 +9,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_stay_type"
android:layout_width="match_parent"
android:layout_height="80dp"
android:layout_height="70dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@ -63,14 +63,14 @@
android:id="@+id/tv_stay_result"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="15dp"
android:layout_margin="10dp"
android:text="筛选结果"
android:textSize="25sp"
android:textStyle="bold" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="300dp">
android:layout_height="280dp">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/stay_xrv"
@ -97,7 +97,7 @@
style="@style/CheckBoxTheme"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="15dp"
android:layout_margin="10dp"
android:text="全选"
android:textSize="17sp" />
@ -105,7 +105,7 @@
android:id="@+id/tv_delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="15dp"
android:layout_margin="10dp"
android:text="删除"
android:textColor="@color/colorPrimaryBlue"
android:textSize="18sp" />

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

@ -1,44 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<!-- android:lines="1"-->
<TextView
android:id="@+id/tv_name"
android:layout_width="300dp"
android:layout_width="260dp"
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:text="测试彼此"
android:textColor="#333"
android:textSize="15sp"
android:lines="1"
app:layout_constraintRight_toLeftOf="@+id/tv_money"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<TextView
android:id="@+id/tv_form"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="道路"
android:padding="5dp"
android:textColor="#00BCD4"
android:background="@drawable/underline"
android:textSize="12sp"
android:layout_marginTop="5dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="5dp"
android:background="@drawable/underline"
android:padding="5dp"
android:text="道路"
android:textColor="#00BCD4"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_name"/>
app:layout_constraintTop_toBottomOf="@+id/tv_name" />
<TextView
android:id="@+id/tv_task_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:padding="5dp"
android:background="@drawable/underline"
android:padding="5dp"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="@+id/tv_form"
app:layout_constraintStart_toEndOf="@+id/tv_form"
@ -63,9 +61,10 @@
android:layout_marginRight="10dp"
android:text="￥3.5"
android:textColor="#000"
android:textSize="20sp"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintLeft_toRightOf="@+id/tv_name"
app:layout_constraintTop_toTopOf="parent" />
<TextView

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

@ -139,7 +139,7 @@
android:id="@+id/tv_site"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="地址*"
android:text="地址"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:textColor="#333"
@ -156,10 +156,11 @@
android:layout_centerVertical="true"
android:layout_marginLeft="18dp"
android:layout_toRightOf="@id/tv_site"
android:textColor="@color/test_color_selector"
android:background="@color/white"
android:hint="poi地址"
android:textSize="15sp"
android:textColor="#333" />
/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/linear_phone"
@ -261,7 +262,8 @@
android:layout_weight="1"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:background="#03A9F4"
android:background="@drawable/selector_red_bg"
android:layout_marginRight="10dp"
android:layout_marginBottom="10dp">
<ImageView
@ -284,6 +286,7 @@
/>
<ImageView
android:id="@+id/iv_panorama"
android:scaleType="fitXY"
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -295,7 +298,7 @@
android:layout_weight="1"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:background="#03A9F4"
android:background="@drawable/selector_red_bg"
android:layout_marginRight="10dp"
android:layout_marginBottom="10dp">
<ImageView
@ -318,6 +321,7 @@
/>
<ImageView
android:id="@+id/iv_name"
android:scaleType="fitXY"
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -329,7 +333,7 @@
android:layout_weight="1"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:background="#EFEDED"
android:background="@drawable/selector_hui_bg"
android:layout_marginRight="5dp"
android:layout_marginBottom="10dp">
<ImageView
@ -352,6 +356,7 @@
/>
<ImageView
android:id="@+id/iv_internal"
android:scaleType="fitXY"
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -369,7 +374,7 @@
android:layout_weight="1"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:background="#EFEDED"
android:background="@drawable/selector_hui_bg"
android:layout_marginRight="10dp"
android:layout_marginBottom="10dp">
<ImageView
@ -392,6 +397,7 @@
/>
<ImageView
android:id="@+id/iv_card"
android:scaleType="fitXY"
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -403,7 +409,7 @@
android:layout_weight="1"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:background="#EFEDED"
android:background="@drawable/selector_hui_bg"
android:layout_marginRight="5dp"
android:layout_marginBottom="10dp">
<ImageView
@ -426,6 +432,7 @@
/>
<ImageView
android:id="@+id/iv_else"
android:scaleType="fitXY"
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -475,6 +482,7 @@
android:background="@color/white"
android:hint="任务描述"
android:textSize="15sp"
android:textColor="@color/test_color_selector"
/>
@ -499,7 +507,7 @@
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_weight="1"
android:background="@drawable/shape_red_radius_bg"
android:background="@drawable/selector_red_radius_bg"
android:text="保存本地"
android:textColor="@color/white" />

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

@ -84,11 +84,13 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="@color/test_color_selector"
android:text="车行"/>
<RadioButton
android:id="@+id/rb_bicycle"
android:layout_width="0dp"
android:layout_weight="1"
android:textColor="@color/test_color_selector"
android:layout_height="wrap_content"
android:text="自行车"/>
<RadioButton
@ -96,11 +98,13 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="@color/test_color_selector"
android:text="步行"/>
<RadioButton
android:id="@+id/rb_manual"
android:layout_width="0dp"
android:layout_weight="1"
android:textColor="@color/test_color_selector"
android:layout_height="wrap_content"
android:text="手动"/>
</RadioGroup>
@ -205,17 +209,36 @@
android:text="04.描述"
android:textColor="@color/black"
android:textSize="16sp" />
<LinearLayout
android:id="@+id/linear_describe"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:background="@drawable/underline"
app:layout_constraintTop_toBottomOf="@id/tv_03"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<EditText
android:id="@+id/et_desc"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="30dp"
android:layout_margin="2dp"
android:gravity="top"
android:paddingLeft="10dp"
android:paddingTop="10dp"
android:focusable="true"
android:focusableInTouchMode="true"
android:background="@color/white"
android:hint="任务描述"
android:textSize="15sp"
android:textColor="@color/test_color_selector"
<EditText
android:id="@+id/et_desc"
android:layout_width="320dp"
android:layout_height="100dp"
android:layout_marginTop="10dp"
android:background="@drawable/road_shape"
android:hint="任务描述"
android:paddingLeft="10dp"
android:layout_marginLeft="10dp"
android:paddingBottom="50dp" />
/>
</LinearLayout>
</LinearLayout>
<LinearLayout

4
app/src/main/res/values/styles.xml
View File

@ -81,7 +81,7 @@
<!-- ‘我的-用户资料’方框设置-->
<style name="user_style">
<item name="android:background">@drawable/user_rz</item>
<item name="android:background">@drawable/selector_red_bg</item>
</style>
<!-- ‘我的-用户资料’字体设置-->
<style name="user_text_style">
@ -122,7 +122,7 @@
<item name="android:textStyle">bold</item>
</style>
<style name="user_data_style">
<item name="android:background">@drawable/user_style</item>
<item name="android:background">@drawable/selector_red_radius_bg</item>
<item name="android:textColor">@color/white</item>
</style>