diff --git a/jueyuanzijiance/InsulatorinSpection_V1.0/.idea/vcs.xml b/jueyuanzijiance/InsulatorinSpection_V1.0/.idea/vcs.xml index 94a25f7..fdf1fc8 100644 --- a/jueyuanzijiance/InsulatorinSpection_V1.0/.idea/vcs.xml +++ b/jueyuanzijiance/InsulatorinSpection_V1.0/.idea/vcs.xml @@ -1,6 +1,7 @@ + \ No newline at end of file diff --git a/jueyuanzijiance/InsulatorinSpection_V1.0/app/src/main/java/com/example/insulatorinspection/PolishActivity.java b/jueyuanzijiance/InsulatorinSpection_V1.0/app/src/main/java/com/example/insulatorinspection/PolishActivity.java index 9939342..b9873c4 100644 --- a/jueyuanzijiance/InsulatorinSpection_V1.0/app/src/main/java/com/example/insulatorinspection/PolishActivity.java +++ b/jueyuanzijiance/InsulatorinSpection_V1.0/app/src/main/java/com/example/insulatorinspection/PolishActivity.java @@ -67,7 +67,7 @@ public class PolishActivity extends AppCompatActivity { private NodePlayerView fullScreenPlayerView; private NodePlayer fullScreenNodePlayer2; private NodePlayerView fullScreenPlayerView2; - private boolean isObstacleAvoidanceOpen = false; // 默认关闭 + private boolean isObstacleAvoidanceOpen = true; // 默认开启 private boolean isWarningLightOpen = false; // 默认关闭 @Override @@ -105,9 +105,10 @@ public class PolishActivity extends AppCompatActivity { myDataHelper.IntializeDataBasePolish(); //读取并显示数据 List pvList = myDataHelper.getDisplayDataPolish(1); //按id查询数据赋值给界面 - mainBinding.robotSpeed.setText(String.valueOf(pvList.get(0).getmoveSpeedPolish())); - mainBinding.pushRobSpeed.setText(String.valueOf(pvList.get(0).getProbeSpeed())); - mainBinding.slideTableSpeed.setText(String.valueOf(pvList.get(0).getRotSpeed())); + // 取消读取保存数据的功能,解除注释可恢复功能 +// mainBinding.robotSpeed.setText(String.valueOf(pvList.get(0).getmoveSpeedPolish())); +// mainBinding.pushRobSpeed.setText(String.valueOf(pvList.get(0).getProbeSpeed())); +// mainBinding.slideTableSpeed.setText(String.valueOf(pvList.get(0).getRotSpeed())); mainBinding.rulerWidth.setText(String.valueOf(pvList.get(0).getRulerWidth())); // 发送到STM32 采用匿名类的方法 @@ -123,9 +124,9 @@ public class PolishActivity extends AppCompatActivity { //必须有 _toSendPV = BspPV.PV_struct_define.newBuilder() .setRunMode(1) - .setRobotSpeed(0) - .setPushRodSpeed(0) - .setFrontEndRotationSpeed(0) + .setRobotSpeed(2) + .setPushRodSpeed(5) + .setFrontEndRotationSpeed(5) .setWarningLight(0) .setObstacleAvoidance(0) .setProbeAllowMoveCommend(0) diff --git a/jueyuanzijiance/InsulatorinSpection_V1.0/app/src/main/res/layout/activity_polish.xml b/jueyuanzijiance/InsulatorinSpection_V1.0/app/src/main/res/layout/activity_polish.xml index ff414f9..a4b151e 100644 --- a/jueyuanzijiance/InsulatorinSpection_V1.0/app/src/main/res/layout/activity_polish.xml +++ b/jueyuanzijiance/InsulatorinSpection_V1.0/app/src/main/res/layout/activity_polish.xml @@ -838,7 +838,7 @@ android:background="@drawable/rounded_edittext" android:digits="-0123456789" android:gravity="center" - android:hint="请输入0到10之间的数字" + android:hint="请输入0到20之间的数字" android:imeOptions="actionDone" android:inputType="numberSigned|numberDecimal" android:text="@string/_0"