diff --git a/app/build.gradle b/app/build.gradle
index 2185b44..1f64193 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,7 +13,7 @@ android {
minSdkVersion 24
targetSdkVersion 30
versionCode 45
- versionName "8.230203"
+ versionName "8.230204"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
ndk {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b3b0678..36b06e9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -81,6 +81,7 @@
android:exported="true"/>
diff --git a/app/src/main/java/com/navinfo/outdoor/activity/PhotographActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/PhotographActivity.java
index ba7f722..56119b2 100644
--- a/app/src/main/java/com/navinfo/outdoor/activity/PhotographActivity.java
+++ b/app/src/main/java/com/navinfo/outdoor/activity/PhotographActivity.java
@@ -109,7 +109,6 @@ public class PhotographActivity extends BaseActivity implements View.OnClickL
if (getIntent() != null) {
photo_path = getIntent().getStringExtra(Constant.INTENT_PHOTO_PATH);
}
- this.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
CameraLogger.setLogLevel(CameraLogger.LEVEL_VERBOSE);
cameraView = findViewById(R.id.camera);
cameraView.setOnClickListener(this);
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java
index b71ff9c..56c5fdc 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java
@@ -740,6 +740,17 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
HttpParams httpParams = new HttpParams();
httpParams.put("id", poiEntity.getTaskId());
showLoadingDialog();
+// // 隐藏半框弹出界面
+// Message obtain = Message.obtain();
+// obtain.what = Constant.GATHER_GET_RETURN;
+// obtain.obj = false;
+// EventBus.getDefault().post(obtain);
+// // 刷新地图
+// Message obtains = Message.obtain();
+// obtains.what = Constant.JOB_WORD_MONITOR;
+// obtains.obj = true;
+// EventBus.getDefault().post(obtains);
+// onBackPressed();
OkGoBuilder.getInstance()
.time(30)
.Builder(getActivity())
@@ -750,6 +761,12 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
.getRequest(new Callback() {
@Override
public void onSuccess(UnPolygonTaskBean response, int id) {
+ // 隐藏半框弹出界面
+ Message obtain = Message.obtain();
+ obtain.what = Constant.GATHER_GET_RETURN;
+ obtain.obj = false;
+ EventBus.getDefault().post(obtain);
+
dismissLoadingDialog();
if (response.getCode() == 200) {
ToastUtils.Message(getActivity(), "结束采集成功!");
@@ -757,17 +774,17 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
@Override
public void run() {
PoiDatabase.getInstance(getContext()).getPoiDao().deletePoiEntity(poiEntity);
- // 隐藏半框弹出界面
- Message obtain = Message.obtain();
- obtain.what = Constant.GATHER_GET_RETURN;
- obtain.obj = false;
- EventBus.getDefault().post(obtain);
- // 刷新地图
- Message obtains = Message.obtain();
- obtains.what = Constant.JOB_WORD_MONITOR;
- obtains.obj = true;
- EventBus.getDefault().post(obtains);
- onBackPressed();
+
+ getActivity().runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ // 刷新地图
+ Message obtains = Message.obtain();
+ obtains.what = Constant.JOB_WORD_MONITOR;
+ obtains.obj = true;
+ EventBus.getDefault().post(obtains);
+ }
+ });
}
}).start();
} else if (response.getCode() == 230) {