wangguannan
/
ShangHaiProjectSurvey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新建基准站设置 问题修复

Browse Source
main
chenglifeng 7 months ago
parent a510595e81
commit 5de59b5224
4 changed files with 333 additions and 61 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 180
      app/src/main/AndroidManifest.xml
  2. 101
      app/src/main/java/com/project/survey/ui/lofting/pointlofting/PointStakingActivity.java
  3. 7
      app/src/main/res/layout/sh_toolbar.xml
  4. 2
      app/src/main/res/values/styles.xml

180
app/src/main/AndroidManifest.xml
Unescape View File

@ -274,6 +274,186 @@
android:label="@string/connect_rtk"
android:launchMode="singleTask"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.rover.GeoRtkRoverSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_rover_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.base.RtkBaseSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_base_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.rover.RtkRoverSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_rover_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.base.GeoRtkBaseSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_base_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.rover.GeoRtkRoverSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_rover_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.base.ZhdRtkBaseSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_base_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.rover.ZhdRtkRoverSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_rover_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.base.SouthRtkBaseSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_base_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.rover.SouthRtkRoverSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_rover_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.base.DevecentRtkBaseSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_base_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.rover.DevecentRtkRoverSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_rover_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.base.HuaceRtkBaseSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_base_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.rover.HuaceRtkRoverSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_rover_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.base.ComnavRtkBaseSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_base_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.rover.ComnavRtkRoverSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_rover_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.base.GeomaxRtkBaseSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_base_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.rover.GeomaxRtkRoverSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_rover_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.base.IceGpsRtkBaseSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_base_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.rover.IceGpsRtkRoverSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_rover_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.base.TersusRtkBaseSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_base_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.rover.TersusRtkRoverSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_rover_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.base.SpectraRtkBaseSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_base_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.base.FJDRtkBaseSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_base_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.base.QxwzRtkBaseSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_base_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.rover.SpectraRtkRoverSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_rover_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.rover.QxwzLiteQuanFangRtkRoverSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_rover_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.staticc.RtkStaticSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_static_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.staticc.ComnavRtkStaticSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_static_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.staticc.FjdRtkStaticSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_static_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.staticc.GeoRtkStaticSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_static_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.staticc.HuaceRtkStaticSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_static_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.staticc.SouthRtkStaticSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_static_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.staticc.ZhdRtkStaticSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_static_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.rover.FJDRtkRoverSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_rover_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.rover.QxwzRtkRoverSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_rover_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name="com.project.survey.ui.instrument.mobilestationmode.rover.LianshiRtkRoverSettingActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/rtk_rover_setting"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
</application>
</manifest>

101
app/src/main/java/com/project/survey/ui/lofting/pointlofting/PointStakingActivity.java
Unescape View File

@ -57,6 +57,7 @@ import com.bingce.totalstation.TsConfig;
import com.bingce.utils.IntentUtil;
import com.bingce.utils.PointUtils;
import com.bingce.utils.SoundPoolUtil;
import com.bingce.utils.StringUtil;
import com.bingce.utils.ThreadPoolUtil;
import com.bingce.utils.Util;
import com.project.survey.App;
@ -85,6 +86,8 @@ import blankj.utilcode.util.ToastUtils;
import blankj.utilcode.util.Utils;
import cn.liuyanbing.surveyor.model.base.BasePoint;
import cn.liuyanbing.surveyor.model.util.CUtil;
import google.gson.Gson;
import google.gson.reflect.TypeToken;
import lecho.hellocharts.listener.LineChartOnValueSelectListener;
import lecho.hellocharts.model.Line;
import lecho.hellocharts.model.LineChartData;
@ -125,6 +128,7 @@ public class PointStakingActivity extends BaseSurveyNewActivity {
private final List<String> methodList = new ArrayList<>();
private SharedPreferences preferences;
private boolean isFirstUpdateChartView;
private boolean mStakingPointIsInMemory = false;
@Override
public View getContentView() {
@ -220,7 +224,8 @@ public class PointStakingActivity extends BaseSurveyNewActivity {
}
});
//点库选点
binding.pointLibrary.setOnClickListener(v ->
binding.pointLibrary.setOnClickListener(v -> {
if (mStakingPointIsInMemory) return;
CustomRecycleDialog.showDialog(PointStakingActivity.this, R.string.data_source, stringListLibraty, 0, false, (index, itemString) -> {
stopSoundPool();
switch (index) {
@ -242,7 +247,9 @@ public class PointStakingActivity extends BaseSurveyNewActivity {
});
break;
}
}));
});
});
//移动方法
showTopMoveMethod();
binding.tvMoveMethod.setOnClickListener(v -> {
@ -408,7 +415,69 @@ public class PointStakingActivity extends BaseSurveyNewActivity {
stringListLibraty.add(getString(R.string.global_control_point));
stringListLibraty.add(getString(R.string.point_survey_point_library));
// PointDb.getInstance().rawQueryListLiveData(PointConstants.findKnownPointByJob(jobId())).observe(this, pointRecords -> {
// surveyBasePointLine.getValues().clear();
// stakingPointLine.getValues().clear();
// recordPointLine.getValues().clear();
// effectGuideLine.getValues().clear();
// stakingLibraryPointList.clear();
// stakingLibraryPointList.addAll(pointRecords);
// for (int i = 0; i < stakingLibraryPointList.size(); i++) {
// PointRecord pointRecord = stakingLibraryPointList.get(i);
// surveyBasePointLine.getValues().add(new PointValue(pointRecord.y, pointRecord.x).setLabel(pointRecord.name));
// }
// if (stakingLibraryPointList.size() > 0) {
// targetStakePointRecord = stakingLibraryPointList.get(0);
// stakingPointLine.getValues().add(new PointValue(targetStakePointRecord.y, targetStakePointRecord.x).setLabel(targetStakePointRecord.name));
// updateBottomInfo(targetStakePointRecord.name, targetStakePointRecord.x, targetStakePointRecord.y, targetStakePointRecord.h);
// drawRecordPointLine();
// if (currentCoordinate != null) {
// drawCurrentPointLine(currentCoordinate.getX(), currentCoordinate.getY(), currentCoordinate.getZ());
// updateTopInfo(currentCoordinate);
// } else {
// showTopMoveMethod();
// }
// isTirpsAddSP = false;
// } else {
// targetStakePointRecord = null;
// binding.tvStakingPointName.setText(getString(R.string.staking_point_name));
// binding.tvTargetX.setText(TextFactory.fixedString("X"));
// binding.tvTargetY.setText(TextFactory.fixedString("Y"));
// binding.tvTargetZ.setText(TextFactory.fixedString("Z"));
// showTopMoveMethod();
// isTirpsAddSP = true;
// }
// ((LineChartRenderer) binding.lineChartView.getChartRenderer()).calculateMaxViewport(1.5f);
// binding.lineChartView.onChartDataChange();
// binding.lineChartView.setCurrentViewport(binding.lineChartView.getMaximumViewport());
// });
String targetPointList = IntentUtil.stringExtra(this, KEY_POINT_LIST);
if (StringUtil.isEmpty(targetPointList)) {
PointDb.getInstance().rawQueryListLiveData(PointConstants.findKnownPointByJob(jobId())).observe(this, pointRecords -> {
onPointRecordsUpdate(pointRecords);
});
} else {
mStakingPointIsInMemory = true;
Gson gson = new Gson();
List<StakingPoint> points = gson.fromJson(targetPointList, new TypeToken<List<StakingPoint>>() {
}.getType());
List<PointRecord> pointRecords = new ArrayList<>();
for (StakingPoint point : points) {
pointRecords.add(new PointRecord(
"", "", "",
point.getCategory(),
point.getName(),
"",
"",
point.getX(), point.getY(), point.getZ(),
0, 0, 0, PointConstants.POINT_FORMAT_XYZ, new DeviceInfoData()));
}
onPointRecordsUpdate(pointRecords);
}
}
private void onPointRecordsUpdate(List<PointRecord> pointRecords) {
surveyBasePointLine.getValues().clear();
stakingPointLine.getValues().clear();
recordPointLine.getValues().clear();
@ -443,7 +512,6 @@ public class PointStakingActivity extends BaseSurveyNewActivity {
((LineChartRenderer) binding.lineChartView.getChartRenderer()).calculateMaxViewport(1.5f);
binding.lineChartView.onChartDataChange();
binding.lineChartView.setCurrentViewport(binding.lineChartView.getMaximumViewport());
});
}
private void watchSurvey() {
@ -553,6 +621,23 @@ public class PointStakingActivity extends BaseSurveyNewActivity {
ToastUtils.showShort(getString(R.string.add_points_staking_point_first));
return;
}
if (mStakingPointIsInMemory) {
int currentIndex = -1;
for (int i = 0; i < stakingLibraryPointList.size(); i++) {
if (stakingLibraryPointList.get(i) == targetStakePointRecord) {
currentIndex = i;
break;
}
}
if (currentIndex == -1) {
return;
}
currentIndex += stakingLibraryPointList.size();
int targetIndex = (nextOrLast ? currentIndex + 1 : currentIndex - 1) % stakingLibraryPointList.size();
targetStakePointRecord = stakingLibraryPointList.get(targetIndex);
updateUI();
return;
}
ThreadPoolUtil.execute(() -> {
String projectId = CachedProject.currentProjectId();
String jobId = CachedCurrentJob.currentJobId(projectId);
@ -1132,6 +1217,16 @@ public class PointStakingActivity extends BaseSurveyNewActivity {
return IntentUtil.stringExtra(getIntent(), KEY_JOB_ID);
}
private static final String KEY_POINT_LIST = "key_point_list";
public static void start(Context context, List<StakingPoint> stakingPointList) {
Gson gson = new Gson();
Intent intent = new Intent(context, PointStakingActivity.class);
intent.putExtra(KEY_POINT_LIST, gson.toJson(stakingPointList));
context.startActivity(intent);
}
public static void start(Context context) {
ThreadPoolUtil.execute(() -> {
String projectId = CachedProject.currentProjectId();

7
app/src/main/res/layout/sh_toolbar.xml
Unescape View File

@ -4,10 +4,7 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?actionBarSize"
android:background="@color/transparent"
android:background="?attr/colorPrimary"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:titleTextAppearance="@style/ToolbarTextAppearance"
app:navigationIcon="@drawable/icon_toolbar_back"
app:titleCentered="true" />
app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />

2
app/src/main/res/values/styles.xml
Unescape View File

@ -121,7 +121,7 @@
<style name="ToolbarTextAppearance" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
<item name="android:textSize">@dimen/sw_15sp</item>
<item name="android:textColor">@color/text_color_20</item>
<item name="android:textColor">@color/text_color_ff</item>
</style>
</resources>

Write Preview
Loading…
Cancel
Save