Merge remote-tracking branch 'OutDoor/httpSignore' into httpSignore
# Conflicts: # app/src/main/res/layout/poi_fragment.xml
This commit is contained in:
commit
f5155b11ac
@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
|
|||||||
android {
|
android {
|
||||||
compileSdkVersion 29
|
compileSdkVersion 29
|
||||||
buildToolsVersion '29.0.2'
|
buildToolsVersion '29.0.2'
|
||||||
//ndkVersion '23.0.7123448'
|
ndkVersion '23.0.7123448'
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "com.navinfo.outdoor"
|
applicationId "com.navinfo.outdoor"
|
||||||
|
@ -44,10 +44,10 @@ public class PoiTaskAdapter extends RecyclerView.Adapter<PoiTaskAdapter.ViewHold
|
|||||||
holder.tvAuditStatus.setText("审核通过");
|
holder.tvAuditStatus.setText("审核通过");
|
||||||
}else if (listBean.getAuditStatus() == 1){
|
}else if (listBean.getAuditStatus() == 1){
|
||||||
holder.tvAuditStatus.setText("审核未通过");
|
holder.tvAuditStatus.setText("审核未通过");
|
||||||
|
holder.tvMassage.setText(listBean.getAuditMsg());
|
||||||
}else if (listBean.getAuditStatus() == -1){
|
}else if (listBean.getAuditStatus() == -1){
|
||||||
holder.tvAuditStatus.setText("待审核");
|
holder.tvAuditStatus.setText("待审核");
|
||||||
}
|
}
|
||||||
holder.tvMassage.setText(listBean.getAuditMsg());
|
|
||||||
holder.tvMany.setText("¥0.0");
|
holder.tvMany.setText("¥0.0");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -53,6 +53,7 @@ import com.navinfo.outdoor.bean.ChargingStationBean;
|
|||||||
import com.navinfo.outdoor.bean.Info;
|
import com.navinfo.outdoor.bean.Info;
|
||||||
import com.navinfo.outdoor.bean.PhoneBean;
|
import com.navinfo.outdoor.bean.PhoneBean;
|
||||||
import com.navinfo.outdoor.bean.PoiUploadBean;
|
import com.navinfo.outdoor.bean.PoiUploadBean;
|
||||||
|
import com.navinfo.outdoor.bean.TaskNameBean;
|
||||||
import com.navinfo.outdoor.http.Callback;
|
import com.navinfo.outdoor.http.Callback;
|
||||||
import com.navinfo.outdoor.http.DialogCallback;
|
import com.navinfo.outdoor.http.DialogCallback;
|
||||||
import com.navinfo.outdoor.http.HttpInterface;
|
import com.navinfo.outdoor.http.HttpInterface;
|
||||||
@ -123,6 +124,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
|
|||||||
private LinearLayout linearContact;
|
private LinearLayout linearContact;
|
||||||
private ContactView contactView;
|
private ContactView contactView;
|
||||||
private ArrayList<File> chargingStationList;
|
private ArrayList<File> chargingStationList;
|
||||||
|
String str = "";
|
||||||
|
|
||||||
// private ArrayList<File> fileList;
|
// private ArrayList<File> fileList;
|
||||||
private File photoFile; // 拍照保存的路径
|
private File photoFile; // 拍照保存的路径
|
||||||
@ -770,7 +772,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
|
|||||||
}).start();
|
}).start();
|
||||||
break;
|
break;
|
||||||
case R.id.tv_examine:
|
case R.id.tv_examine:
|
||||||
Toast.makeText(getContext(), editNameContent.getText().toString(), Toast.LENGTH_SHORT).show();
|
findingDuplicateByWork();
|
||||||
break;
|
break;
|
||||||
case R.id.rl_panorama:
|
case R.id.rl_panorama:
|
||||||
Intent intentPanorama = new Intent("android.media.action.IMAGE_CAPTURE");
|
Intent intentPanorama = new Intent("android.media.action.IMAGE_CAPTURE");
|
||||||
@ -1124,7 +1126,50 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
|
|||||||
});
|
});
|
||||||
dismissDialog();
|
dismissDialog();
|
||||||
}
|
}
|
||||||
|
private void findingDuplicateByWork() {
|
||||||
|
showLoadingDialog();
|
||||||
|
HttpParams httpParams = new HttpParams();
|
||||||
|
String encode = Geohash.getInstance().encode(latLng.latitude, latLng.longitude);
|
||||||
|
httpParams.put("geo", encode);
|
||||||
|
httpParams.put("name", editNameContent.getText().toString());
|
||||||
|
OkGoBuilder.getInstance()
|
||||||
|
.Builder(getActivity())
|
||||||
|
.url(HttpInterface.TASK_NAME)
|
||||||
|
.cls(TaskNameBean.class)
|
||||||
|
.params(httpParams)
|
||||||
|
.token(Constant.ACCESS_TOKEN)
|
||||||
|
.getRequest(new Callback<TaskNameBean>() {
|
||||||
|
@Override
|
||||||
|
public void onSuccess(TaskNameBean taskNameBean, int id) {
|
||||||
|
dismissLoadingDialog();
|
||||||
|
if (taskNameBean.getCode()==200){
|
||||||
|
List<String> body = taskNameBean.getBody();
|
||||||
|
if (body!=null){
|
||||||
|
for (int i = 0; i < body.size(); i++) {
|
||||||
|
str +=body.get(i) + ",";
|
||||||
|
}
|
||||||
|
if (str!=null){
|
||||||
|
Toast.makeText(getContext(), "存在类似名称---"+str, Toast.LENGTH_SHORT).show();
|
||||||
|
str = "";
|
||||||
|
}else {
|
||||||
|
Toast.makeText(getContext(), "没有类似名称可以作业", Toast.LENGTH_SHORT).show();
|
||||||
|
}
|
||||||
|
}else {
|
||||||
|
Toast.makeText(getContext(), "没有类似名称可以作业", Toast.LENGTH_SHORT).show();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onError(Throwable e, int id) {
|
||||||
|
dismissLoadingDialog();
|
||||||
|
Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show();
|
||||||
|
Log.d("TAG", "onError: " + e.getMessage());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
dismissDialog();
|
||||||
|
}
|
||||||
private String initShowStation() {
|
private String initShowStation() {
|
||||||
PoiEntity poiEntity = initPoiEntityByUI(showPoiEntity);
|
PoiEntity poiEntity = initPoiEntityByUI(showPoiEntity);
|
||||||
String newPoiEntity = new Gson().toJson(poiEntity);
|
String newPoiEntity = new Gson().toJson(poiEntity);
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package com.navinfo.outdoor.fragment;
|
package com.navinfo.outdoor.fragment;
|
||||||
|
|
||||||
|
import android.content.Intent;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.os.CountDownTimer;
|
import android.os.CountDownTimer;
|
||||||
import android.os.Message;
|
import android.os.Message;
|
||||||
@ -12,6 +13,8 @@ import android.widget.Toast;
|
|||||||
|
|
||||||
import com.lzy.okgo.model.HttpParams;
|
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.LoginActivity;
|
||||||
import com.navinfo.outdoor.api.Constant;
|
import com.navinfo.outdoor.api.Constant;
|
||||||
import com.navinfo.outdoor.base.BaseFragment;
|
import com.navinfo.outdoor.base.BaseFragment;
|
||||||
import com.navinfo.outdoor.bean.MessageCodeBean;
|
import com.navinfo.outdoor.bean.MessageCodeBean;
|
||||||
@ -143,6 +146,8 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe
|
|||||||
obtain.what=Constant.REGISTER_WORD;
|
obtain.what=Constant.REGISTER_WORD;
|
||||||
obtain.obj = true;
|
obtain.obj = true;
|
||||||
EventBus.getDefault().post(obtain);
|
EventBus.getDefault().post(obtain);
|
||||||
|
Intent forgetIntent = new Intent(getContext(), LoginActivity.class);
|
||||||
|
startActivity(forgetIntent);
|
||||||
}
|
}
|
||||||
Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show();
|
Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show();
|
||||||
|
|
||||||
|
@ -8,7 +8,6 @@ import android.os.Bundle;
|
|||||||
import android.os.Message;
|
import android.os.Message;
|
||||||
import android.provider.MediaStore;
|
import android.provider.MediaStore;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.AdapterView;
|
import android.widget.AdapterView;
|
||||||
import android.widget.ArrayAdapter;
|
import android.widget.ArrayAdapter;
|
||||||
@ -38,9 +37,7 @@ import com.kongzue.dialog.interfaces.OnDialogButtonClickListener;
|
|||||||
import com.kongzue.dialog.util.BaseDialog;
|
import com.kongzue.dialog.util.BaseDialog;
|
||||||
import com.kongzue.dialog.util.DialogSettings;
|
import com.kongzue.dialog.util.DialogSettings;
|
||||||
import com.kongzue.dialog.v3.MessageDialog;
|
import com.kongzue.dialog.v3.MessageDialog;
|
||||||
import com.lzy.okgo.OkGo;
|
|
||||||
import com.lzy.okgo.model.HttpParams;
|
import com.lzy.okgo.model.HttpParams;
|
||||||
import com.lzy.okgo.model.Response;
|
|
||||||
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.api.Constant;
|
import com.navinfo.outdoor.api.Constant;
|
||||||
@ -51,7 +48,6 @@ import com.navinfo.outdoor.bean.PhoneBean;
|
|||||||
import com.navinfo.outdoor.bean.PoiSaveBean;
|
import com.navinfo.outdoor.bean.PoiSaveBean;
|
||||||
import com.navinfo.outdoor.bean.TaskNameBean;
|
import com.navinfo.outdoor.bean.TaskNameBean;
|
||||||
import com.navinfo.outdoor.http.Callback;
|
import com.navinfo.outdoor.http.Callback;
|
||||||
import com.navinfo.outdoor.http.DialogCallback;
|
|
||||||
import com.navinfo.outdoor.http.HttpInterface;
|
import com.navinfo.outdoor.http.HttpInterface;
|
||||||
import com.navinfo.outdoor.http.OkGoBuilder;
|
import com.navinfo.outdoor.http.OkGoBuilder;
|
||||||
import com.navinfo.outdoor.room.ChargingPileEntity;
|
import com.navinfo.outdoor.room.ChargingPileEntity;
|
||||||
@ -86,7 +82,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
|
|||||||
private RelativeLayout rlPanorama, rlName, rlInternalPhotos, rlCard, rlElse;
|
private RelativeLayout rlPanorama, rlName, rlInternalPhotos, rlCard, rlElse;
|
||||||
private ImageView ivPanorama, ivName, ivInternal, ivCard, ivElse;
|
private ImageView ivPanorama, ivName, ivInternal, ivCard, ivElse;
|
||||||
private TextView tvPanorama, tvPoiNamePic, tvInternal, tvCard, tvElse;
|
private TextView tvPanorama, tvPoiNamePic, tvInternal, tvCard, tvElse;
|
||||||
public TextView tvExamine;
|
public TextView tvPoiExamine;
|
||||||
private EditText editNameContent, editSiteContent;
|
private EditText editNameContent, editSiteContent;
|
||||||
private ArrayList<PhoneBean> poiBeans;
|
private ArrayList<PhoneBean> poiBeans;
|
||||||
private Button btnSaveLocal;
|
private Button btnSaveLocal;
|
||||||
@ -208,8 +204,8 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
|
|||||||
btnUploading.setOnClickListener(this::onClick);
|
btnUploading.setOnClickListener(this::onClick);
|
||||||
editNameContent = findViewById(R.id.tv_name_content);
|
editNameContent = findViewById(R.id.tv_name_content);
|
||||||
editSiteContent = findViewById(R.id.tv_site_content);
|
editSiteContent = findViewById(R.id.tv_site_content);
|
||||||
tvExamine = findViewById(R.id.tv_examine);
|
tvPoiExamine = findViewById(R.id.tv_poi_examine);
|
||||||
tvExamine.setOnClickListener(this::onClick);
|
tvPoiExamine.setOnClickListener(this::onClick);
|
||||||
editDescribe = findViewById(R.id.edit_describe);
|
editDescribe = findViewById(R.id.edit_describe);
|
||||||
ivPanorama = findViewById(R.id.iv_panorama);
|
ivPanorama = findViewById(R.id.iv_panorama);
|
||||||
tvPanorama = findViewById(R.id.tv_panorama);
|
tvPanorama = findViewById(R.id.tv_panorama);
|
||||||
@ -346,9 +342,9 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
|
|||||||
// 添加信息:
|
// 添加信息:
|
||||||
showPoiEntity = (PoiEntity) getArguments().getSerializable("poiEntity");
|
showPoiEntity = (PoiEntity) getArguments().getSerializable("poiEntity");
|
||||||
if (showPoiEntity.getTaskStatus() == 1 || showPoiEntity.getTaskStatus() == 5) {
|
if (showPoiEntity.getTaskStatus() == 1 || showPoiEntity.getTaskStatus() == 5) {
|
||||||
tvExamine.setVisibility(View.GONE);
|
tvPoiExamine.setVisibility(View.GONE);
|
||||||
} else {
|
} else {
|
||||||
tvExamine.setVisibility(View.VISIBLE);
|
tvPoiExamine.setVisibility(View.VISIBLE);
|
||||||
}
|
}
|
||||||
String name = showPoiEntity.getName();//名称
|
String name = showPoiEntity.getName();//名称
|
||||||
if (name != null && !name.equals("")) {
|
if (name != null && !name.equals("")) {
|
||||||
@ -497,7 +493,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
|
|||||||
public void disables() {
|
public void disables() {
|
||||||
checkBoxLife.setEnabled(false);
|
checkBoxLife.setEnabled(false);
|
||||||
editNameContent.setEnabled(false);
|
editNameContent.setEnabled(false);
|
||||||
tvExamine.setEnabled(false);
|
tvPoiExamine.setEnabled(false);
|
||||||
rlPanorama.setEnabled(false);//禁用拍照全景
|
rlPanorama.setEnabled(false);//禁用拍照全景
|
||||||
rlName.setEnabled(false);
|
rlName.setEnabled(false);
|
||||||
rlCard.setEnabled(false);
|
rlCard.setEnabled(false);
|
||||||
@ -593,7 +589,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
|
|||||||
}
|
}
|
||||||
}).start();
|
}).start();
|
||||||
break;
|
break;
|
||||||
case R.id.tv_examine:
|
case R.id.tv_poi_examine:
|
||||||
findingDuplicateByWork();
|
findingDuplicateByWork();
|
||||||
break;
|
break;
|
||||||
case R.id.rl_panorama:
|
case R.id.rl_panorama:
|
||||||
|
@ -383,10 +383,10 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
|
|||||||
|
|
||||||
|
|
||||||
private void poiVideoUpload(int poiVideoBody, File fileZip) {
|
private void poiVideoUpload(int poiVideoBody, File fileZip) {
|
||||||
if (poiVideoBody == 0) {
|
// if (poiVideoBody == 0) {
|
||||||
Toast.makeText(getActivity(), "请先保存本地在上传", Toast.LENGTH_SHORT).show();
|
// Toast.makeText(getActivity(), "请先保存本地在上传", Toast.LENGTH_SHORT).show();
|
||||||
return;
|
// return;
|
||||||
}
|
// }
|
||||||
if (fileZip == null) {
|
if (fileZip == null) {
|
||||||
Toast.makeText(getActivity(), "未压缩完成", Toast.LENGTH_SHORT).show();
|
Toast.makeText(getActivity(), "未压缩完成", Toast.LENGTH_SHORT).show();
|
||||||
return;
|
return;
|
||||||
|
@ -6,6 +6,7 @@ import android.os.CountDownTimer;
|
|||||||
import android.os.Message;
|
import android.os.Message;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.Button;
|
import android.widget.Button;
|
||||||
|
import android.widget.CheckBox;
|
||||||
import android.widget.EditText;
|
import android.widget.EditText;
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
@ -32,11 +33,12 @@ import org.greenrobot.eventbus.EventBus;
|
|||||||
*/
|
*/
|
||||||
public class RegisterFragment extends BaseFragment implements View.OnClickListener {
|
public class RegisterFragment extends BaseFragment implements View.OnClickListener {
|
||||||
private EditText etRegisterPhone, etRegisterNote, etRegisterReferrer, etRegisterPaw, etRegisterConfirmPaw;
|
private EditText etRegisterPhone, etRegisterNote, etRegisterReferrer, etRegisterPaw, etRegisterConfirmPaw;
|
||||||
private ImageView ivRegisterCheck, ivFinish;
|
private ImageView ivFinish;
|
||||||
private TextView haveGoLogin, registerGetNote;
|
private TextView haveGoLogin, registerGetNote;
|
||||||
private Button btnRegister;
|
private Button btnRegister;
|
||||||
private String sessionId;
|
private String sessionId;
|
||||||
private CountDownTimer timer;
|
private CountDownTimer timer;
|
||||||
|
private CheckBox ivRegisterCheck;
|
||||||
|
|
||||||
public static RegisterFragment newInstance(Bundle bundle) {
|
public static RegisterFragment newInstance(Bundle bundle) {
|
||||||
RegisterFragment fragment = new RegisterFragment();
|
RegisterFragment fragment = new RegisterFragment();
|
||||||
|
@ -114,8 +114,8 @@ public class HttpInterface {
|
|||||||
public static final String RECEIVED_POLYGON_TASK = IP+TASK_PATH + "polygonTask/"+USERID+"/receivedPolygontask"; //面状任务任务领取
|
public static final String RECEIVED_POLYGON_TASK = IP+TASK_PATH + "polygonTask/"+USERID+"/receivedPolygontask"; //面状任务任务领取
|
||||||
//172.23.139.4:8003/m4/task/1/unReceivedTask?taskIds=&auditIds=214,278 取消领取的接口
|
//172.23.139.4:8003/m4/task/1/unReceivedTask?taskIds=&auditIds=214,278 取消领取的接口
|
||||||
public static final String UNRECEIVED_POLYGON_TASK = IP+TASK_PATH + "m4/task/"+USERID+"/unReceivedTask";//所有类型结束领取
|
public static final String UNRECEIVED_POLYGON_TASK = IP+TASK_PATH + "m4/task/"+USERID+"/unReceivedTask";//所有类型结束领取
|
||||||
public static final String COMPLETE = IP+TASK_PATH + "polygonTask/"+USERID+"/complete";//面状任务任务采集
|
public static final String COMPLETE = IP+TASK_PATH + "polygonTask/"+USERID+"/complete";//面状任务结束采集
|
||||||
public static final String SUBMIT_POLYGON_TASK = IP+TASK_PATH + "polygonTask/"+USERID+"/submitPolygontask";//面状任务结束采集
|
public static final String SUBMIT_POLYGON_TASK = IP+TASK_PATH + "polygonTask/"+USERID+"/submitPolygontask";//面状任务立即采集
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* public static final String IPm8 = "http://172.23.139.4:8003/m4/";
|
* public static final String IPm8 = "http://172.23.139.4:8003/m4/";
|
||||||
|
@ -153,6 +153,7 @@
|
|||||||
android:background="@null"
|
android:background="@null"
|
||||||
android:hint="6-20位密码"
|
android:hint="6-20位密码"
|
||||||
android:paddingTop="10dp"
|
android:paddingTop="10dp"
|
||||||
|
android:inputType="textPassword"
|
||||||
android:layout_marginLeft="20dp"
|
android:layout_marginLeft="20dp"
|
||||||
android:paddingBottom="10dp"
|
android:paddingBottom="10dp"
|
||||||
android:textColorHint="@color/colorTransparent"
|
android:textColorHint="@color/colorTransparent"
|
||||||
@ -190,6 +191,7 @@
|
|||||||
android:hint="请再次输入一遍密码"
|
android:hint="请再次输入一遍密码"
|
||||||
android:paddingTop="10dp"
|
android:paddingTop="10dp"
|
||||||
android:paddingBottom="10dp"
|
android:paddingBottom="10dp"
|
||||||
|
android:inputType="textPassword"
|
||||||
android:textColorHint="@color/colorTransparent"
|
android:textColorHint="@color/colorTransparent"
|
||||||
android:textCursorDrawable="@drawable/text_color"
|
android:textCursorDrawable="@drawable/text_color"
|
||||||
android:layout_marginLeft="20dp"
|
android:layout_marginLeft="20dp"
|
||||||
|
@ -233,14 +233,15 @@
|
|||||||
android:layout_marginRight="50dp"
|
android:layout_marginRight="50dp"
|
||||||
app:layout_constraintTop_toBottomOf="@id/et_register_confirm_paw"
|
app:layout_constraintTop_toBottomOf="@id/et_register_confirm_paw"
|
||||||
app:layout_constraintLeft_toLeftOf="@id/et_register_confirm_paw"/>
|
app:layout_constraintLeft_toLeftOf="@id/et_register_confirm_paw"/>
|
||||||
<ImageView
|
|
||||||
|
<CheckBox
|
||||||
android:id="@+id/iv_register_check"
|
android:id="@+id/iv_register_check"
|
||||||
android:layout_width="20dp"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="20dp"
|
android:layout_height="wrap_content"
|
||||||
android:background="@drawable/select_check"
|
android:layout_marginTop="5dp"
|
||||||
|
android:buttonTint="@color/white"
|
||||||
app:layout_constraintTop_toBottomOf="@id/et_register_confirm_paw"
|
app:layout_constraintTop_toBottomOf="@id/et_register_confirm_paw"
|
||||||
app:layout_constraintLeft_toLeftOf="@id/et_register_confirm_paw"
|
app:layout_constraintLeft_toLeftOf="@id/et_register_confirm_paw" />
|
||||||
android:layout_marginTop="5dp"/>
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user