取消数据保存功能，上电默认开启避障

jueyuanzijiance/InsulatorinSpection_V1.0/.idea/vcs.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>

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 = true; // 默认开启
+    private boolean isObstacleAvoidanceOpen = true; // 默认关闭
     private boolean isWarningLightOpen = false; // 默认关闭
 
     @Override
@@ -105,7 +105,7 @@ public class PolishActivity extends AppCompatActivity {
         myDataHelper.IntializeDataBasePolish();
         //读取并显示数据
         List<DisplayPV> 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()));
@@ -124,9 +124,9 @@ public class PolishActivity extends AppCompatActivity {
                         //必须有
                         _toSendPV = BspPV.PV_struct_define.newBuilder()
                                 .setRunMode(1)
-                                .setRobotSpeed(2)
+                                .setRobotSpeed(0)
-                                .setPushRodSpeed(5)
+                                .setPushRodSpeed(0)
-                                .setFrontEndRotationSpeed(5)
+                                .setFrontEndRotationSpeed(0)
                                 .setWarningLight(0)
                                 .setObstacleAvoidance(0)
                                 .setProbeAllowMoveCommend(0)

jueyuanzijiance/InsulatorinSpection_V1.0/app/src/main/res/layout/activity_polish.xml

@@ -704,7 +704,7 @@
                                        android:hint="请输入0到20之间的数字"
                                        android:imeOptions="actionDone"
                                        android:inputType="numberSigned|numberDecimal"
-                                       android:text="@string/_0_0"
+                                       android:text="2.0"
                                        android:textColor="@color/blue_green"
                                        android:textSize="13sp"
                                        android:textStyle="bold">
@@ -773,7 +773,7 @@
                                        android:hint="请输入0到100之间的数字"
                                        android:imeOptions="actionDone"
                                        android:inputType="numberSigned|numberDecimal"
-                                       android:text="@string/_0"
+                                       android:text="5"
                                        android:textColor="@color/blue_green"
                                        android:textSize="13sp"
                                        android:textStyle="bold">
@@ -841,7 +841,7 @@
                                        android:hint="请输入0到20之间的数字"
                                        android:imeOptions="actionDone"
                                        android:inputType="numberSigned|numberDecimal"
-                                       android:text="@string/_0"
+                                       android:text="5"
                                        android:textColor="@color/blue_green"
                                        android:textSize="13sp"
                                        android:textStyle="bold">
@@ -1008,7 +1008,7 @@
                                    android:id="@+id/tv_obstacleAvoidance"
                                    android:layout_width="match_parent"
                                    android:layout_height="match_parent"
-                                   android:text="关"
+                                   android:text="开"
                                    android:gravity="center"
                                    android:textColor="@color/blue_green"
                                    android:textSize="13dp"