fyf
/
AndroidSmartClient
1
0
Rozštěpit 0
Zdrojový kód Úkoly 0 Požadavky na natažení 0 Vydání 1 Wiki Aktivita
Procházet zdrojové kódy

主页状态修改

鸿鹄中学一拖二
pry před 3 měsíci
rodič
8c03ebdec1
revize
20d3954903
5 změnil soubory, kde provedl 331 přidání a 213 odebrání
Rozdělené zobrazení
Diff Options
Zobrazit statistiky Stáhněte soubor opravy Stáhněte rozdílový soubor
  1. +3
    -1
      app/src/main/java/com/bonait/bnframework/business/ControlBase.java
  2. +2
    -0
      app/src/main/java/com/bonait/bnframework/business/FryingpanModbusBase.java
  3. +153
    -34
      app/src/main/java/com/bonait/bnframework/modules/home/fragment/DoubleFryingpanFragment.java
  4. +30
    -0
      app/src/main/res/drawable/button7.xml
  5. +143
    -178
      app/src/main/res/layout/fragment_double_fryingpan.xml

+ 3
- 1
app/src/main/java/com/bonait/bnframework/business/ControlBase.java Zobrazit soubor

@@ -324,7 +324,9 @@ public abstract class ControlBase {
status[i]="空闲中";
}
else{
status[i]="忙碌中";
// status[i]="忙碌中";
if(HeartbeatStatus[i]) status[i]="忙碌中";
else status[i]="未连接";
}
}



+ 2
- 0
app/src/main/java/com/bonait/bnframework/business/FryingpanModbusBase.java Zobrazit soubor

@@ -68,6 +68,8 @@ public class FryingpanModbusBase extends ModbusMaster {
*/
public NotifyPropVar<Integer> CurrentTemperature=new NotifyPropVar<>(0);

public NotifyPropVar<Boolean> DeviceConnectStatus=new NotifyPropVar<>(false);

/**
* 料仓关联的物料名称
*/


+ 153
- 34
app/src/main/java/com/bonait/bnframework/modules/home/fragment/DoubleFryingpanFragment.java Zobrazit soubor

@@ -93,8 +93,17 @@ public class DoubleFryingpanFragment extends BaseFragment {
@BindView(R.id.tv_Status2)
TextView tv_Status2;

@BindView(R.id.robot_topbar)
QMUITopBarLayout mTopBar;//顶部标题
@BindView(R.id.robotConnectState)
TextView robotConnectState;

@BindView(R.id.temperature1)
TextView temperature1;

@BindView(R.id.temperature2)
TextView temperature2;

// @BindView(R.id.robot_topbar)
// QMUITopBarLayout mTopBar;//顶部标题

RecyclerView material;

@@ -122,30 +131,31 @@ public class DoubleFryingpanFragment extends BaseFragment {
super.onViewCreated(view, savedInstanceState);
OpenGoodSelectDialog();
Init();
DoubleFryingpanControl.getInstance().completeNotify= new ICompleteNotify() {
@Override
public void onComplete(int num) {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
if (num==1){
btn1.setText("选择菜品");
btn1.setBackgroundResource(R.drawable.button4);
btn1.setVisibility(View.VISIBLE);
btn1.setTextColor(Color.parseColor("#000000"));
FryingpanModbusHelper.getInstance().setMake(1,false);
}
else if (num==2){
btn2.setText("选择菜品");
btn2.setBackgroundResource(R.drawable.button4);
btn2.setVisibility(View.VISIBLE);
btn2.setTextColor(Color.parseColor("#000000"));
FryingpanModbusHelper.getInstance().setMake(2,false);
}
}
});
}
};
DeviceSetInit();
// DoubleFryingpanControl.getInstance().completeNotify= new ICompleteNotify() {
// @Override
// public void onComplete(int num) {
// getActivity().runOnUiThread(new Runnable() {
// @Override
// public void run() {
// if (num==1){
// btn1.setText("选择菜品");
// btn1.setBackgroundResource(R.drawable.button4);
// btn1.setVisibility(View.VISIBLE);
// btn1.setTextColor(Color.parseColor("#000000"));
// FryingpanModbusHelper.getInstance().setMake(1,false);
// }
// else if (num==2){
// btn2.setText("选择菜品");
// btn2.setBackgroundResource(R.drawable.button4);
// btn2.setVisibility(View.VISIBLE);
// btn2.setTextColor(Color.parseColor("#000000"));
// FryingpanModbusHelper.getInstance().setMake(2,false);
// }
// }
// });
// }
// };

btn_ssx.setBackgroundResource(PeripheralData.ConveryorLineRuning.getValue()?R.drawable.button5:R.drawable.button4);
btn_ssx.setTextColor(PeripheralData.ConveryorLineRuning.getValue()?Color.parseColor("#ffffff"):Color.parseColor("#000000"));
@@ -159,24 +169,136 @@ public class DoubleFryingpanFragment extends BaseFragment {
});
};

String status = RobotModbus.getInstance().IsConnected?"已连接":"未连接";
mTopBar.setTitle("机器人连接状态："+ status);
// String status = RobotModbus.getInstance().IsConnected?"已连接":"未连接";
// mTopBar.setTitle("机器人连接状态："+ status);

// DoubleFryingpanControl.getInstance().statusNotify=new IStatusNotify() {
// @Override
// public void OnStatusChanged(String s1, String s2, String s3, String s4) {
// getActivity().runOnUiThread(new Runnable() {
// @Override
// public void run() {
// tv_Status1.setText(s1);
// tv_Status2.setText(s2);
// if(s1.contains("忙碌中")||s2.contains("忙碌中")){
// RobotData.wokWorking = true;
// }else {
// RobotData.wokWorking = false;
// }
// String status = RobotModbus.getInstance().IsConnected?"已连接":"未连接";
// mTopBar.setTitle("机器人连接状态："+ status);
// if(!IsMaintenanceMode&&RobotData.RobotReachTending){
// btn_maintenance.setText("完成维护");
// IsMaintenanceMode=true;
// }
// }
// });
// }
// };

mDialogVisual= DialogManager.getInstance().initView(getContext(), R.layout.activity_material_view, Gravity.BOTTOM,getActivity());
mParSetVisual = DialogManager.getInstance().initView(getContext(),R.layout.activity_par_set1,Gravity.BOTTOM,getActivity());
mWarehouselocSelectVisual = DialogManager.getInstance().initView(getContext(),R.layout.activity_warehouseloc_select,Gravity.BOTTOM,getActivity());
}

private void DeviceSetInit(){
DoubleFryingpanControl.getInstance().completeNotify=(num)->{
getActivity().runOnUiThread(()->{
if (num==1){
btn1.setText("选择菜品");
btn1.setBackgroundResource(R.drawable.button4);
btn1.setVisibility(View.VISIBLE);
btn1.setTextColor(Color.parseColor("#000000"));
FryingpanModbusHelper.getInstance().setMake(1,false);
}
else if (num==2){
btn2.setText("选择菜品");
btn2.setBackgroundResource(R.drawable.button4);
btn2.setVisibility(View.VISIBLE);
btn2.setTextColor(Color.parseColor("#000000"));
FryingpanModbusHelper.getInstance().setMake(2,false);
}
});
};

boolean Device1 = FryingpanModbusHelper.getInstance().isConnect(1);
boolean Device2 = FryingpanModbusHelper.getInstance().isConnect(2);

main_device_control.setText(Device1?"设备控制":"设备未连接");
main_device_control.setEnabled(Device1?true:false);
main_device_control.setBackgroundResource(Device1?R.drawable.button4:R.drawable.button7);
temperature1.setVisibility(Device1?View.VISIBLE:View.GONE);

main_device_control2.setText(Device2?"设备控制":"设备未连接");
main_device_control2.setEnabled(Device2?true:false);
main_device_control2.setBackgroundResource(Device2?R.drawable.button4:R.drawable.button7);
temperature2.setVisibility(Device2?View.VISIBLE:View.GONE);

FryingpanModbusHelper.getInstance().getModbus(1,(s)->{
s.DeviceConnectStatus.ChangeNotify=(v->{
getActivity().runOnUiThread(()->{
main_device_control.setText(v?"设备控制":"设备未连接");
main_device_control.setEnabled(v?true:false);
main_device_control.setBackgroundResource(v?R.drawable.button4:R.drawable.button7);
temperature1.setVisibility(v?View.VISIBLE:View.GONE);
});
});
s.CurrentTemperature.Register("device1",(n)->{
getActivity().runOnUiThread(()->{temperature1.setText("炒锅温度："+String.valueOf(n)+" ℃");});
});
});

FryingpanModbusHelper.getInstance().getModbus(2,(s)->{
s.DeviceConnectStatus.ChangeNotify=(v->{
getActivity().runOnUiThread(()->{
main_device_control2.setText(v?"设备控制":"设备未连接");
main_device_control2.setEnabled(v?true:false);
main_device_control2.setBackgroundResource(v?R.drawable.button4:R.drawable.button7);
temperature2.setVisibility(v?View.VISIBLE:View.GONE);
});
});
s.CurrentTemperature.Register("device2",(n)->{
getActivity().runOnUiThread(()->{temperature2.setText("炒锅温度："+String.valueOf(n)+" ℃");});
});
});

String status = RobotModbus.getInstance().IsConnected?"已连接":"未连接";
robotConnectState.setText("机器人连接状态："+ status);
robotConnectState.setTextColor(RobotModbus.getInstance().IsConnected?Color.BLUE:Color.RED);
DoubleFryingpanControl.getInstance().statusNotify=new IStatusNotify() {
@Override
public void OnStatusChanged(String s1, String s2, String s3, String s4) {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
tv_Status1.setText(s1);
tv_Status2.setText(s2);

if(s1.contains("忙碌中")||s2.contains("忙碌中")){
RobotData.wokWorking = true;
}else {
RobotData.wokWorking = false;
}

if(s1.equals("忙碌中")||s1.equals("空闲中"))
{
tv_Status1.setText("运行状态："+s1);
tv_Status1.setTextColor(Color.parseColor("#f0a732"));
}else{
tv_Status1.setText("连接状态：未连接");
tv_Status1.setTextColor(Color.parseColor("#F03274"));
}

if(s2.equals("忙碌中")||s2.equals("空闲中"))
{
tv_Status2.setText("运行状态："+s2);
tv_Status2.setTextColor(Color.parseColor("#f0a732"));
}else{
tv_Status2.setText("连接状态：未连接");
tv_Status2.setTextColor(Color.parseColor("#F03274"));
}

String status = RobotModbus.getInstance().IsConnected?"已连接":"未连接";
mTopBar.setTitle("机器人连接状态："+ status);
robotConnectState.setText("机器人连接状态："+ status);
robotConnectState.setTextColor(RobotModbus.getInstance().IsConnected?Color.BLUE:Color.RED);
if(!IsMaintenanceMode&&RobotData.RobotReachTending){
btn_maintenance.setText("完成维护");
IsMaintenanceMode=true;
@@ -186,9 +308,6 @@ public class DoubleFryingpanFragment extends BaseFragment {
}
};

mDialogVisual= DialogManager.getInstance().initView(getContext(), R.layout.activity_material_view, Gravity.BOTTOM,getActivity());
mParSetVisual = DialogManager.getInstance().initView(getContext(),R.layout.activity_par_set1,Gravity.BOTTOM,getActivity());
mWarehouselocSelectVisual = DialogManager.getInstance().initView(getContext(),R.layout.activity_warehouseloc_select,Gravity.BOTTOM,getActivity());
}

@SuppressLint("HandlerLeak")


+ 30
- 0
app/src/main/res/drawable/button7.xml Zobrazit soubor

@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/black"
android:radius="-1dp">

<item android:state_pressed="true">
<shape>
<solid android:color="@color/orange_primary_dark" />
<corners android:radius="10dp" />
</shape>
</item>

<item android:state_enabled="false">
<shape>
<solid android:color="#cccccc" />
<corners android:radius="10dp" />
</shape>
</item>


<item>
<shape>
<solid android:color="#dddddd" />
<corners android:radius="10dp" />
<stroke
android:width="1dp"
android:color="#dddddd" />
</shape>
</item>
</ripple>

+ 143
- 178
app/src/main/res/layout/fragment_double_fryingpan.xml Zobrazit soubor

@@ -3,14 +3,13 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:background="@color/app_color_blue"
android:layout_height="match_parent"
tools:context=".modules.home.fragment.DoubleFryingpanFragment">

<GridLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="?attr/qmui_topbar_height"
android:layout_marginTop="10dp"
android:background="#dddddd"
android:rowCount="2"
android:columnCount="2"
@@ -26,16 +25,15 @@
android:layout_rowSpan="2"
android:layout_columnWeight="1">




<!-- <ImageView-->
<!-- android:layout_height="0dp"-->
<!-- android:layout_width="0dp"-->
<!-- android:src="@mipmap/robot"-->
<!-- android:layout_margin="10dp"-->
<!-- android:layout_rowWeight="1"-->
<!-- android:layout_columnWeight="1"/>-->
<TextView
android:id="@+id/robotConnectState"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:textSize="18sp"
android:textColor="@color/red_primary_dark"
android:text="机器人连接状态：未连接"/>

<ImageView
android:layout_height="990dp"
@@ -49,7 +47,7 @@
android:layout_margin="10dp"
android:orientation="vertical"
android:layout_rowWeight="1"
android:layout_alignParentRight="true"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_columnWeight="1"
android:layout_height="160dp">
@@ -60,8 +58,8 @@
android:layout_marginTop="10dp"
tools:ignore="TouchTargetSizeCheck"
android:layout_marginLeft="20dp"
android:visibility="gone"
android:textSize="20sp"
android:visibility="gone"
android:background="@drawable/button4"
android:text="入库"/>

@@ -97,7 +95,6 @@
android:textSize="20sp"
android:background="@drawable/button4"
android:text="输送线启动"/>

</LinearLayout>


@@ -119,27 +116,37 @@
android:orientation="vertical"
android:layout_columnWeight="1">

<TextView
android:id="@+id/temperature1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:textColor="@color/gray"
android:textSize="20sp"
android:text="炒锅温度：0℃"/>

<LinearLayout
android:layout_width="match_parent"
android:layout_marginLeft="20dp"
android:layout_marginTop="10dp"
android:orientation="horizontal"
android:layout_height="50dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:textSize="20sp"
android:textColor="#f0a732"
android:text="状态："/>

<!-- <TextView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginLeft="20dp"-->
<!-- android:textSize="20sp"-->
<!-- android:textColor="#f0a732"-->
<!-- android:text="运行状态："/>-->

<TextView
android:id="@+id/tv_Status1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="20sp"
android:textColor="#f0a732"
android:text="空闲中"/>
android:textColor="#F03274"
android:text="连接状态：未连接"/>
</LinearLayout>

<Button
@@ -159,54 +166,9 @@
android:layout_marginTop="10dp"
android:layout_marginLeft="20dp"
android:textSize="20sp"
android:background="@drawable/button4"
android:text="设备控制"/>

<!-- <RelativeLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="50dp"-->
<!-- android:layout_marginTop="10dp"-->
<!-- android:layout_marginLeft="20dp">-->
<!-- <Button-->
<!-- android:id="@+id/Fryingpan1_btn1"-->
<!-- android:layout_width="130dp"-->
<!-- android:layout_height="50dp"-->
<!-- android:textSize="20sp"-->
<!-- android:background="@drawable/button4"-->
<!-- android:text="未知"/>-->

<!-- <Button-->
<!-- android:id="@+id/Fryingpan1_btn2"-->
<!-- android:layout_width="130dp"-->
<!-- android:layout_height="50dp"-->
<!-- android:layout_alignParentRight="true"-->
<!-- android:textSize="20sp"-->
<!-- android:background="@drawable/button4"-->
<!-- android:text="未知"/>-->
<!-- </RelativeLayout>-->

<!-- <RelativeLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="50dp"-->
<!-- android:layout_marginTop="10dp"-->
<!-- android:layout_marginLeft="20dp">-->
<!-- <Button-->
<!-- android:id="@+id/Fryingpan1_btn3"-->
<!-- android:layout_width="130dp"-->
<!-- android:layout_height="50dp"-->
<!-- android:textSize="20sp"-->
<!-- android:background="@drawable/button4"-->
<!-- android:text="未知"/>-->

<!-- <Button-->
<!-- android:id="@+id/Fryingpan1_btn4"-->
<!-- android:layout_width="130dp"-->
<!-- android:layout_height="50dp"-->
<!-- android:layout_alignParentRight="true"-->
<!-- android:textSize="20sp"-->
<!-- android:background="@drawable/button4"-->
<!-- android:text="未知"/>-->
<!-- </RelativeLayout>-->
android:enabled="false"
android:background="@drawable/button7"
android:text="未连接"/>

</LinearLayout>

@@ -218,7 +180,6 @@
android:layout_rowWeight="1"
android:layout_columnWeight="1"/>


</GridLayout>

<GridLayout android:layout_margin="10dp"
@@ -237,27 +198,36 @@
android:orientation="vertical"
android:layout_columnWeight="1">

<TextView
android:id="@+id/temperature2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:textColor="@color/gray"
android:textSize="20sp"
android:text="炒锅温度：0℃"/>

<LinearLayout
android:layout_width="match_parent"
android:layout_marginLeft="20dp"
android:layout_marginTop="10dp"
android:orientation="horizontal"
android:layout_height="50dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:textSize="20sp"
android:textColor="#f0a732"
android:text="状态："/>
<!-- <TextView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginLeft="20dp"-->
<!-- android:textSize="20sp"-->
<!-- android:textColor="#f0a732"-->
<!-- android:text="运行状态："/>-->

<TextView
android:id="@+id/tv_Status2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="20sp"
android:textColor="#f0a732"
android:text="空闲中"/>
android:textColor="#F03274"
android:text="连接状态：未连接"/>
</LinearLayout>

<Button
@@ -277,96 +247,97 @@
android:layout_marginTop="10dp"
android:layout_marginLeft="20dp"
android:textSize="20sp"
android:background="@drawable/button4"
android:text="设备控制"/>


<!-- <RelativeLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="50dp"-->
<!-- android:layout_marginTop="10dp"-->
<!-- android:layout_marginLeft="20dp">-->
<!-- <Button-->
<!-- android:id="@+id/Fryingpan2_btn1"-->
<!-- android:layout_width="130dp"-->
<!-- android:layout_height="50dp"-->
<!-- android:textSize="20sp"-->
<!-- android:background="@drawable/button4"-->
<!-- android:text="未知"/>-->

<!-- <Button-->
<!-- android:id="@+id/Fryingpan2_btn2"-->
<!-- android:layout_width="130dp"-->
<!-- android:layout_height="50dp"-->
<!-- android:layout_alignParentRight="true"-->
<!-- android:textSize="20sp"-->
<!-- android:background="@drawable/button4"-->
<!-- android:text="未知"/>-->
<!-- </RelativeLayout>-->

<!-- <RelativeLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="50dp"-->
<!-- android:layout_marginTop="10dp"-->
<!-- android:layout_marginLeft="20dp">-->
<!-- <Button-->
<!-- android:id="@+id/Fryingpan2_btn3"-->
<!-- android:layout_width="130dp"-->
<!-- android:layout_height="50dp"-->
<!-- android:textSize="20sp"-->
<!-- android:background="@drawable/button4"-->
<!-- android:text="未知"/>-->

<!-- <Button-->
<!-- android:id="@+id/Fryingpan2_btn4"-->
<!-- android:layout_width="130dp"-->
<!-- android:layout_height="50dp"-->
<!-- android:layout_alignParentRight="true"-->
<!-- android:textSize="20sp"-->
<!-- android:background="@drawable/button4"-->
<!-- android:text="未知"/>-->
<!-- </RelativeLayout>-->


<!-- <Button-->
<!-- android:id="@+id/Fryingpan2_btn1"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="50dp"-->
<!-- android:layout_marginTop="10dp"-->
<!-- android:layout_marginLeft="20dp"-->
<!-- android:textSize="20sp"-->
<!-- android:background="@drawable/button4"-->
<!-- android:text="未知"/>-->

<!-- <Button-->
<!-- android:id="@+id/Fryingpan2_btn2"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="50dp"-->
<!-- android:layout_marginTop="10dp"-->
<!-- android:layout_marginLeft="20dp"-->
<!-- android:textSize="20sp"-->
<!-- android:background="@drawable/button4"-->
<!-- android:text="未知"/>-->

<!-- <Button-->
<!-- android:id="@+id/Fryingpan2_btn3"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="50dp"-->
<!-- android:layout_marginTop="10dp"-->
<!-- android:layout_marginLeft="20dp"-->
<!-- android:textSize="20sp"-->
<!-- android:background="@drawable/button4"-->
<!-- android:text="未知"/>-->

<!-- <Button-->
<!-- android:id="@+id/Fryingpan2_btn4"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="50dp"-->
<!-- android:layout_marginTop="10dp"-->
<!-- android:layout_marginLeft="20dp"-->
<!-- android:textSize="20sp"-->
<!-- android:background="@drawable/button4"-->
<!-- android:text="未知"/>-->
android:enabled="false"
android:background="@drawable/button7"
android:text="未连接"/>


<!-- <RelativeLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="50dp"-->
<!-- android:layout_marginTop="10dp"-->
<!-- android:layout_marginLeft="20dp">-->
<!-- <Button-->
<!-- android:id="@+id/Fryingpan2_btn1"-->
<!-- android:layout_width="130dp"-->
<!-- android:layout_height="50dp"-->
<!-- android:textSize="20sp"-->
<!-- android:background="@drawable/button4"-->
<!-- android:text="未知"/>-->

<!-- <Button-->
<!-- android:id="@+id/Fryingpan2_btn2"-->
<!-- android:layout_width="130dp"-->
<!-- android:layout_height="50dp"-->
<!-- android:layout_alignParentRight="true"-->
<!-- android:textSize="20sp"-->
<!-- android:background="@drawable/button4"-->
<!-- android:text="未知"/>-->
<!-- </RelativeLayout>-->

<!-- <RelativeLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="50dp"-->
<!-- android:layout_marginTop="10dp"-->
<!-- android:layout_marginLeft="20dp">-->
<!-- <Button-->
<!-- android:id="@+id/Fryingpan2_btn3"-->
<!-- android:layout_width="130dp"-->
<!-- android:layout_height="50dp"-->
<!-- android:textSize="20sp"-->
<!-- android:background="@drawable/button4"-->
<!-- android:text="未知"/>-->

<!-- <Button-->
<!-- android:id="@+id/Fryingpan2_btn4"-->
<!-- android:layout_width="130dp"-->
<!-- android:layout_height="50dp"-->
<!-- android:layout_alignParentRight="true"-->
<!-- android:textSize="20sp"-->
<!-- android:background="@drawable/button4"-->
<!-- android:text="未知"/>-->
<!-- </RelativeLayout>-->


<!-- <Button-->
<!-- android:id="@+id/Fryingpan2_btn1"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="50dp"-->
<!-- android:layout_marginTop="10dp"-->
<!-- android:layout_marginLeft="20dp"-->
<!-- android:textSize="20sp"-->
<!-- android:background="@drawable/button4"-->
<!-- android:text="未知"/>-->

<!-- <Button-->
<!-- android:id="@+id/Fryingpan2_btn2"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="50dp"-->
<!-- android:layout_marginTop="10dp"-->
<!-- android:layout_marginLeft="20dp"-->
<!-- android:textSize="20sp"-->
<!-- android:background="@drawable/button4"-->
<!-- android:text="未知"/>-->

<!-- <Button-->
<!-- android:id="@+id/Fryingpan2_btn3"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="50dp"-->
<!-- android:layout_marginTop="10dp"-->
<!-- android:layout_marginLeft="20dp"-->
<!-- android:textSize="20sp"-->
<!-- android:background="@drawable/button4"-->
<!-- android:text="未知"/>-->

<!-- <Button-->
<!-- android:id="@+id/Fryingpan2_btn4"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="50dp"-->
<!-- android:layout_marginTop="10dp"-->
<!-- android:layout_marginLeft="20dp"-->
<!-- android:textSize="20sp"-->
<!-- android:background="@drawable/button4"-->
<!-- android:text="未知"/>-->

</LinearLayout>

@@ -383,10 +354,4 @@

</GridLayout>

<com.qmuiteam.qmui.widget.QMUITopBarLayout
android:id="@+id/robot_topbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/app_color_blue" />

</com.qmuiteam.qmui.widget.QMUIWindowInsetLayout>

Zapsat Náhled
Načítá se…
Zrušit
Uložit