[军测]

修复bug

app/build.gradle

@@ -18,7 +18,8 @@ android {
     defaultConfig {
         versionName "1.0.1"
         versionCode 1
-        applicationId "com.bingce.controlnetwork.pla"
+//        applicationId "com.bingce.controlnetwork.pla"
+        applicationId "com.bingce.controlnetwork"
         minSdkVersion AndroidSdk.minSdkVersion
         targetSdkVersion AndroidSdk.targetSdkVersion
         ndk {}

app/src/main/java/com/bingce/controlnetwork/adapter/ToleranceDetailAdapter.java

@@ -16,6 +16,7 @@ import com.bingce.controlnetwork.ui.vh.KeyBoolViewHolder;
 import com.bingce.controlnetwork.ui.vh.KeyValueViewHolder;
 import com.bingce.controlnetwork.ui.widget.ViewFactory;
 
+import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
 
@@ -119,6 +120,10 @@ public class ToleranceDetailAdapter extends BaseExpandableListAdapter {
         if (viewHolder instanceof KeyValueViewHolder) {
             KeyValueViewHolder kvHolder = (KeyValueViewHolder) viewHolder;
             kvHolder.key.setText(item.getName());
+
+//            BigDecimal bigDecimal = BigDecimal.valueOf(value);
+//            String plainString = bigDecimal.toPlainString();
+
             kvHolder.value.setText(item.getValue().toString());
         } else if (viewHolder instanceof KeyBoolViewHolder) {
             KeyBoolViewHolder kvHolder = (KeyBoolViewHolder) viewHolder;

app/src/main/java/com/bingce/controlnetwork/newui/adapter/PointListAdapter.java

@@ -40,10 +40,6 @@ public class PointListAdapter extends BaseAdapterNew<PointListViewHolder, PointR
             holder.mBinding.tvX.setVisibility(View.GONE);
             holder.mBinding.tvY.setVisibility(View.GONE);
             holder.mBinding.tvZ.setText("高程：" + pointRecordTj.getZ());
-        } else if (ProjectType.isHeightTraverse(projectType)) {
-            holder.mBinding.tvX.setText("经度:" + pointRecordTj.getLongitude());
-            holder.mBinding.tvY.setText("纬度:" + pointRecordTj.getLatitude());
-            holder.mBinding.tvZ.setText("高程:" + pointRecordTj.getZ());
         } else {
             holder.mBinding.tvX.setText("X:" + pointRecordTj.getX());
             holder.mBinding.tvY.setText("Y:" + pointRecordTj.getY());

app/src/main/java/com/bingce/controlnetwork/newui/configfragment/ConfigFragment.kt

@@ -29,7 +29,7 @@ class ConfigFragment : BaseFragmentBinding<NewFragmentConfigBinding>() {
     override fun initView() {
         //管理
         mBinding.ilInstrumentManagement.iv.setImageResource(R.mipmap.icon_ts_connecting)
-        mBinding.ilInstrumentManagement.tv.setText(R.string.instrument_management)
+        mBinding.ilInstrumentManagement.tv.setText(R.string.total_station_online)
         mBinding.ilPrismManagement.iv.setImageResource(R.mipmap.icon_prism_manager)
         mBinding.ilPrismManagement.tv.setText(R.string.prism_manager)
         mBinding.ilCustomTolerance.iv.setImageResource(R.mipmap.ic_tolerance_24)

app/src/main/java/com/bingce/controlnetwork/newui/createeditpoint/CreateEditPointActvity.kt

@@ -196,11 +196,11 @@ class CreateEditPointActvity : BaseBindingActivity<ActivityNewUiCreateEditPointB
             )
         } else if (ProjectType.isHeightTraverse(projectType)) {
             setBaseTitleHint(
-                R.string.longitude,
+                R.string.x_coord,
-                R.string.latitude,
+                R.string.y_coord,
                 R.string.elevation,
-                R.string.please_input_longitude,
+                R.string.please_input_x,
-                R.string.please_input_latitude,
+                R.string.please_input_y,
                 R.string.please_enter_elevation
             )
         } else {
@@ -319,7 +319,7 @@ class CreateEditPointActvity : BaseBindingActivity<ActivityNewUiCreateEditPointB
     private fun saveRecordForEdit(pointRecord: PointRecord, success: () -> Unit) {
         lifecycleScope.launch(Dispatchers.IO) {
             val projectType = getProjectType()
-            if (ProjectType.isLevel(projectType) || ProjectType.isHeightTraverse(projectType)) {
+            if (ProjectType.isLevel(projectType)) {
                 pointRecord.setLongitude(getXDouble())
                 pointRecord.setLatitude(getYDouble())
             } else {
@@ -363,7 +363,7 @@ class CreateEditPointActvity : BaseBindingActivity<ActivityNewUiCreateEditPointB
         orderIndex: Int,
     ): PointRecord {
         val projectType = getProjectType()
-        return if (ProjectType.isLevel(projectType) || ProjectType.isHeightTraverse(projectType)) {
+        return if (ProjectType.isLevel(projectType)) {
             PointRecord.createLlhPoint(projectId, pointType, name, x, y, z)
         } else {
             PointRecord.point(

app/src/main/res/values-zh/strings.xml

@@ -12,4 +12,5 @@
     <string name="please_choose">请选择</string>
     <string name="notice_list_left_swipe_edit_delete">注：列表左滑编辑、删除</string>
     <string name="notice_list_left_swipe_delete">注：列表左滑删除</string>
+    <string name="total_station_online">全站仪联机</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -12,4 +12,6 @@
     <string name="please_choose">Please choose</string>
     <string name="notice_list_left_swipe_edit_delete">Note: Swipe left on the list to delete it</string>
     <string name="notice_list_left_swipe_delete">Note: Swipe left on the list to delete it</string>
+    <string name="total_station_online">Total station online</string>
+
 </resources>