diff --git a/app/build.gradle b/app/build.gradle index fb13ba0..bc79962 100644 --- a/app/build.gradle +++ b/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 {} diff --git a/app/src/main/java/com/bingce/controlnetwork/adapter/ToleranceDetailAdapter.java b/app/src/main/java/com/bingce/controlnetwork/adapter/ToleranceDetailAdapter.java index 0cadcab..1bdcb0e 100644 --- a/app/src/main/java/com/bingce/controlnetwork/adapter/ToleranceDetailAdapter.java +++ b/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; diff --git a/app/src/main/java/com/bingce/controlnetwork/newui/adapter/PointListAdapter.java b/app/src/main/java/com/bingce/controlnetwork/newui/adapter/PointListAdapter.java index 5d958a9..2c615a1 100644 --- a/app/src/main/java/com/bingce/controlnetwork/newui/adapter/PointListAdapter.java +++ b/app/src/main/java/com/bingce/controlnetwork/newui/adapter/PointListAdapter.java @@ -40,10 +40,6 @@ public class PointListAdapter extends BaseAdapterNew() { 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) diff --git a/app/src/main/java/com/bingce/controlnetwork/newui/createeditpoint/CreateEditPointActvity.kt b/app/src/main/java/com/bingce/controlnetwork/newui/createeditpoint/CreateEditPointActvity.kt index adc8df2..a5a2eab 100644 --- a/app/src/main/java/com/bingce/controlnetwork/newui/createeditpoint/CreateEditPointActvity.kt +++ b/app/src/main/java/com/bingce/controlnetwork/newui/createeditpoint/CreateEditPointActvity.kt @@ -196,11 +196,11 @@ class CreateEditPointActvity : BaseBindingActivity 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请选择 注:列表左滑编辑、删除 注:列表左滑删除 + 全站仪联机 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0de26df..1d72e8d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -12,4 +12,6 @@ Please choose Note: Swipe left on the list to delete it Note: Swipe left on the list to delete it + Total station online + \ No newline at end of file