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 aa5e0a7..8fde547 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 @@ -127,6 +127,10 @@ public class MainActivity extends AppCompatActivity { { _toSendPV = _toSendPV.toBuilder().setRobotOperationMode(1).build(); } + if(_Operate_Mode_Call_Value.equals("激光扫描")) + { + _toSendPV = _toSendPV.toBuilder().setRobotOperationMode(3).build(); + } if(_Operate_Mode_Call_Value.equals("自动作业")) { _toSendPV = _toSendPV.toBuilder().setRobotOperationMode(2).build(); diff --git a/diaoerqiege/diaoerqige_V1.0/app/src/main/java/com/example/diaoerqiegeapp/services/PopupHelper.java b/diaoerqiege/diaoerqige_V1.0/app/src/main/java/com/example/diaoerqiegeapp/services/PopupHelper.java index db6d464..0fcc68e 100644 --- a/diaoerqiege/diaoerqige_V1.0/app/src/main/java/com/example/diaoerqiegeapp/services/PopupHelper.java +++ b/diaoerqiege/diaoerqige_V1.0/app/src/main/java/com/example/diaoerqiegeapp/services/PopupHelper.java @@ -56,6 +56,9 @@ public class PopupHelper { case "手动作业": { radioGroup.check(R.id.rb_polishone); break; } + case "激光扫描": { radioGroup.check(R.id.rb_polishtwo2); + break; + } case "自动作业": { radioGroup.check(R.id.rb_polishtwo); break; } diff --git a/diaoerqiege/diaoerqige_V1.0/app/src/main/res/layout/polishoperatemodepopup.xml b/diaoerqiege/diaoerqige_V1.0/app/src/main/res/layout/polishoperatemodepopup.xml index ef0536d..33c2ebf 100644 --- a/diaoerqiege/diaoerqige_V1.0/app/src/main/res/layout/polishoperatemodepopup.xml +++ b/diaoerqiege/diaoerqige_V1.0/app/src/main/res/layout/polishoperatemodepopup.xml @@ -53,6 +53,21 @@ android:textSize="30sp" android:text="手动作业" /> + +