更新

app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "com.rms.agv"
         minSdk 27
         targetSdk 31
-        versionCode 8
-        versionName "1.1.8"
+        versionCode 9
+        versionName "1.1.9"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

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

@@ -425,7 +425,30 @@ public class MainActivity extends BaseActivity {
         if(target==null)target="";
         if(shelf==null)shelf="";
         String qrcode = title+","+robot+","+target+","+shelf;
-        push(qrcode, title);
+        SiteModel siteModel = null;
+        if(!StringUtils.isEmpty(shelf)){
+            siteModel = MainDao.getInstance().querySiteName(context, shelf);
+        }else if(!StringUtils.isEmpty(target)){
+            siteModel = MainDao.getInstance().querySiteName(context, target);
+        }
+        if(siteModel!=null) {
+            AlertDialog alert = new AlertDialog.Builder(MainActivity.this)
+                    .setTitle("提示")
+                    .setMessage("确定到"+siteModel.getSiteName()+"吗?")
+                    .setPositiveButton("确定",
+                            new DialogInterface.OnClickListener() {// 设置确定按钮
+                                @Override
+                                // 处理确定按钮点击事件
+                                public void onClick(DialogInterface dialog, int which) {
+                                    push(qrcode, title);
+                                }
+                            })
+                    .setNegativeButton("取消", null)
+                    .setCancelable(true).create();
+            alert.show();
+        }else{
+            push(qrcode, title);
+        }
     }
 
     private void showNavigateView(){

app/src/main/java/com/qy/agv/activity/dao/MainDao.java

@@ -206,4 +206,39 @@ public class MainDao {
         }
         return relocModels;
     }
+
+    public SiteModel querySiteName(Context context, String site) {
+        SiteModel siteModel = new SiteModel();
+        RequestParams params = HttpsUtil.httParams(Constant.SITE_DETAIL);
+        params.addBodyParameter("locationId", site);
+        try {
+            AtomicReference<JSONObject> rsAtm = new AtomicReference<>(new JSONObject());
+            Thread s1 = new Thread(()->{
+                try {
+                    rsAtm.set(x.http().getSync(params, JSONObject.class));
+                }catch (Throwable e) {
+                    e.printStackTrace();
+                }
+            });
+            try{
+                s1.start();
+                s1.join();
+            }catch (Exception e){
+                e.printStackTrace();
+            }
+            JSONObject rs = rsAtm.get();
+            if (rs.has("code") && rs.getInt("code") != 200) {
+                ToastUtils.showToast(context, "请求失败");
+            }
+            if (rs.has("success")) {
+                System.out.println(rs.get("data"));
+                Object data_o = rs.get("data");
+                siteModel = new Gson().fromJson(data_o.toString(), SiteModel.class);
+            }
+        }catch (Throwable e) {
+            e.printStackTrace();
+            mylog.error("加载站点异常：", e);
+        }
+        return siteModel;
+    }
 }

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

@@ -1,8 +1,12 @@
 package com.qy.agv.util;
 
+import com.qy.agv.activity.dao.MainDao;
 import com.qy.agv.activity.model.RobotModel;
+import com.qy.agv.activity.model.SiteModel;
 import com.qy.agv.activity.model.UserModel;
 
+import java.util.List;
+
 public class Constant {
 
     public static String MODEL = "ET28";
@@ -53,6 +57,7 @@ public class Constant {
     public final static String ROBOT_LIST = "blade-robotInfo/robotInfo/list";
     public final static String SHELF_LIST = "blade-shelf/shelf/list";
     public final static String SITE_LIST = "blade-site/site/list";
+    public final static String SITE_DETAIL = "blade-site/site/detailByLocationId";
     public final static String RELOC_LIST = "blade-relocCoordinate/relocCoordinate/list";
 
     public final static String RECEIVER_MSG = "com.qy.msg.RECEIVER";