From ac1f627bca0fdb562bf4a2395bf6b9c4d45be524 Mon Sep 17 00:00:00 2001 From: Lizongdi <1210855344@qq.com> Date: Tue, 12 May 2026 09:57:29 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=BC=96=E8=AF=91=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E3=80=91=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=8D=95=E9=80=89?= =?UTF-8?q?=E6=A1=86=E7=94=A8=E4=BA=8E=E7=A1=AE=E8=AE=A4=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E5=8E=9F=E6=9C=89=E7=9A=84=E9=99=8D=E5=88=80?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=92=8C=E6=AD=A5=E8=BF=9B=E9=95=BF=E5=BA=A6?= =?UTF-8?q?=E5=85=B1=E7=94=A8=E4=B8=80=E4=B8=AA=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/diaoerqiegeapp/MainActivity.java | 26 ++++---- .../diaoerqiegeapp/models/DisplayPV.java | 3 +- .../diaoerqiegeapp/services/MyDataHelper.java | 5 +- .../src/main/res/layout/activity_polish.xml | 64 ++++++++----------- .../app/src/main/res/values/strings.xml | 1 - 5 files changed, 42 insertions(+), 57 deletions(-) diff --git a/diaoerqiege/diaoerqige_V1.0/app/src/main/java/com/example/diaoerqiegeapp/MainActivity.java b/diaoerqiege/diaoerqige_V1.0/app/src/main/java/com/example/diaoerqiegeapp/MainActivity.java index 528dfbd..6b91af0 100644 --- a/diaoerqiege/diaoerqige_V1.0/app/src/main/java/com/example/diaoerqiegeapp/MainActivity.java +++ b/diaoerqiege/diaoerqige_V1.0/app/src/main/java/com/example/diaoerqiegeapp/MainActivity.java @@ -54,7 +54,6 @@ public class MainActivity extends AppCompatActivity { myDataHelper.IntializeDataBasePolish(); //读取并显示数据 List pvList = myDataHelper.getDisplayDataPolish(1); //按id查询数据赋值给界面 - mainBinding.knifeDescent.setText(String.valueOf(pvList.get(0).getKinfeDescendHeight())); mainBinding.mainAxisSpeed.setText(String.valueOf(pvList.get(0).getMainAxisSpeed())); /*发往32*/ @@ -70,25 +69,25 @@ public class MainActivity extends AppCompatActivity { //必须有 _toSendPV = BspPV.PV_struct_define.newBuilder() .setRobotOperationMode(1) - .setKnifeDescendingHeight(1) + .setKnifeDescendingHeight(0) .setMainAxisSpeed(10) .setStepLen(1) .setScanLen(200) .setScanBackLen(10) .build(); - // 刀下降高度 - String knife_descent = mainBinding.knifeDescent.getText().toString(); - try { - if( knife_descent.isEmpty() ) {_toSendPV = _toSendPV.toBuilder().setKnifeDescendingHeight(1).build();} - - else { _toSendPV = _toSendPV.toBuilder() - .setKnifeDescendingHeight(Integer.parseInt(mainBinding.knifeDescent.getText().toString())).build(); - } + // 工作模式 + if (mainBinding.facadeAssignment.isChecked()) + { + _toSendPV = _toSendPV.toBuilder().setKnifeDescendingHeight(0).build(); } - catch (Exception e) + else if(mainBinding.planeAssignment.isChecked()) { - + _toSendPV = _toSendPV.toBuilder().setKnifeDescendingHeight(1).build(); + } + else + { + _toSendPV = _toSendPV.toBuilder().setKnifeDescendingHeight(0).build(); } // 强磨机主轴速度 @@ -245,11 +244,10 @@ public class MainActivity extends AppCompatActivity { //获取界面参数以写进数据库 int paraIndex = 1; // double verticalAdjust = Double.parseDouble(mainBinding.MaintvVerticalAdjustTo32.getText().toString()); - int knifeDescent = Integer.parseInt(mainBinding.knifeDescent.getText().toString()); int mainAxisSpeed = Integer.parseInt(mainBinding.mainAxisSpeed.getText().toString()); // 把界面中的值放进PV类的变量中 - DisplayPV displayPV = new DisplayPV(paraIndex, knifeDescent,mainAxisSpeed); + DisplayPV displayPV = new DisplayPV(paraIndex,mainAxisSpeed); myDataHelper.addOrUpdateDisplayDataPolish(displayPV); //创建数据库的实例在这里 PV传进去保存到数据库 // Toast.makeText(MainActivity.this, "保存成功", Toast.LENGTH_SHORT).show(); } diff --git a/diaoerqiege/diaoerqige_V1.0/app/src/main/java/com/example/diaoerqiegeapp/models/DisplayPV.java b/diaoerqiege/diaoerqige_V1.0/app/src/main/java/com/example/diaoerqiegeapp/models/DisplayPV.java index b0ed4cb..0583a4d 100644 --- a/diaoerqiege/diaoerqige_V1.0/app/src/main/java/com/example/diaoerqiegeapp/models/DisplayPV.java +++ b/diaoerqiege/diaoerqige_V1.0/app/src/main/java/com/example/diaoerqiegeapp/models/DisplayPV.java @@ -8,9 +8,8 @@ public class DisplayPV extends BaseObservable { private int KinfeDescendHeight; private int MainAxisSpeed; - public DisplayPV(int id, int knife_descent,int main_axis_speed) { + public DisplayPV(int id,int main_axis_speed) { this.id = id; - this.KinfeDescendHeight = knife_descent; this.MainAxisSpeed = main_axis_speed; } diff --git a/diaoerqiege/diaoerqige_V1.0/app/src/main/java/com/example/diaoerqiegeapp/services/MyDataHelper.java b/diaoerqiege/diaoerqige_V1.0/app/src/main/java/com/example/diaoerqiegeapp/services/MyDataHelper.java index 6144367..9c73a53 100644 --- a/diaoerqiege/diaoerqige_V1.0/app/src/main/java/com/example/diaoerqiegeapp/services/MyDataHelper.java +++ b/diaoerqiege/diaoerqige_V1.0/app/src/main/java/com/example/diaoerqiegeapp/services/MyDataHelper.java @@ -65,7 +65,7 @@ public class MyDataHelper extends SQLiteOpenHelper { for (int i = 1; i < 2; i++) { List list = getDisplayDataPolish(i); //从数据库中读 if (list.size() == 0) { - DisplayPV pv = new DisplayPV(i, 0, 0); + DisplayPV pv = new DisplayPV(i, 0); addOrUpdateDisplayDataPolish(pv);//一行一行添加 } } @@ -79,12 +79,11 @@ public class MyDataHelper extends SQLiteOpenHelper { Cursor cursor = sqLiteDatabase.rawQuery(sql, null); //按id查询 int idIndex = cursor.getColumnIndex(COLUMN_ID); - int _knifeDescendHeight = cursor.getColumnIndex(COLUMN_KINFE_DESCEND_HEIGHT); int _mainAxisSpeed = cursor.getColumnIndex(COLUMN_MAIN_AXIS_SPEED); while (cursor.moveToNext()) { - DisplayPV pv = new DisplayPV(cursor.getInt(idIndex), cursor.getInt(_knifeDescendHeight), + DisplayPV pv = new DisplayPV(cursor.getInt(idIndex), cursor.getInt(_mainAxisSpeed)); list.add(pv); diff --git a/diaoerqiege/diaoerqige_V1.0/app/src/main/res/layout/activity_polish.xml b/diaoerqiege/diaoerqige_V1.0/app/src/main/res/layout/activity_polish.xml index 7d58d4d..4292cfa 100644 --- a/diaoerqiege/diaoerqige_V1.0/app/src/main/res/layout/activity_polish.xml +++ b/diaoerqiege/diaoerqige_V1.0/app/src/main/res/layout/activity_polish.xml @@ -508,47 +508,37 @@ android:layout_height="match_parent" android:orientation="horizontal"> - + android:orientation="horizontal"> - + - - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="1" - android:background="@drawable/rounded_edittext" - android:gravity="center" - android:imeOptions="actionDone" - android:text="mm" - android:textColor="@color/dark_ink_blue" - android:textCursorDrawable="@drawable/my_cursor" - android:textSize="15dp" /> + diff --git a/diaoerqiege/diaoerqige_V1.0/app/src/main/res/values/strings.xml b/diaoerqiege/diaoerqige_V1.0/app/src/main/res/values/strings.xml index 684659f..e3387a3 100644 --- a/diaoerqiege/diaoerqige_V1.0/app/src/main/res/values/strings.xml +++ b/diaoerqiege/diaoerqige_V1.0/app/src/main/res/values/strings.xml @@ -10,7 +10,6 @@ 工作\n距离 安全\n距离 作业\n模式 - 下降\n高度 车体\n速度 刀具\n位置 扫描\n极值\n