修改一级bug(部分)
This commit is contained in:
parent
9d4e5aa4e4
commit
afa832e6fd
@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
|
|||||||
android {
|
android {
|
||||||
compileSdkVersion 29
|
compileSdkVersion 29
|
||||||
buildToolsVersion '29.0.2'
|
buildToolsVersion '29.0.2'
|
||||||
//Version '23.0.7123448'
|
ndkVersion '23.0.7123448'
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "com.navinfo.outdoor"
|
applicationId "com.navinfo.outdoor"
|
||||||
|
@ -0,0 +1,67 @@
|
|||||||
|
package com.navinfo.outdoor.adapter;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
import android.widget.TextView;
|
||||||
|
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
|
import com.navinfo.outdoor.R;
|
||||||
|
import com.navinfo.outdoor.bean.HasSubmitBean;
|
||||||
|
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class PoiTaskAdapter extends RecyclerView.Adapter<PoiTaskAdapter.ViewHolder> {
|
||||||
|
private Context context;
|
||||||
|
private List<HasSubmitBean.BodyBean.ListBean> listBeans = new ArrayList<>();
|
||||||
|
|
||||||
|
public PoiTaskAdapter(Context context) {
|
||||||
|
this.context = context;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public void setListBeans(List<HasSubmitBean.BodyBean.ListBean> listBeans) {
|
||||||
|
this.listBeans.addAll(listBeans);
|
||||||
|
notifyDataSetChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@NotNull
|
||||||
|
@Override
|
||||||
|
public ViewHolder onCreateViewHolder(@NonNull @NotNull ViewGroup parent, int viewType) {
|
||||||
|
View inflate = LayoutInflater.from(context).inflate(R.layout.has_sumit_item, parent, false);
|
||||||
|
return new ViewHolder(inflate);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onBindViewHolder(@NonNull @NotNull ViewHolder holder, int position) {
|
||||||
|
HasSubmitBean.BodyBean.ListBean listBean = listBeans.get(position);
|
||||||
|
holder.tvnName.setText(listBean.getName());
|
||||||
|
holder.tvTime.setText(listBean.getCreateTime());
|
||||||
|
holder.tvMassage.setText(listBean.getAuditMsg());
|
||||||
|
holder.tvMany.setText(listBean.getAuditStatus());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getItemCount() {
|
||||||
|
return listBeans.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
public class ViewHolder extends RecyclerView.ViewHolder {
|
||||||
|
TextView tvnName, tvTime, tvMany, tvMassage;
|
||||||
|
|
||||||
|
public ViewHolder(@NonNull @NotNull View itemView) {
|
||||||
|
super(itemView);
|
||||||
|
tvnName = itemView.findViewById(R.id.tv_has_name);
|
||||||
|
tvTime = itemView.findViewById(R.id.tv_createTime);
|
||||||
|
tvMany = itemView.findViewById(R.id.tv_auditStatus);
|
||||||
|
tvMassage = itemView.findViewById(R.id.tv_auditMsg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
175
app/src/main/java/com/navinfo/outdoor/bean/HasSubmitBean.java
Normal file
175
app/src/main/java/com/navinfo/outdoor/bean/HasSubmitBean.java
Normal file
@ -0,0 +1,175 @@
|
|||||||
|
package com.navinfo.outdoor.bean;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class HasSubmitBean {
|
||||||
|
|
||||||
|
private Integer code;
|
||||||
|
private String message;
|
||||||
|
private BodyBean body;
|
||||||
|
|
||||||
|
public Integer getCode() {
|
||||||
|
return code;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCode(Integer code) {
|
||||||
|
this.code = code;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getMessage() {
|
||||||
|
return message;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setMessage(String message) {
|
||||||
|
this.message = message;
|
||||||
|
}
|
||||||
|
|
||||||
|
public BodyBean getBody() {
|
||||||
|
return body;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setBody(BodyBean body) {
|
||||||
|
this.body = body;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class BodyBean {
|
||||||
|
private Integer pageNum;
|
||||||
|
private Integer pageSize;
|
||||||
|
private Integer totalPage;
|
||||||
|
private Integer total;
|
||||||
|
private List<ListBean> list;
|
||||||
|
private Integer type;
|
||||||
|
private Integer auditedCount;
|
||||||
|
private Integer passCount;
|
||||||
|
private Integer notPassCount;
|
||||||
|
|
||||||
|
public Integer getPageNum() {
|
||||||
|
return pageNum;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPageNum(Integer pageNum) {
|
||||||
|
this.pageNum = pageNum;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer getPageSize() {
|
||||||
|
return pageSize;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPageSize(Integer pageSize) {
|
||||||
|
this.pageSize = pageSize;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer getTotalPage() {
|
||||||
|
return totalPage;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTotalPage(Integer totalPage) {
|
||||||
|
this.totalPage = totalPage;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer getTotal() {
|
||||||
|
return total;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTotal(Integer total) {
|
||||||
|
this.total = total;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<ListBean> getList() {
|
||||||
|
return list;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setList(List<ListBean> list) {
|
||||||
|
this.list = list;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer getType() {
|
||||||
|
return type;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setType(Integer type) {
|
||||||
|
this.type = type;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer getAuditedCount() {
|
||||||
|
return auditedCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setAuditedCount(Integer auditedCount) {
|
||||||
|
this.auditedCount = auditedCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer getPassCount() {
|
||||||
|
return passCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPassCount(Integer passCount) {
|
||||||
|
this.passCount = passCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer getNotPassCount() {
|
||||||
|
return notPassCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setNotPassCount(Integer notPassCount) {
|
||||||
|
this.notPassCount = notPassCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class ListBean {
|
||||||
|
private Integer auditStatus;
|
||||||
|
private String auditMsg;
|
||||||
|
private String name;
|
||||||
|
private Integer userId;
|
||||||
|
private String createTime;
|
||||||
|
private Integer type;
|
||||||
|
|
||||||
|
public Integer getAuditStatus() {
|
||||||
|
return auditStatus;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setAuditStatus(Integer auditStatus) {
|
||||||
|
this.auditStatus = auditStatus;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getAuditMsg() {
|
||||||
|
return auditMsg;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setAuditMsg(String auditMsg) {
|
||||||
|
this.auditMsg = auditMsg;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getName() {
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setName(String name) {
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer getUserId() {
|
||||||
|
return userId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setUserId(Integer userId) {
|
||||||
|
this.userId = userId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getCreateTime() {
|
||||||
|
return createTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCreateTime(String createTime) {
|
||||||
|
this.createTime = createTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer getType() {
|
||||||
|
return type;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setType(Integer type) {
|
||||||
|
this.type = type;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -560,7 +560,6 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
|
|||||||
latLng.setLatitude(Double.parseDouble(y));
|
latLng.setLatitude(Double.parseDouble(y));
|
||||||
latLng.setLongitude(Double.parseDouble(x));
|
latLng.setLongitude(Double.parseDouble(x));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
// 添加信息:
|
// 添加信息:
|
||||||
ChargingPileEntity chargingPileEntity = (ChargingPileEntity) getArguments().getSerializable("chargingPileEntity");
|
ChargingPileEntity chargingPileEntity = (ChargingPileEntity) getArguments().getSerializable("chargingPileEntity");
|
||||||
|
@ -2,14 +2,22 @@ package com.navinfo.outdoor.fragment;
|
|||||||
|
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import android.util.Log;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
import androidx.constraintlayout.widget.ConstraintLayout;
|
import androidx.constraintlayout.widget.ConstraintLayout;
|
||||||
|
|
||||||
|
import com.lzy.okgo.model.HttpParams;
|
||||||
import com.navinfo.outdoor.R;
|
import com.navinfo.outdoor.R;
|
||||||
import com.navinfo.outdoor.activity.FragmentManagement;
|
import com.navinfo.outdoor.activity.FragmentManagement;
|
||||||
import com.navinfo.outdoor.base.BaseFragment;
|
import com.navinfo.outdoor.base.BaseFragment;
|
||||||
|
import com.navinfo.outdoor.bean.HasSubmitBean;
|
||||||
|
import com.navinfo.outdoor.bean.TaskPrefectureBean;
|
||||||
|
import com.navinfo.outdoor.http.Callback;
|
||||||
|
import com.navinfo.outdoor.http.HttpInterface;
|
||||||
|
import com.navinfo.outdoor.http.OkGoBuilder;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 记录-已提交
|
* 记录-已提交
|
||||||
@ -35,12 +43,18 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
|
|||||||
private TextView otherAuditProcess;
|
private TextView otherAuditProcess;
|
||||||
private TextView otherAuditThrough;
|
private TextView otherAuditThrough;
|
||||||
private TextView otherAuditNotThrough;
|
private TextView otherAuditNotThrough;
|
||||||
|
private ConstraintLayout clPoiVideo;
|
||||||
|
private TextView tvPoiVideo;
|
||||||
|
private TextView poiVideoAuditProcess;
|
||||||
|
private TextView poiVideoAuditThrough;
|
||||||
|
private TextView poiVideoAuditProcessauditNotThrough;
|
||||||
|
|
||||||
public static HasSubmitFragment newInstance(Bundle bundle) {
|
public static HasSubmitFragment newInstance(Bundle bundle) {
|
||||||
HasSubmitFragment fragment = new HasSubmitFragment();
|
HasSubmitFragment fragment = new HasSubmitFragment();
|
||||||
fragment.setArguments(bundle);
|
fragment.setArguments(bundle);
|
||||||
return fragment;
|
return fragment;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected int getLayout() {
|
protected int getLayout() {
|
||||||
return R.layout.fragment_has_submit;
|
return R.layout.fragment_has_submit;
|
||||||
@ -53,6 +67,7 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
|
|||||||
auditProcess = (TextView) findViewById(R.id.audit_process);
|
auditProcess = (TextView) findViewById(R.id.audit_process);
|
||||||
auditThrough = (TextView) findViewById(R.id.audit_through);
|
auditThrough = (TextView) findViewById(R.id.audit_through);
|
||||||
auditNotThrough = (TextView) findViewById(R.id.audit_not_through);
|
auditNotThrough = (TextView) findViewById(R.id.audit_not_through);
|
||||||
|
|
||||||
clRoad = (ConstraintLayout) findViewById(R.id.cl_road);
|
clRoad = (ConstraintLayout) findViewById(R.id.cl_road);
|
||||||
clRoad.setOnClickListener(this::onClick);
|
clRoad.setOnClickListener(this::onClick);
|
||||||
roadAuditProcess = (TextView) findViewById(R.id.road_audit_process);
|
roadAuditProcess = (TextView) findViewById(R.id.road_audit_process);
|
||||||
@ -65,9 +80,178 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
|
|||||||
chargingAuditNotThrough = (TextView) findViewById(R.id.charging_audit_not_through);
|
chargingAuditNotThrough = (TextView) findViewById(R.id.charging_audit_not_through);
|
||||||
|
|
||||||
clOther = (ConstraintLayout) findViewById(R.id.cl_other);
|
clOther = (ConstraintLayout) findViewById(R.id.cl_other);
|
||||||
|
clOther.setOnClickListener(this::onClick);
|
||||||
otherAuditProcess = (TextView) findViewById(R.id.other_audit_process);
|
otherAuditProcess = (TextView) findViewById(R.id.other_audit_process);
|
||||||
otherAuditThrough = (TextView) findViewById(R.id.other_audit_through);
|
otherAuditThrough = (TextView) findViewById(R.id.other_audit_through);
|
||||||
otherAuditNotThrough = (TextView) findViewById(R.id.other_audit_not_through);
|
otherAuditNotThrough = (TextView) findViewById(R.id.other_audit_not_through);
|
||||||
|
|
||||||
|
clPoiVideo = (ConstraintLayout) findViewById(R.id.cl_poiVideo);
|
||||||
|
clPoiVideo.setOnClickListener(this::onClick);
|
||||||
|
tvPoiVideo = (TextView) findViewById(R.id.tv_poiVideo);
|
||||||
|
poiVideoAuditProcess = (TextView) findViewById(R.id.poiVideo_audit_process);
|
||||||
|
poiVideoAuditThrough = (TextView) findViewById(R.id.poiVideo_audit_through);
|
||||||
|
poiVideoAuditProcessauditNotThrough = (TextView) findViewById(R.id.poiVideo_audit_processaudit_not_through);
|
||||||
|
initPoiSubMitWork();//poi
|
||||||
|
initPoiVideoSubMitWork();//poi录像
|
||||||
|
initRoadSubMitWork();//道路录像
|
||||||
|
initChaningSubMitWork();//充电站录像
|
||||||
|
initOtherSubMitWork();//其他录像
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void initOtherSubMitWork() {
|
||||||
|
HttpParams httpParams = new HttpParams();
|
||||||
|
httpParams.put("type", "5");
|
||||||
|
httpParams.put("pageSize", "10");
|
||||||
|
httpParams.put("pageNum", "2");
|
||||||
|
OkGoBuilder.getInstance()
|
||||||
|
.Builder(getActivity())
|
||||||
|
.url(HttpInterface.GET_COMMIT_LIST)
|
||||||
|
.method(OkGoBuilder.GET)
|
||||||
|
.cls(HasSubmitBean.class)
|
||||||
|
.params(httpParams)
|
||||||
|
.callback(new Callback<HasSubmitBean>() {
|
||||||
|
@Override
|
||||||
|
public void onSuccess(HasSubmitBean hasSubmitBean, int id) {
|
||||||
|
dismissLoadingDialog();
|
||||||
|
HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody();
|
||||||
|
otherAuditProcess.setText(hasSubmitBeanBody.getAuditedCount()+"");
|
||||||
|
otherAuditThrough.setText(hasSubmitBeanBody.getPassCount()+"");
|
||||||
|
otherAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+"");
|
||||||
|
Log.d("TAG", "onSuccess: " + hasSubmitBean.getBody() + "");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onError(Throwable e, int id) {
|
||||||
|
dismissLoadingDialog();
|
||||||
|
Log.d("TAG", "onError: " + e.getMessage());
|
||||||
|
Toast.makeText(getContext(), "请求失败", Toast.LENGTH_SHORT).show();
|
||||||
|
}
|
||||||
|
}).build();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void initChaningSubMitWork() {
|
||||||
|
HttpParams httpParams = new HttpParams();
|
||||||
|
httpParams.put("type", "2");
|
||||||
|
httpParams.put("pageSize", "10");
|
||||||
|
httpParams.put("pageNum", "2");
|
||||||
|
OkGoBuilder.getInstance()
|
||||||
|
.Builder(getActivity())
|
||||||
|
.url(HttpInterface.GET_COMMIT_LIST)
|
||||||
|
.method(OkGoBuilder.GET)
|
||||||
|
.cls(HasSubmitBean.class)
|
||||||
|
.params(httpParams)
|
||||||
|
.callback(new Callback<HasSubmitBean>() {
|
||||||
|
@Override
|
||||||
|
public void onSuccess(HasSubmitBean hasSubmitBean, int id) {
|
||||||
|
dismissLoadingDialog();
|
||||||
|
HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody();
|
||||||
|
chargingAuditProcess.setText(hasSubmitBeanBody.getAuditedCount()+"");
|
||||||
|
chargingAuditThrough.setText(hasSubmitBeanBody.getPassCount()+"");
|
||||||
|
chargingAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+"");
|
||||||
|
Log.d("TAG", "onSuccess: " + hasSubmitBean.getBody() + "");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onError(Throwable e, int id) {
|
||||||
|
dismissLoadingDialog();
|
||||||
|
Log.d("TAG", "onError: " + e.getMessage());
|
||||||
|
Toast.makeText(getContext(), "请求失败", Toast.LENGTH_SHORT).show();
|
||||||
|
}
|
||||||
|
}).build();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void initRoadSubMitWork() {
|
||||||
|
HttpParams httpParams = new HttpParams();
|
||||||
|
httpParams.put("type", "4");
|
||||||
|
httpParams.put("pageSize", "10");
|
||||||
|
httpParams.put("pageNum", "2");
|
||||||
|
OkGoBuilder.getInstance()
|
||||||
|
.Builder(getActivity())
|
||||||
|
.url(HttpInterface.GET_COMMIT_LIST)
|
||||||
|
.method(OkGoBuilder.GET)
|
||||||
|
.cls(HasSubmitBean.class)
|
||||||
|
.params(httpParams)
|
||||||
|
.callback(new Callback<HasSubmitBean>() {
|
||||||
|
@Override
|
||||||
|
public void onSuccess(HasSubmitBean hasSubmitBean, int id) {
|
||||||
|
dismissLoadingDialog();
|
||||||
|
HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody();
|
||||||
|
roadAuditProcess.setText(hasSubmitBeanBody.getAuditedCount()+"");
|
||||||
|
roadAuditThrough.setText(hasSubmitBeanBody.getPassCount()+"");
|
||||||
|
roadAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+"");
|
||||||
|
Log.d("TAG", "onSuccess: " + hasSubmitBean.getBody() + "");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onError(Throwable e, int id) {
|
||||||
|
dismissLoadingDialog();
|
||||||
|
Log.d("TAG", "onError: " + e.getMessage());
|
||||||
|
Toast.makeText(getContext(), "请求失败", Toast.LENGTH_SHORT).show();
|
||||||
|
}
|
||||||
|
}).build();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void initPoiVideoSubMitWork() {
|
||||||
|
HttpParams httpParams = new HttpParams();
|
||||||
|
httpParams.put("type", "3");
|
||||||
|
httpParams.put("pageSize", "10");
|
||||||
|
httpParams.put("pageNum", "2");
|
||||||
|
OkGoBuilder.getInstance()
|
||||||
|
.Builder(getActivity())
|
||||||
|
.url(HttpInterface.GET_COMMIT_LIST)
|
||||||
|
.method(OkGoBuilder.GET)
|
||||||
|
.cls(HasSubmitBean.class)
|
||||||
|
.params(httpParams)
|
||||||
|
.callback(new Callback<HasSubmitBean>() {
|
||||||
|
@Override
|
||||||
|
public void onSuccess(HasSubmitBean hasSubmitBean, int id) {
|
||||||
|
dismissLoadingDialog();
|
||||||
|
HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody();
|
||||||
|
poiVideoAuditProcess.setText(hasSubmitBeanBody.getAuditedCount()+"");
|
||||||
|
poiVideoAuditThrough.setText(hasSubmitBeanBody.getPassCount()+"");
|
||||||
|
poiVideoAuditProcessauditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+"");
|
||||||
|
Log.d("TAG", "onSuccess: " + hasSubmitBean.getBody() + "");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onError(Throwable e, int id) {
|
||||||
|
dismissLoadingDialog();
|
||||||
|
Log.d("TAG", "onError: " + e.getMessage());
|
||||||
|
Toast.makeText(getContext(), "请求失败", Toast.LENGTH_SHORT).show();
|
||||||
|
}
|
||||||
|
}).build();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void initPoiSubMitWork() {
|
||||||
|
HttpParams httpParams = new HttpParams();
|
||||||
|
httpParams.put("type", "1");
|
||||||
|
httpParams.put("pageSize", "10");
|
||||||
|
httpParams.put("pageNum", "2");
|
||||||
|
OkGoBuilder.getInstance()
|
||||||
|
.Builder(getActivity())
|
||||||
|
.url(HttpInterface.GET_COMMIT_LIST)
|
||||||
|
.method(OkGoBuilder.GET)
|
||||||
|
.cls(HasSubmitBean.class)
|
||||||
|
.params(httpParams)
|
||||||
|
.callback(new Callback<HasSubmitBean>() {
|
||||||
|
@Override
|
||||||
|
public void onSuccess(HasSubmitBean hasSubmitBean, int id) {
|
||||||
|
dismissLoadingDialog();
|
||||||
|
HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody();
|
||||||
|
auditProcess.setText(hasSubmitBeanBody.getAuditedCount()+"");
|
||||||
|
auditThrough.setText(hasSubmitBeanBody.getPassCount()+"");
|
||||||
|
auditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+"");
|
||||||
|
Log.d("TAG", "onSuccess: " + hasSubmitBean.getBody() + "");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onError(Throwable e, int id) {
|
||||||
|
dismissLoadingDialog();
|
||||||
|
Log.d("TAG", "onError: " + e.getMessage());
|
||||||
|
Toast.makeText(getContext(), "请求失败", Toast.LENGTH_SHORT).show();
|
||||||
|
}
|
||||||
|
}).build();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -80,7 +264,7 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
|
|||||||
switch (v.getId()) {
|
switch (v.getId()) {
|
||||||
case R.id.cl_poi:
|
case R.id.cl_poi:
|
||||||
Intent hasIntent = new Intent(getContext(), FragmentManagement.class);
|
Intent hasIntent = new Intent(getContext(), FragmentManagement.class);
|
||||||
hasIntent.putExtra("tag",31);
|
hasIntent.putExtra("tag", 31);
|
||||||
startActivity(hasIntent);
|
startActivity(hasIntent);
|
||||||
break;
|
break;
|
||||||
case R.id.cl_road:
|
case R.id.cl_road:
|
||||||
@ -88,6 +272,12 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
|
|||||||
break;
|
break;
|
||||||
case R.id.cl_charging:
|
case R.id.cl_charging:
|
||||||
|
|
||||||
|
break;
|
||||||
|
case R.id.cl_other:
|
||||||
|
|
||||||
|
break;
|
||||||
|
case R.id.cl_poiVideo:
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1,10 @@
|
|||||||
package com.navinfo.outdoor.fragment;
|
package com.navinfo.outdoor.fragment;
|
||||||
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import android.util.Log;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
import androidx.recyclerview.widget.DividerItemDecoration;
|
import androidx.recyclerview.widget.DividerItemDecoration;
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||||
@ -10,19 +12,25 @@ import androidx.recyclerview.widget.LinearLayoutManager;
|
|||||||
import com.jcodecraeer.xrecyclerview.ArrowRefreshHeader;
|
import com.jcodecraeer.xrecyclerview.ArrowRefreshHeader;
|
||||||
import com.jcodecraeer.xrecyclerview.ProgressStyle;
|
import com.jcodecraeer.xrecyclerview.ProgressStyle;
|
||||||
import com.jcodecraeer.xrecyclerview.XRecyclerView;
|
import com.jcodecraeer.xrecyclerview.XRecyclerView;
|
||||||
|
import com.lzy.okgo.model.HttpParams;
|
||||||
import com.navinfo.outdoor.R;
|
import com.navinfo.outdoor.R;
|
||||||
|
import com.navinfo.outdoor.adapter.PoiTaskAdapter;
|
||||||
import com.navinfo.outdoor.adapter.TaskExplainAdapter2;
|
import com.navinfo.outdoor.adapter.TaskExplainAdapter2;
|
||||||
import com.navinfo.outdoor.base.BaseFragment;
|
import com.navinfo.outdoor.base.BaseFragment;
|
||||||
|
import com.navinfo.outdoor.bean.HasSubmitBean;
|
||||||
|
import com.navinfo.outdoor.bean.TaskPrefectureBean;
|
||||||
|
import com.navinfo.outdoor.http.Callback;
|
||||||
|
import com.navinfo.outdoor.http.HttpInterface;
|
||||||
|
import com.navinfo.outdoor.http.OkGoBuilder;
|
||||||
import com.umeng.commonsdk.debug.D;
|
import com.umeng.commonsdk.debug.D;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 记录-已提交-poi任务列表
|
* 记录-已提交-poi任务列表
|
||||||
*/
|
*/
|
||||||
public class PoiTaskFragment extends BaseFragment implements View.OnClickListener {
|
public class PoiTaskFragment extends BaseFragment implements View.OnClickListener {
|
||||||
|
|
||||||
|
|
||||||
private ImageView ivPoiTaskFinish;
|
private ImageView ivPoiTaskFinish;
|
||||||
private XRecyclerView poiTaskXrv;
|
private XRecyclerView poiTaskXrv;
|
||||||
|
private int type;
|
||||||
|
|
||||||
public static PoiTaskFragment newInstance(Bundle bundle) {
|
public static PoiTaskFragment newInstance(Bundle bundle) {
|
||||||
PoiTaskFragment fragment = new PoiTaskFragment();
|
PoiTaskFragment fragment = new PoiTaskFragment();
|
||||||
@ -48,6 +56,8 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene
|
|||||||
//取消上拉加载,刷新功能。
|
//取消上拉加载,刷新功能。
|
||||||
poiTaskXrv.setPullRefreshEnabled(false);
|
poiTaskXrv.setPullRefreshEnabled(false);
|
||||||
poiTaskXrv.setLoadingMoreEnabled(false);
|
poiTaskXrv.setLoadingMoreEnabled(false);
|
||||||
|
PoiTaskAdapter poiTaskAdapter = new PoiTaskAdapter(getContext());
|
||||||
|
poiTaskXrv.setAdapter(poiTaskAdapter);
|
||||||
|
|
||||||
poiTaskXrv.getDefaultFootView().setNoMoreHint("加载完毕");
|
poiTaskXrv.getDefaultFootView().setNoMoreHint("加载完毕");
|
||||||
poiTaskXrv.setLoadingListener(new XRecyclerView.LoadingListener() {
|
poiTaskXrv.setLoadingListener(new XRecyclerView.LoadingListener() {
|
||||||
@ -66,6 +76,36 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene
|
|||||||
@Override
|
@Override
|
||||||
protected void initData() {
|
protected void initData() {
|
||||||
super.initData();
|
super.initData();
|
||||||
|
// initWork(type);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void initWork(int type) {
|
||||||
|
HttpParams httpParams = new HttpParams();
|
||||||
|
httpParams.put("type", type);
|
||||||
|
httpParams.put("pageSize", "10");
|
||||||
|
httpParams.put("pageNum", "2");
|
||||||
|
OkGoBuilder.getInstance()
|
||||||
|
.Builder(getActivity())
|
||||||
|
.url(HttpInterface.GET_COMMIT_LIST)
|
||||||
|
.method(OkGoBuilder.GET)
|
||||||
|
.cls(HasSubmitBean.class)
|
||||||
|
.params(httpParams)
|
||||||
|
.callback(new Callback<HasSubmitBean>() {
|
||||||
|
@Override
|
||||||
|
public void onSuccess(HasSubmitBean hasSubmitBean, int id) {
|
||||||
|
dismissLoadingDialog();
|
||||||
|
|
||||||
|
|
||||||
|
Log.d("TAG", "onSuccess: " + hasSubmitBean.getBody() + "");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onError(Throwable e, int id) {
|
||||||
|
dismissLoadingDialog();
|
||||||
|
Log.d("TAG", "onError: " + e.getMessage());
|
||||||
|
Toast.makeText(getContext(), "请求失败", Toast.LENGTH_SHORT).show();
|
||||||
|
}
|
||||||
|
}).build();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -217,8 +217,6 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
|
|||||||
AWMp4ParserHelper.getInstance().loadFirstWithGlide(getActivity(), Uri.fromFile(videoFile).toString(), ivPoiVideoPicture, 500);
|
AWMp4ParserHelper.getInstance().loadFirstWithGlide(getActivity(), Uri.fromFile(videoFile).toString(), ivPoiVideoPicture, 500);
|
||||||
ivPoiVideoPicture.setTag(videoFile);
|
ivPoiVideoPicture.setTag(videoFile);
|
||||||
}
|
}
|
||||||
}else {
|
|
||||||
Toast.makeText(getContext(), "请先录像", Toast.LENGTH_SHORT).show();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//判断是否是已做完任务并保存成功
|
//判断是否是已做完任务并保存成功
|
||||||
|
@ -495,7 +495,6 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}).start();
|
}).start();
|
||||||
|
|
||||||
}else {
|
}else {
|
||||||
Toast.makeText(getContext(), ""+roadSaveBean.getMessage(), Toast.LENGTH_SHORT).show();
|
Toast.makeText(getContext(), ""+roadSaveBean.getMessage(), Toast.LENGTH_SHORT).show();
|
||||||
}
|
}
|
||||||
|
@ -85,6 +85,8 @@ public class HttpInterface {
|
|||||||
//172.23.139.4:8003/m4/task/1/taskName?geo=1rn7exd5uhxy&name=四维
|
//172.23.139.4:8003/m4/task/1/taskName?geo=1rn7exd5uhxy&name=四维
|
||||||
public static final String TASK_NAME = IPm6+"m4/task/1/taskName";//poi-查重
|
public static final String TASK_NAME = IPm6+"m4/task/1/taskName";//poi-查重
|
||||||
|
|
||||||
|
//172.23.139.4:8003/m4/task/1/getCommitList?type=2&pageSize=10&pageNum=1
|
||||||
|
public static final String GET_COMMIT_LIST = IPm6+"m4/task/1/getCommitList";
|
||||||
|
|
||||||
public static final String IPm7 = "http://dtxbmaps.navinfo.com/dtxb/user";
|
public static final String IPm7 = "http://dtxbmaps.navinfo.com/dtxb/user";
|
||||||
//172.23.139.4:8001/m4/userAuth/add
|
//172.23.139.4:8001/m4/userAuth/add
|
||||||
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
@ -109,6 +109,108 @@
|
|||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/iv_poi" />
|
app:layout_constraintTop_toBottomOf="@+id/iv_poi" />
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
|
android:id="@+id/cl_poiVideo"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginLeft="20dp"
|
||||||
|
android:layout_marginTop="20dp"
|
||||||
|
app:layout_constraintTop_toTopOf="parent">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/iv_poiVideo"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginEnd="10dp"
|
||||||
|
android:layout_marginBottom="20dp"
|
||||||
|
android:src="@drawable/poi_square"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toStartOf="@+id/tv_poiVideo"
|
||||||
|
app:layout_constraintLeft_toLeftOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tv_poiVideo"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginLeft="10dp"
|
||||||
|
android:text="POIVIDEO任务列表"
|
||||||
|
android:textColor="@color/black"
|
||||||
|
app:layout_constraintLeft_toRightOf="@id/iv_poiVideo"
|
||||||
|
app:layout_constraintTop_toTopOf="@id/iv_poiVideo" />
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@id/iv_poiVideo"
|
||||||
|
app:layout_constraintLeft_toLeftOf="@id/tv_poiVideo"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/iv_poiVideo">
|
||||||
|
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="审核中:"
|
||||||
|
android:textSize="12sp" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/poiVideo_audit_process"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="1"
|
||||||
|
android:textSize="12sp" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginLeft="30dp"
|
||||||
|
android:text="审核通过:"
|
||||||
|
android:textSize="12sp" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/poiVideo_audit_through"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="1"
|
||||||
|
android:textSize="12sp" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginLeft="30dp"
|
||||||
|
android:text="审核未通过:"
|
||||||
|
android:textSize="12sp" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/poiVideo_audit_processaudit_not_through"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="18"
|
||||||
|
android:textSize="12sp" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/poiVideoImageView"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:src="@drawable/icon_arrow_right"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@id/iv_poiVideo"
|
||||||
|
app:layout_constraintRight_toRightOf="@id/poiVideo_has_submit_view"
|
||||||
|
app:layout_constraintTop_toTopOf="@id/iv_poiVideo" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:id="@+id/poiVideo_has_submit_view"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="1dp"
|
||||||
|
android:layout_marginTop="20dp"
|
||||||
|
android:layout_marginRight="10dp"
|
||||||
|
android:background="@color/colormap"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@+id/iv_poiVideo" />
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
android:id="@+id/cl_road"
|
android:id="@+id/cl_road"
|
||||||
@ -147,7 +249,7 @@
|
|||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="match_parent"
|
||||||
android:text="审核中:"
|
android:text="审核中:"
|
||||||
android:textSize="12sp" />
|
android:textSize="12sp" />
|
||||||
|
|
||||||
|
38
app/src/main/res/layout/has_sumit_item.xml
Normal file
38
app/src/main/res/layout/has_sumit_item.xml
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_margin="10dp"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:id="@+id/tv_has_name"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:textColor="@color/black"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:layout_constraintLeft_toLeftOf="parent"
|
||||||
|
android:text="11111111111"/>
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:id="@+id/tv_createTime"
|
||||||
|
app:layout_constraintTop_toBottomOf="@+id/tv_has_name"
|
||||||
|
android:text="111111"
|
||||||
|
app:layout_constraintLeft_toLeftOf="@+id/tv_has_name"/>
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/tv_has_name"
|
||||||
|
app:layout_constraintRight_toRightOf="parent"
|
||||||
|
android:id="@+id/tv_auditStatus"
|
||||||
|
android:text="1111"/>
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="2222"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/tv_createTime"
|
||||||
|
android:id="@+id/tv_auditMsg"
|
||||||
|
app:layout_constraintRight_toRightOf="parent"/>
|
||||||
|
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
@ -19,7 +19,7 @@
|
|||||||
android:id="@+id/tv_01"
|
android:id="@+id/tv_01"
|
||||||
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:textColor="@color/black"
|
||||||
android:layout_margin="10dp"
|
android:layout_margin="10dp"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
@ -238,7 +238,7 @@
|
|||||||
android:id="@+id/tv_02"
|
android:id="@+id/tv_02"
|
||||||
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:textColor="@color/black"
|
||||||
android:layout_margin="10dp"
|
android:layout_margin="10dp"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
@ -454,7 +454,7 @@
|
|||||||
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:text="03描述"
|
android:text="03.描述"
|
||||||
android:textColor="@color/black"
|
android:textColor="@color/black"
|
||||||
android:layout_margin="10dp"
|
android:layout_margin="10dp"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user