diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b0ea484..8247473 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -202,6 +202,14 @@ android:name=".ui.instrument.mobilestationmode.base.RtkMatchingPointsActivity" android:exported="true" android:windowSoftInputMode="adjustResize|stateHidden" /> + + \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/ui/pointmeasure/measure/PointSurveyNewActivity.java b/app/src/main/java/com/project/survey/ui/pointmeasure/measure/PointSurveyNewActivity.java index 530531b..f035722 100644 --- a/app/src/main/java/com/project/survey/ui/pointmeasure/measure/PointSurveyNewActivity.java +++ b/app/src/main/java/com/project/survey/ui/pointmeasure/measure/PointSurveyNewActivity.java @@ -106,7 +106,9 @@ import lecho.hellocharts.model.LineChartData; import lecho.hellocharts.model.PointValue; import lecho.hellocharts.renderer.LineChartRenderer; - +/** + * 点测量 + */ public class PointSurveyNewActivity extends BaseSurveyNewActivity implements View.OnClickListener { private ActivityPointSurveyNewBinding binding; private List surveyBaseRecordPointList; @@ -1060,21 +1062,22 @@ public class PointSurveyNewActivity extends BaseSurveyNewActivity implements Vie public static void start(Context context) { ThreadPoolUtil.execute(() -> { - String projectId = CachedProject.currentProjectId(); - String roadId = CachedCurrentRoad.currentRoadId(projectId); - String jobId = CachedCurrentJob.currentJobId(projectId); - JobRecord jobRecord = JobDb.getInstance() - .rawQueryData(DBQueryConstant.findById(JobConstants.DB_NAME, jobId)); - if (jobRecord == null) { - BingCeErrorCode.toast(BingCeErrorCode.NO_CURRENT_JOB); - return; - } - +// String projectId = CachedProject.currentProjectId(); +// String roadId = CachedCurrentRoad.currentRoadId(projectId); +// String jobId = CachedCurrentJob.currentJobId(projectId); +// JobRecord jobRecord = JobDb.getInstance() +// .rawQueryData(DBQueryConstant.findById(JobConstants.DB_NAME, jobId)); +// if (jobRecord == null) { +// BingCeErrorCode.toast(BingCeErrorCode.NO_CURRENT_JOB); +// return; +// } + + // TODO: 2024/8/16 隐藏 Intent intent = new Intent(context, PointSurveyNewActivity.class); - intent.putExtra(KEY_JOB_NAME, jobRecord.name); - intent.putExtra(KEY_JOB_ID, jobId); - intent.putExtra(KEY_PROJECT_ID, projectId); - intent.putExtra(KEY_ROAD_ID, roadId); +// intent.putExtra(KEY_JOB_NAME, jobRecord.name); +// intent.putExtra(KEY_JOB_ID, jobId); + intent.putExtra(KEY_PROJECT_ID, "12121"); +// intent.putExtra(KEY_ROAD_ID, roadId); context.startActivity(intent); }); }