From db9d341708a5ad4d2c5e8432615f6b840ae8f24a Mon Sep 17 00:00:00 2001
From: chenglifeng <clf_cheng@163.com>
Date: Mon, 14 Oct 2024 15:04:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=BE=E6=A0=B7=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E7=82=B9=E5=BA=93=E9=80=89=E7=82=B9=E6=8C=89=E9=92=AE=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E4=BA=8B=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../survey/ui/lofting/pointlofting/PointStakingActivity.java | 4 ++--
 app/src/main/res/layout/activity_staking_new_job.xml         | 5 -----
 app/src/main/res/layout/activity_staking_new_job2.xml        | 5 -----
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/project/survey/ui/lofting/pointlofting/PointStakingActivity.java b/app/src/main/java/com/project/survey/ui/lofting/pointlofting/PointStakingActivity.java
index 6284df5..ebf1f5a 100644
--- a/app/src/main/java/com/project/survey/ui/lofting/pointlofting/PointStakingActivity.java
+++ b/app/src/main/java/com/project/survey/ui/lofting/pointlofting/PointStakingActivity.java
@@ -229,13 +229,13 @@ public class PointStakingActivity extends BaseSurveyNewActivity {
                             StakingNewJobActivity.pickPoint(PointStakingActivity.this, (pointId, pointsListIndex, name, x, y, z) ->
                                     onPickedPoint(true, pointId, name, x, y, z));
                             break;
-                        case 2:
+                        case 1:
                             //工程全局控制点
                             ControlPointsNewActivity.pickPoint(PointStakingActivity.this, true, (pointId, name, code, x, y, z, remarks) -> {
                                 onPickedPoint(false, pointId, name, x, y, z);
                             });
                             break;
-                        case 3:
+                        case 2:
                             //测量点库
                             CoordinatePointsLibraryActivity.pickPoint(PointStakingActivity.this, (pointId, name, code, x, y, z, b, l, h) -> {
                                 onPickedPoint(false, pointId, name, x, y, z);
diff --git a/app/src/main/res/layout/activity_staking_new_job.xml b/app/src/main/res/layout/activity_staking_new_job.xml
index 715c53e..05d81a2 100644
--- a/app/src/main/res/layout/activity_staking_new_job.xml
+++ b/app/src/main/res/layout/activity_staking_new_job.xml
@@ -239,7 +239,6 @@
             style="@style/Widget.AppCompat.Button.Colored"
             android:layout_width="match_parent"
             android:layout_height="@dimen/bt_height"
-            android:textAppearance="@style/MyTextAppearanceBody1"
             android:layout_weight="1"
             android:text="@string/filter" />
 
@@ -248,7 +247,6 @@
             style="@style/Widget.AppCompat.Button.Colored"
             android:layout_width="match_parent"
             android:layout_height="@dimen/bt_height"
-            android:textAppearance="@style/MyTextAppearanceBody1"
             android:layout_weight="1"
             android:text="@string/create" />
 
@@ -257,7 +255,6 @@
             style="@style/Widget.AppCompat.Button.Colored"
             android:layout_width="match_parent"
             android:layout_height="@dimen/bt_height"
-            android:textAppearance="@style/MyTextAppearanceBody1"
             android:layout_weight="1"
             android:text="@string/delete" />
 
@@ -266,7 +263,6 @@
             style="@style/Widget.AppCompat.Button.Colored"
             android:layout_width="match_parent"
             android:layout_height="@dimen/bt_height"
-            android:textAppearance="@style/MyTextAppearanceBody1"
             android:layout_weight="1"
             android:text="@string/confirm" />
 
@@ -275,7 +271,6 @@
             style="@style/Widget.AppCompat.Button.Colored"
             android:layout_width="match_parent"
             android:layout_height="@dimen/bt_height"
-            android:textAppearance="@style/MyTextAppearanceBody1"
             android:layout_weight="1"
             android:text="@string/more" />
 
diff --git a/app/src/main/res/layout/activity_staking_new_job2.xml b/app/src/main/res/layout/activity_staking_new_job2.xml
index 81ebee1..6960359 100644
--- a/app/src/main/res/layout/activity_staking_new_job2.xml
+++ b/app/src/main/res/layout/activity_staking_new_job2.xml
@@ -234,7 +234,6 @@
             style="@style/Widget.AppCompat.Button.Colored"
             android:layout_width="match_parent"
             android:layout_height="@dimen/bt_height"
-            android:textAppearance="@style/MyTextAppearanceBody1"
             android:layout_weight="1"
             android:text="@string/filter" />
 
@@ -243,7 +242,6 @@
             style="@style/Widget.AppCompat.Button.Colored"
             android:layout_width="match_parent"
             android:layout_height="@dimen/bt_height"
-            android:textAppearance="@style/MyTextAppearanceBody1"
             android:layout_weight="1"
             android:text="@string/create" />
 
@@ -252,7 +250,6 @@
             style="@style/Widget.AppCompat.Button.Colored"
             android:layout_width="match_parent"
             android:layout_height="@dimen/bt_height"
-            android:textAppearance="@style/MyTextAppearanceBody1"
             android:layout_weight="1"
             android:text="@string/delete" />
 
@@ -261,7 +258,6 @@
             style="@style/Widget.AppCompat.Button.Colored"
             android:layout_width="match_parent"
             android:layout_height="@dimen/bt_height"
-            android:textAppearance="@style/MyTextAppearanceBody1"
             android:layout_weight="1"
             android:text="@string/confirm" />
 
@@ -270,7 +266,6 @@
             style="@style/Widget.AppCompat.Button.Colored"
             android:layout_width="match_parent"
             android:layout_height="@dimen/bt_height"
-            android:textAppearance="@style/MyTextAppearanceBody1"
             android:layout_weight="1"
             android:text="@string/more" />