diff --git a/app/build.gradle b/app/build.gradle
index 81cf51b..5e04152 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 29
buildToolsVersion '29.0.2'
- //ndkVersion '23.0.7123448'
+ ndkVersion '23.0.7123448'
defaultConfig {
applicationId "com.navinfo.outdoor"
diff --git a/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java
index c3e1fb9..18a59d4 100644
--- a/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java
+++ b/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java
@@ -44,10 +44,10 @@ public class PoiTaskAdapter extends RecyclerView.Adapter<PoiTaskAdapter.ViewHold
holder.tvAuditStatus.setText("审核通过");
}else if (listBean.getAuditStatus() == 1){
holder.tvAuditStatus.setText("审核未通过");
+ holder.tvMassage.setText(listBean.getAuditMsg());
}else if (listBean.getAuditStatus() == -1){
holder.tvAuditStatus.setText("待审核");
}
- holder.tvMassage.setText(listBean.getAuditMsg());
holder.tvMany.setText("￥0.0");
}
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java
index 9458adf..c37b25c 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java
@@ -53,6 +53,7 @@ import com.navinfo.outdoor.bean.ChargingStationBean;
import com.navinfo.outdoor.bean.Info;
import com.navinfo.outdoor.bean.PhoneBean;
import com.navinfo.outdoor.bean.PoiUploadBean;
+import com.navinfo.outdoor.bean.TaskNameBean;
import com.navinfo.outdoor.http.Callback;
import com.navinfo.outdoor.http.DialogCallback;
import com.navinfo.outdoor.http.HttpInterface;
@@ -123,6 +124,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
private LinearLayout linearContact;
private ContactView contactView;
private ArrayList<File> chargingStationList;
+ String str = "";
// private ArrayList<File> fileList;
private File photoFile; // 拍照保存的路径
@@ -770,7 +772,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
}).start();
break;
case R.id.tv_examine:
- Toast.makeText(getContext(), editNameContent.getText().toString(), Toast.LENGTH_SHORT).show();
+ findingDuplicateByWork();
break;
case R.id.rl_panorama:
Intent intentPanorama = new Intent("android.media.action.IMAGE_CAPTURE");
@@ -1124,7 +1126,50 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
});
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() {
PoiEntity poiEntity = initPoiEntityByUI(showPoiEntity);
String newPoiEntity = new Gson().toJson(poiEntity);
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java
index f8efa68..928e520 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java
@@ -1,5 +1,6 @@
package com.navinfo.outdoor.fragment;
+import android.content.Intent;
import android.os.Bundle;
import android.os.CountDownTimer;
import android.os.Message;
@@ -12,6 +13,8 @@ import android.widget.Toast;
import com.lzy.okgo.model.HttpParams;
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.base.BaseFragment;
import com.navinfo.outdoor.bean.MessageCodeBean;
@@ -143,6 +146,8 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe
obtain.what=Constant.REGISTER_WORD;
obtain.obj = true;
EventBus.getDefault().post(obtain);
+ Intent forgetIntent = new Intent(getContext(), LoginActivity.class);
+ startActivity(forgetIntent);
}
Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show();
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java
index b626780..3d5e950 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java
@@ -8,7 +8,6 @@ import android.os.Bundle;
import android.os.Message;
import android.provider.MediaStore;
import android.util.Log;
-import android.view.LayoutInflater;
import android.view.View;
import android.widget.AdapterView;
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.DialogSettings;
import com.kongzue.dialog.v3.MessageDialog;
-import com.lzy.okgo.OkGo;
import com.lzy.okgo.model.HttpParams;
-import com.lzy.okgo.model.Response;
import com.navinfo.outdoor.R;
import com.navinfo.outdoor.activity.FragmentManagement;
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.TaskNameBean;
import com.navinfo.outdoor.http.Callback;
-import com.navinfo.outdoor.http.DialogCallback;
import com.navinfo.outdoor.http.HttpInterface;
import com.navinfo.outdoor.http.OkGoBuilder;
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 ImageView ivPanorama, ivName, ivInternal, ivCard, ivElse;
private TextView tvPanorama, tvPoiNamePic, tvInternal, tvCard, tvElse;
- public TextView tvExamine;
+ public TextView tvPoiExamine;
private EditText editNameContent, editSiteContent;
private ArrayList<PhoneBean> poiBeans;
private Button btnSaveLocal;
@@ -208,8 +204,8 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
btnUploading.setOnClickListener(this::onClick);
editNameContent = findViewById(R.id.tv_name_content);
editSiteContent = findViewById(R.id.tv_site_content);
- tvExamine = findViewById(R.id.tv_examine);
- tvExamine.setOnClickListener(this::onClick);
+ tvPoiExamine = findViewById(R.id.tv_poi_examine);
+ tvPoiExamine.setOnClickListener(this::onClick);
editDescribe = findViewById(R.id.edit_describe);
ivPanorama = findViewById(R.id.iv_panorama);
tvPanorama = findViewById(R.id.tv_panorama);
@@ -346,9 +342,9 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
// 添加信息：
showPoiEntity = (PoiEntity) getArguments().getSerializable("poiEntity");
if (showPoiEntity.getTaskStatus() == 1 || showPoiEntity.getTaskStatus() == 5) {
- tvExamine.setVisibility(View.GONE);
+ tvPoiExamine.setVisibility(View.GONE);
} else {
- tvExamine.setVisibility(View.VISIBLE);
+ tvPoiExamine.setVisibility(View.VISIBLE);
}
String name = showPoiEntity.getName();//名称
if (name != null && !name.equals("")) {
@@ -497,7 +493,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
public void disables() {
checkBoxLife.setEnabled(false);
editNameContent.setEnabled(false);
- tvExamine.setEnabled(false);
+ tvPoiExamine.setEnabled(false);
rlPanorama.setEnabled(false);//禁用拍照全景
rlName.setEnabled(false);
rlCard.setEnabled(false);
@@ -593,7 +589,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
}
}).start();
break;
- case R.id.tv_examine:
+ case R.id.tv_poi_examine:
findingDuplicateByWork();
break;
case R.id.rl_panorama:
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java
index d1f49c5..49eba07 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java
@@ -383,10 +383,10 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
private void poiVideoUpload(int poiVideoBody, File fileZip) {
- if (poiVideoBody == 0) {
- Toast.makeText(getActivity(), "请先保存本地在上传", Toast.LENGTH_SHORT).show();
- return;
- }
+// if (poiVideoBody == 0) {
+// Toast.makeText(getActivity(), "请先保存本地在上传", Toast.LENGTH_SHORT).show();
+// return;
+// }
if (fileZip == null) {
Toast.makeText(getActivity(), "未压缩完成", Toast.LENGTH_SHORT).show();
return;
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java
index 5e0c353..22631f9 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java
@@ -6,6 +6,7 @@ import android.os.CountDownTimer;
import android.os.Message;
import android.view.View;
import android.widget.Button;
+import android.widget.CheckBox;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.TextView;
@@ -32,11 +33,12 @@ import org.greenrobot.eventbus.EventBus;
*/
public class RegisterFragment extends BaseFragment implements View.OnClickListener {
private EditText etRegisterPhone, etRegisterNote, etRegisterReferrer, etRegisterPaw, etRegisterConfirmPaw;
- private ImageView ivRegisterCheck, ivFinish;
+ private ImageView ivFinish;
private TextView haveGoLogin, registerGetNote;
private Button btnRegister;
private String sessionId;
private CountDownTimer timer;
+ private CheckBox ivRegisterCheck;
public static RegisterFragment newInstance(Bundle bundle) {
RegisterFragment fragment = new RegisterFragment();
diff --git a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java
index 7e737da..91cd47f 100644
--- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java
+++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java
@@ -114,8 +114,8 @@ public class HttpInterface {
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 取消领取的接口
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 SUBMIT_POLYGON_TASK = IP+TASK_PATH + "polygonTask/"+USERID+"/submitPolygontask";//面状任务结束采集
+ 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 IPm8 = "http://172.23.139.4:8003/m4/";
diff --git a/app/src/main/res/layout/fragment_forget_paw.xml b/app/src/main/res/layout/fragment_forget_paw.xml
index 445fe1a..6946565 100644
--- a/app/src/main/res/layout/fragment_forget_paw.xml
+++ b/app/src/main/res/layout/fragment_forget_paw.xml
@@ -153,6 +153,7 @@
android:background="@null"
android:hint="6-20位密码"
android:paddingTop="10dp"
+ android:inputType="textPassword"
android:layout_marginLeft="20dp"
android:paddingBottom="10dp"
android:textColorHint="@color/colorTransparent"
@@ -190,6 +191,7 @@
android:hint="请再次输入一遍密码"
android:paddingTop="10dp"
android:paddingBottom="10dp"
+ android:inputType="textPassword"
android:textColorHint="@color/colorTransparent"
android:textCursorDrawable="@drawable/text_color"
android:layout_marginLeft="20dp"
diff --git a/app/src/main/res/layout/fragment_register.xml b/app/src/main/res/layout/fragment_register.xml
index c36728f..a7f20e5 100644
--- a/app/src/main/res/layout/fragment_register.xml
+++ b/app/src/main/res/layout/fragment_register.xml
@@ -233,14 +233,15 @@
android:layout_marginRight="50dp"
app:layout_constraintTop_toBottomOf="@id/et_register_confirm_paw"
app:layout_constraintLeft_toLeftOf="@id/et_register_confirm_paw"/>
- <ImageView
+
+ <CheckBox
android:id="@+id/iv_register_check"
- android:layout_width="20dp"
- android:layout_height="20dp"
- android:background="@drawable/select_check"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="5dp"
+ android:buttonTint="@color/white"
app:layout_constraintTop_toBottomOf="@id/et_register_confirm_paw"
- app:layout_constraintLeft_toLeftOf="@id/et_register_confirm_paw"
- android:layout_marginTop="5dp"/>
+ app:layout_constraintLeft_toLeftOf="@id/et_register_confirm_paw" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"