diff --git a/app/build.gradle b/app/build.gradle
index 28885d9..7038bda 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
applicationId "com.navinfo.outdoor"
minSdkVersion 22
targetSdkVersion 30
- versionCode 19
- versionName "8.220414"
+ versionCode 21
+ versionName "8.220509"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
lintOptions {
@@ -36,6 +36,7 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
+ ndkVersion '21.3.6528147'
}
//efs {
// //是否对启动过程进程插桩的开关,如果使用自动集成监控则必须开启
diff --git a/app/src/main/assets/bank.json b/app/src/main/assets/bank.json
index 01f396d..807bca1 100644
--- a/app/src/main/assets/bank.json
+++ b/app/src/main/assets/bank.json
@@ -5,7 +5,6 @@
{"value":"105100000017","label":"中国建设银行股份有限公司总行"},
{"value":"301290000007","label":"交通银行股份有限公司"},
{"value":"403100000004","label":"中国邮政储蓄银行有限责任公司"},
- {"value":"304100040000","label":"华夏银行"},
{"value":"308584000013","label":"招商银行股份有限公司"},
{"value":"302100011000","label":"中信银行股份有限公司"},
{"value":"303100000006","label":"中国光大银行"},
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 ce82a1f..a6adb47 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java
@@ -582,7 +582,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
editNameContent.setOnFocusChangeListener(new View.OnFocusChangeListener() {
@Override
public void onFocusChange(View v, boolean hasFocus) {
- if (!hasFocus) {
+ if (!hasFocus&&showPoiEntity!=null&&showPoiEntity.getTaskId()==0) { // 只有自采集任务才需要自动查重
findingDuplicateByWork();
}
}
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 08e4918..d6d5694 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java
@@ -583,7 +583,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
editNameContent.setOnFocusChangeListener(new View.OnFocusChangeListener() {
@Override
public void onFocusChange(View v, boolean hasFocus) {
- if (!hasFocus) {
+ if (!hasFocus&&showPoiEntity!=null&&showPoiEntity.getTaskId()==0) { // 只有新增上报数据才需要自动查重
findingDuplicateByWork();
}
}
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java
index fa815c7..084d35b 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java
@@ -13,6 +13,8 @@ import android.widget.Button;
import android.widget.EditText;
import android.widget.FrameLayout;
import android.widget.ImageView;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
import android.widget.TextView;
import android.widget.Toast;
@@ -95,6 +97,9 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
private LatLng latLng, rearLatLng;
private StringBuilder roadBuilder;
private boolean booleanExtra = true;
+ private RadioButton rbtnRoadOpen/*道路已开通*/, rbtnRoadPartOpen/*道路部分开通*/, rbtnRoadHasntOpen/*道路未开通*/, rbtnRoadHasntFind/*道路未找到*/, rbtnRoadOther/*其他*/;
+ private RadioGroup rgRoadStatus; // 道路状态的radioGroup
+ private EditText edtCheckedOther;
public static RoadFragment newInstance(Bundle bundle) {
RoadFragment fragment = new RoadFragment();
@@ -210,6 +215,30 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
@Override
protected void initView() {
super.initView();
+ rbtnRoadOpen = findViewById(R.id.rbtn_road_open);
+ rbtnRoadPartOpen = findViewById(R.id.rbtn_road_part_open);
+ rbtnRoadHasntOpen = findViewById(R.id.rbtn_road_hasnt_open);
+ rbtnRoadHasntFind = findViewById(R.id.rbtn_road_hasnt_find);
+ rbtnRoadOther = findViewById(R.id.rbtn_road_other);
+ rgRoadStatus = findViewById(R.id.rg_road_status);
+ edtCheckedOther = findViewById(R.id.edt_checked_other);
+
+ rgRoadStatus.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+ @Override
+ public void onCheckedChanged(RadioGroup group, int checkedId) {
+ rgRoadStatus.setTag(findViewById(checkedId).getTag());
+ switch (checkedId) {
+ case R.id.rbtn_road_other:
+ edtCheckedOther.setVisibility(View.VISIBLE);
+ break;
+ default:
+ edtCheckedOther.setVisibility(View.GONE);
+ break;
+ }
+ }
+ });
+
+
tvPictures = findViewById(R.id.tv_pictures);
tvPictures.setOnClickListener(this);
setSlidingUpPanelLayout(Constant.SLIDING_LAYOUT);
@@ -595,6 +624,10 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
httpParams.put("address", poiEntity.getAddress());
httpParams.put("workType", 0);
httpParams.put("memo", poiEntity.getMemo());
+ // 增加对应九天平台的参数
+ httpParams.put("existence", rgRoadStatus.getTag().toString());
+ httpParams.put("description", edtCheckedOther!=null&&edtCheckedOther.isShown()? edtCheckedOther.getText().toString().trim(): "");
+
OkGoBuilder okGoBuilder = OkGoBuilder.getInstance()
.time(30)
.Builder(getActivity())
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 0863505..d24b38c 100644
--- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java
+++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java
@@ -1,7 +1,8 @@
package com.navinfo.outdoor.http;
public class HttpInterface {
- public static final String IP1 = "http://172.23.139.129:9999/m4";//测试接口
+ public static final String IP2 = "http://172.23.139.129:9999/m4";//测试接口
+ public static final String IP1 = "http://dtxbmaps.navinfo.com/dtxb/dev/m4";//测试接口-外网
public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口
public static final String USER_PATH = "/user/";//我的
public static final String MSG_LIST_PATH = "/msgList/";//发现
diff --git a/app/src/main/res/layout/fragment_road.xml b/app/src/main/res/layout/fragment_road.xml
index 32903ba..8031c8a 100644
--- a/app/src/main/res/layout/fragment_road.xml
+++ b/app/src/main/res/layout/fragment_road.xml
@@ -120,7 +120,6 @@
android:scaleType="fitXY" />
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -182,7 +249,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/ll_desc">
+ app:layout_constraintTop_toBottomOf="@id/ll_info">