Browse Source

增加一个激光扫描模式

master
Lizongdi 2 months ago
parent
commit
dd4048909a
  1. 4
      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/services/PopupHelper.java
  3. 15
      diaoerqiege/diaoerqige_V1.0/app/src/main/res/layout/polishoperatemodepopup.xml

4
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(); _toSendPV = _toSendPV.toBuilder().setRobotOperationMode(1).build();
} }
if(_Operate_Mode_Call_Value.equals("激光扫描"))
{
_toSendPV = _toSendPV.toBuilder().setRobotOperationMode(3).build();
}
if(_Operate_Mode_Call_Value.equals("自动作业")) if(_Operate_Mode_Call_Value.equals("自动作业"))
{ {
_toSendPV = _toSendPV.toBuilder().setRobotOperationMode(2).build(); _toSendPV = _toSendPV.toBuilder().setRobotOperationMode(2).build();

3
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); case "手动作业": { radioGroup.check(R.id.rb_polishone);
break; break;
} }
case "激光扫描": { radioGroup.check(R.id.rb_polishtwo2);
break;
}
case "自动作业": { radioGroup.check(R.id.rb_polishtwo); case "自动作业": { radioGroup.check(R.id.rb_polishtwo);
break; break;
} }

15
diaoerqiege/diaoerqige_V1.0/app/src/main/res/layout/polishoperatemodepopup.xml

@ -53,6 +53,21 @@
android:textSize="30sp" android:textSize="30sp"
android:text="手动作业" /> android:text="手动作业" />
<RadioButton
android:id="@+id/rb_polishtwo2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/radiobutton_background"
android:button="@null"
android:gravity="center"
android:layout_marginRight="10dp"
android:padding="10dp"
android:text="激光扫描"
android:textColor="@drawable/radio_button_textcolor"
android:textSize="30sp"
android:textStyle="bold" />
<RadioButton <RadioButton
android:id="@+id/rb_polishtwo" android:id="@+id/rb_polishtwo"
android:layout_width="0dp" android:layout_width="0dp"

Loading…
Cancel
Save