xiaoyan159/NavinfoOutDoor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修改面状任务无法结束采集的问题，修改部分机型下拍照方向错误的问题

Browse Source
This commit is contained in:
xiaoyan 2023-02-06 17:40:48 +08:00
parent b2e5d6dd87
commit bee9fb9d59
4 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -13,7 +13,7 @@ android {
minSdkVersion 24 minSdkVersion 24
targetSdkVersion 30 targetSdkVersion 30
versionCode 45 versionCode 45
versionName "8.230203" versionName "8.230204"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
ndk { ndk {

1
app/src/main/AndroidManifest.xml
View File

@ -81,6 +81,7 @@
android:exported="true"/> android:exported="true"/>
<activity <activity
android:name=".activity.PhotographActivity" android:name=".activity.PhotographActivity"
android:screenOrientation="landscape"
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|navigation" android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|navigation"
android:launchMode="singleTop" android:launchMode="singleTop"
android:exported="true"/> android:exported="true"/>

1
app/src/main/java/com/navinfo/outdoor/activity/PhotographActivity.java
View File

@ -109,7 +109,6 @@ public class PhotographActivity extends BaseActivity implements View.OnClickL
if (getIntent() != null) { if (getIntent() != null) {
photo_path = getIntent().getStringExtra(Constant.INTENT_PHOTO_PATH); photo_path = getIntent().getStringExtra(Constant.INTENT_PHOTO_PATH);
} }
this.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
CameraLogger.setLogLevel(CameraLogger.LEVEL_VERBOSE); CameraLogger.setLogLevel(CameraLogger.LEVEL_VERBOSE);
cameraView = findViewById(R.id.camera); cameraView = findViewById(R.id.camera);
cameraView.setOnClickListener(this); cameraView.setOnClickListener(this);

29
app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java
View File

@ -740,6 +740,17 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
HttpParams httpParams = new HttpParams(); HttpParams httpParams = new HttpParams();
httpParams.put("id", poiEntity.getTaskId()); httpParams.put("id", poiEntity.getTaskId());
showLoadingDialog(); 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() OkGoBuilder.getInstance()
.time(30) .time(30)
.Builder(getActivity()) .Builder(getActivity())
@ -750,6 +761,12 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
.getRequest(new Callback<UnPolygonTaskBean>() { .getRequest(new Callback<UnPolygonTaskBean>() {
@Override @Override
public void onSuccess(UnPolygonTaskBean response, int id) { 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(); dismissLoadingDialog();
if (response.getCode() == 200) { if (response.getCode() == 200) {
ToastUtils.Message(getActivity(), "结束采集成功！"); ToastUtils.Message(getActivity(), "结束采集成功！");
@ -757,17 +774,17 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
@Override @Override
public void run() { public void run() {
PoiDatabase.getInstance(getContext()).getPoiDao().deletePoiEntity(poiEntity); PoiDatabase.getInstance(getContext()).getPoiDao().deletePoiEntity(poiEntity);
// 隐藏半框弹出界面
Message obtain = Message.obtain(); getActivity().runOnUiThread(new Runnable() {
obtain.what = Constant.GATHER_GET_RETURN; @Override
obtain.obj = false; public void run() {
EventBus.getDefault().post(obtain);
// 刷新地图 // 刷新地图
Message obtains = Message.obtain(); Message obtains = Message.obtain();
obtains.what = Constant.JOB_WORD_MONITOR; obtains.what = Constant.JOB_WORD_MONITOR;
obtains.obj = true; obtains.obj = true;
EventBus.getDefault().post(obtains); EventBus.getDefault().post(obtains);
onBackPressed(); }
});
} }
}).start(); }).start();
} else if (response.getCode() == 230) { } else if (response.getCode() == 230) {