占用

app/src/main/java/com/qy/agv/activity/MainActivity.java

@@ -462,7 +462,7 @@ public class MainActivity extends BaseActivity {
             sendMsg[1] = barInfo[1];
         }
         String show_title = "占用" + sendMsg[1];
-        if("UN_OCCUPY_LOC".equals(sendMsg[0])){
+        if(Constant.UN_OCCUPY_LOC.equals(sendMsg[0])){
             show_title = "释放" + sendMsg[1];
         }
         if(!StringUtils.isEmpty(sendMsg[0])) {

app/src/main/java/com/qy/agv/activity/adapter/MainListViewAdapter.java

@@ -10,6 +10,7 @@ import android.widget.TextView;
 
 import com.qy.agv.R;
 import com.qy.agv.activity.model.TaskModel;
+import com.qy.agv.util.Constant;
 
 import java.util.ArrayList;
 
@@ -55,11 +56,20 @@ public class MainListViewAdapter extends BaseAdapter {
             mainHolder.tv_site = view.findViewById(R.id.tv_site);
             mainHolder.taskStatue = view.findViewById(R.id.tv_status);
             mainHolder.desc = view.findViewById(R.id.tv_desc);
+            mainHolder.tv_robot_tips = view.findViewById(R.id.tv_robot_tips);
+            mainHolder.tv_target_tips = view.findViewById(R.id.tv_target_tips);
             view.setTag(mainHolder);
         }else{
             mainHolder= (MainHolder) view.getTag();
         }
         mainHolder.startTime.setText(taskModel.getDistributionTime());
+        if(taskModel.getRequestType().contains(Constant.OCCUPY_LOC)){
+            mainHolder.tv_robot_tips.setText("库位：");
+            mainHolder.tv_target_tips.setVisibility(View.GONE);
+        }else{
+            mainHolder.tv_robot_tips.setText("机器人：");
+            mainHolder.tv_target_tips.setVisibility(View.VISIBLE);
+        }
         mainHolder.taskName.setText(taskModel.getRequestType());
         mainHolder.tv_robot_name.setText(taskModel.getRobotId());
         mainHolder.tv_site.setText(taskModel.getLocationTo());
@@ -78,6 +88,8 @@ public class MainListViewAdapter extends BaseAdapter {
         public TextView desc;
         public TextView tv_robot_name;
         public TextView tv_site;
+        public TextView tv_robot_tips;
+        public TextView tv_target_tips;
     }
 
     enum StatusEnum {

app/src/main/java/com/qy/agv/util/Constant.java

@@ -71,5 +71,8 @@ public class Constant {
     public final static String RECEIVER_MSG = "com.qy.msg.RECEIVER";
 
     public static int REQUEST_CODE_MLKIT_SCAN_ONE = 204;
+
+    public final static String OCCUPY_LOC = "OCCUPY_LOC";
+    public final static String UN_OCCUPY_LOC = "UN_OCCUPY_LOC";
 }
 

app/src/main/res/layout/item_main_listview.xml

@@ -51,6 +51,7 @@
             android:layout_height="wrap_content">
             <TextView
                 android:layout_width="90dp"
+                android:id="@+id/tv_robot_tips"
                 android:layout_height="match_parent"
                 android:text="机器人："/>
             <TextView
@@ -62,6 +63,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:id="@+id/tv_target_tips"
                 android:text="目标站点："/>
             <TextView
                 android:layout_width="70dp"