LiZongdi
/
Huangjiabao_backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

【编译通过】增加一个单选框用于确认工作面，原有的降刀参数和步进长度共用一个参数

master
Lizongdi 1 month ago
parent
5627f9c2af
commit
ac1f627bca
5 changed files with 42 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      diaoerqiege/diaoerqige_V1.0/app/src/main/java/com/example/diaoerqiegeapp/MainActivity.java
  2. 3
      diaoerqiege/diaoerqige_V1.0/app/src/main/java/com/example/diaoerqiegeapp/models/DisplayPV.java
  3. 5
      diaoerqiege/diaoerqige_V1.0/app/src/main/java/com/example/diaoerqiegeapp/services/MyDataHelper.java
  4. 64
      diaoerqiege/diaoerqige_V1.0/app/src/main/res/layout/activity_polish.xml
  5. 1
      diaoerqiege/diaoerqige_V1.0/app/src/main/res/values/strings.xml

26
diaoerqiege/diaoerqige_V1.0/app/src/main/java/com/example/diaoerqiegeapp/MainActivity.java
View File

@ -54,7 +54,6 @@ public class MainActivity extends AppCompatActivity {
myDataHelper.IntializeDataBasePolish(); myDataHelper.IntializeDataBasePolish();
//读取并显示数据 //读取并显示数据
List<DisplayPV> pvList = myDataHelper.getDisplayDataPolish(1); //按id查询数据赋值给界面 List<DisplayPV> pvList = myDataHelper.getDisplayDataPolish(1); //按id查询数据赋值给界面
mainBinding.knifeDescent.setText(String.valueOf(pvList.get(0).getKinfeDescendHeight()));
mainBinding.mainAxisSpeed.setText(String.valueOf(pvList.get(0).getMainAxisSpeed())); mainBinding.mainAxisSpeed.setText(String.valueOf(pvList.get(0).getMainAxisSpeed()));
/*发往32*/ /*发往32*/
@ -70,25 +69,25 @@ public class MainActivity extends AppCompatActivity {
//必须有 //必须有
_toSendPV = BspPV.PV_struct_define.newBuilder() _toSendPV = BspPV.PV_struct_define.newBuilder()
.setRobotOperationMode(1) .setRobotOperationMode(1)
.setKnifeDescendingHeight(1) .setKnifeDescendingHeight(0)
.setMainAxisSpeed(10) .setMainAxisSpeed(10)
.setStepLen(1) .setStepLen(1)
.setScanLen(200) .setScanLen(200)
.setScanBackLen(10) .setScanBackLen(10)
.build(); .build();
// 刀下降高度 // 工作模式
String knife_descent = mainBinding.knifeDescent.getText().toString(); if (mainBinding.facadeAssignment.isChecked())
try { {
if( knife_descent.isEmpty() ) {_toSendPV = _toSendPV.toBuilder().setKnifeDescendingHeight(1).build();} _toSendPV = _toSendPV.toBuilder().setKnifeDescendingHeight(0).build();
else { _toSendPV = _toSendPV.toBuilder()
.setKnifeDescendingHeight(Integer.parseInt(mainBinding.knifeDescent.getText().toString())).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; int paraIndex = 1;
// double verticalAdjust = Double.parseDouble(mainBinding.MaintvVerticalAdjustTo32.getText().toString()); // double verticalAdjust = Double.parseDouble(mainBinding.MaintvVerticalAdjustTo32.getText().toString());
int knifeDescent = Integer.parseInt(mainBinding.knifeDescent.getText().toString());
int mainAxisSpeed = Integer.parseInt(mainBinding.mainAxisSpeed.getText().toString()); int mainAxisSpeed = Integer.parseInt(mainBinding.mainAxisSpeed.getText().toString());
// 把界面中的值放进PV类的变量中 // 把界面中的值放进PV类的变量中
DisplayPV displayPV = new DisplayPV(paraIndex, knifeDescent,mainAxisSpeed); DisplayPV displayPV = new DisplayPV(paraIndex,mainAxisSpeed);
myDataHelper.addOrUpdateDisplayDataPolish(displayPV); //创建数据库的实例在这里 PV传进去保存到数据库 myDataHelper.addOrUpdateDisplayDataPolish(displayPV); //创建数据库的实例在这里 PV传进去保存到数据库
// Toast.makeText(MainActivity.this, "保存成功", Toast.LENGTH_SHORT).show(); // Toast.makeText(MainActivity.this, "保存成功", Toast.LENGTH_SHORT).show();
} }

3
diaoerqiege/diaoerqige_V1.0/app/src/main/java/com/example/diaoerqiegeapp/models/DisplayPV.java
View File

@ -8,9 +8,8 @@ public class DisplayPV extends BaseObservable {
private int KinfeDescendHeight; private int KinfeDescendHeight;
private int MainAxisSpeed; 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.id = id;
this.KinfeDescendHeight = knife_descent;
this.MainAxisSpeed = main_axis_speed; this.MainAxisSpeed = main_axis_speed;
} }

5
diaoerqiege/diaoerqige_V1.0/app/src/main/java/com/example/diaoerqiegeapp/services/MyDataHelper.java
View File

@ -65,7 +65,7 @@ public class MyDataHelper extends SQLiteOpenHelper {
for (int i = 1; i < 2; i++) { for (int i = 1; i < 2; i++) {
List<DisplayPV> list = getDisplayDataPolish(i); //从数据库中读 List<DisplayPV> list = getDisplayDataPolish(i); //从数据库中读
if (list.size() == 0) { if (list.size() == 0) {
DisplayPV pv = new DisplayPV(i, 0, 0); DisplayPV pv = new DisplayPV(i, 0);
addOrUpdateDisplayDataPolish(pv);//一行一行添加 addOrUpdateDisplayDataPolish(pv);//一行一行添加
} }
} }
@ -79,12 +79,11 @@ public class MyDataHelper extends SQLiteOpenHelper {
Cursor cursor = sqLiteDatabase.rawQuery(sql, null); //按id查询 Cursor cursor = sqLiteDatabase.rawQuery(sql, null); //按id查询
int idIndex = cursor.getColumnIndex(COLUMN_ID); int idIndex = cursor.getColumnIndex(COLUMN_ID);
int _knifeDescendHeight = cursor.getColumnIndex(COLUMN_KINFE_DESCEND_HEIGHT);
int _mainAxisSpeed = cursor.getColumnIndex(COLUMN_MAIN_AXIS_SPEED); int _mainAxisSpeed = cursor.getColumnIndex(COLUMN_MAIN_AXIS_SPEED);
while (cursor.moveToNext()) { while (cursor.moveToNext()) {
DisplayPV pv = new DisplayPV(cursor.getInt(idIndex), cursor.getInt(_knifeDescendHeight), DisplayPV pv = new DisplayPV(cursor.getInt(idIndex),
cursor.getInt(_mainAxisSpeed)); cursor.getInt(_mainAxisSpeed));
list.add(pv); list.add(pv);

64
diaoerqiege/diaoerqige_V1.0/app/src/main/res/layout/activity_polish.xml
View File

@ -508,47 +508,37 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <RadioGroup
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center" android:orientation="horizontal">
android:layout_weight="1"
android:gravity="left|center"
android:paddingLeft="5dp"
android:text="@string/ChangeLineDistance"
android:textColor="@color/dark_ink_blue"
android:textSize="15dp"
android:textStyle="bold" />
<EditText <RadioButton
android:id="@+id/knife_descent" android:id="@+id/facade_assignment"
android:layout_width="0dp" android:layout_width="163dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="2" android:layout_gravity="center"
android:background="@drawable/rounded_edittext" android:layout_weight="1"
android:digits="0123456789" android:gravity="left|center"
android:gravity="center" android:checked="true"
android:hint="请输入0到30之间的数字" android:text="立面铣"
android:imeOptions="actionDone" android:textColor="@color/blue_green"
android:inputType="number" android:textSize="20dp"
android:text="1" android:textStyle="bold" />
android:textColor="@color/blue_green"
android:textCursorDrawable="@drawable/my_cursor"
android:textSize="20dp"
android:textStyle="bold" />
<EditText <RadioButton
android:id="@+id/plane_assignment"
android:layout_width="163dp"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="left|center"
android:text="平面铣"
android:textColor="@color/blue_green"
android:textSize="20dp"
android:textStyle="bold" />
android:layout_width="0dp" </RadioGroup>
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" />
</LinearLayout> </LinearLayout>

1
diaoerqiege/diaoerqige_V1.0/app/src/main/res/values/strings.xml
View File

@ -10,7 +10,6 @@
<string name="ScanLen">工作\n距离</string> <string name="ScanLen">工作\n距离</string>
<string name="ScanBackLen">安全\n距离</string> <string name="ScanBackLen">安全\n距离</string>
<string name="OperateMode">作业\n模式</string> <string name="OperateMode">作业\n模式</string>
<string name="ChangeLineDistance">下降\n高度</string>
<string name="RobotSpeed">车体\n速度</string> <string name="RobotSpeed">车体\n速度</string>
<string name="KnifePosition">刀具\n位置</string> <string name="KnifePosition">刀具\n位置</string>
<string name="MaxLaserSensor">扫描\n极值\n</string> <string name="MaxLaserSensor">扫描\n极值\n</string>

Write Preview
Loading…
Cancel
Save