update

3 years ago · b529f2013b
parent c65e56df64
commit b529f2013b
36 changed files with 105 additions and 17 deletions
--- a/doc/基于机器人的物流“智取”系统开发项目的个人自评报告.xlsx
+++ b/doc/基于机器人的物流“智取”系统开发项目的个人自评报告.xlsx
--- a/doc/基于机器人的物流“智取”系统开发项目的团队自评报告.xlsx
+++ b/doc/基于机器人的物流“智取”系统开发项目的团队自评报告.xlsx
--- a/doc/基于机器人的物流“智取”系统汇报PPT.pptx
+++ b/doc/基于机器人的物流“智取”系统汇报PPT.pptx
--- a/doc/基于机器人的物流“智取”系统需求规格说明书.docx
+++ b/doc/基于机器人的物流“智取”系统需求规格说明书.docx
--- a/doc/基于机器人的物流”智取“系统作品宣传彩页.png
+++ b/doc/基于机器人的物流”智取“系统作品宣传彩页.png
--- a/model/需求规格说明书/历史记录-交互图.png
+++ b/model/需求规格说明书/历史记录-交互图.png
--- a/model/需求规格说明书/历史记录-交互图.vsdx
+++ b/model/需求规格说明书/历史记录-交互图.vsdx
--- a/model/需求规格说明书/发送取件指令-交互图.png
+++ b/model/需求规格说明书/发送取件指令-交互图.png
--- a/model/需求规格说明书/发送取件指令-交互图.vsdx
+++ b/model/需求规格说明书/发送取件指令-交互图.vsdx
--- a/model/需求规格说明书/查询余件-交互图.png
+++ b/model/需求规格说明书/查询余件-交互图.png
--- a/model/需求规格说明书/查询余件-交互图.vsdx
+++ b/model/需求规格说明书/查询余件-交互图.vsdx
--- a/model/需求规格说明书/用户注册-交互图.png
+++ b/model/需求规格说明书/用户注册-交互图.png
--- a/model/需求规格说明书/用户注册-交互图.vsdx
+++ b/model/需求规格说明书/用户注册-交互图.vsdx
--- a/model/需求规格说明书/用户登录-交互图.png
+++ b/model/需求规格说明书/用户登录-交互图.png
--- a/model/需求规格说明书/用户登录-交互图.vsdx
+++ b/model/需求规格说明书/用户登录-交互图.vsdx
--- a/model/需求规格说明书/系统设置-交互图.png
+++ b/model/需求规格说明书/系统设置-交互图.png
--- a/model/需求规格说明书/系统设置-交互图.vsdx
+++ b/model/需求规格说明书/系统设置-交互图.vsdx
--- a/src/Logistics/app/src/main/assets/js.html
+++ b/src/Logistics/app/src/main/assets/js.html
@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html>
-<head>
+<head title="pickup">
    <meta charset="utf-8" />
    <script type="text/javascript" type="text/javascript">
--- a/src/Logistics/app/src/main/java/com/example/logistics/manager/goodManager.java
+++ b/src/Logistics/app/src/main/java/com/example/logistics/manager/goodManager.java
@ -18,7 +18,7 @@ import java.util.Map;
 public class goodManager {
-    private static final String TAG = "goodDao";
+    private static final String TAG = "goodManager";
    public int search(String id, String phonenum, Context context){//搜索快件位置（id，手机号）
@ -89,6 +89,8 @@ public class goodManager {
            e.printStackTrace();
            Log.d(TAG, "search bug: " + e.getMessage());
            msg = 0;
        } finally {
        }
        return msg;
    }
@ -121,8 +123,11 @@ public class goodManager {
                return false;
            }
        }catch(Exception e){
            e.printStackTrace();
            Log.d(TAG, "delete bug" + e.getMessage());
        }finally {
        }
        return false;
    }
@ -175,6 +180,8 @@ public class goodManager {
        }catch (Exception e){
            e.printStackTrace();
            Log.d(TAG, "search bug: " + e.getMessage());
        } finally {
        }
        return datalist;
    }
@ -235,6 +242,8 @@ public class goodManager {
            e.printStackTrace();
            Log.d(TAG, "login bug: " + e.getMessage());
            msg = 0;
        } finally {
        }
        return msg;
    }
--- a/src/Logistics/app/src/main/java/com/example/logistics/manager/operationManager.java
+++ b/src/Logistics/app/src/main/java/com/example/logistics/manager/operationManager.java
@ -15,7 +15,7 @@ import java.util.List;
 import java.util.Map;
 public class operationManager {
-    private static final String TAG = "operationDao";
+    private static final String TAG = "operationManager";
    public boolean add(String pickupcode, String phonenum){
        HashMap<String, Object> map = new HashMap<>();
@ -54,6 +54,8 @@ public class operationManager {
            e.printStackTrace();
            Log.e(TAG, "异常 add operation");
            return false;
        }finally {
        }
    }
@ -98,6 +100,8 @@ public class operationManager {
        }catch (Exception e){
            e.printStackTrace();
            Log.d(TAG, "search bug: " + e.getMessage());
        }finally {
        }
        return datalist;
    }
--- a/src/Logistics/app/src/main/java/com/example/logistics/manager/userManager.java
+++ b/src/Logistics/app/src/main/java/com/example/logistics/manager/userManager.java
@ -14,7 +14,7 @@ import java.sql.Connection;
 public class userManager {
-    private static final String TAG = "userDao";
+    private static final String TAG = "userManager";
    public int login(String username, String password){
        HashMap<String, Object> map = new HashMap<>();
@ -71,6 +71,8 @@ public class userManager {
            e.printStackTrace();
            Log.d(TAG, "login bug: " + e.getMessage());
            msg = 0;
        } finally {
        }
        return msg;
    }
@ -130,6 +132,8 @@ public class userManager {
            e.printStackTrace();
            Log.d(TAG, "login bug: " + e.getMessage());
            msg = 0;
        } finally {
        }
        return msg;
    }
@ -158,6 +162,8 @@ public class userManager {
            }
        } catch (SQLException throwables) {
            throwables.printStackTrace();
        } finally {
        }
        return user;
    }
@ -193,6 +199,8 @@ public class userManager {
            e.printStackTrace();
            Log.e(TAG, "异常 register");
            return false;
        } finally {
        }
    }
@ -230,6 +238,8 @@ public class userManager {
            e.printStackTrace();
            Log.d(TAG, "login bug: " + e.getMessage());
            msg = 0;
        } finally {
        }
        return msg;
    }
--- a/src/Logistics/app/src/main/java/com/example/logistics/tools/DBOpenHelper.java
+++ b/src/Logistics/app/src/main/java/com/example/logistics/tools/DBOpenHelper.java
@ -22,6 +22,8 @@ public class DBOpenHelper {
            e.printStackTrace();
        } catch (SQLException e) {
            e.printStackTrace();
        } finally {
        }
        return conn;
    }
--- a/src/Logistics/app/src/main/java/com/example/logistics/tools/MD5Utils.java
+++ b/src/Logistics/app/src/main/java/com/example/logistics/tools/MD5Utils.java
@ -32,6 +32,8 @@ public class MD5Utils {
            e.printStackTrace();
            //发送异常return空字符串
            return "";
        } finally {
        }
    }
 }
--- a/src/Logistics/app/src/main/java/com/example/logistics/ui/HistoryUI.java
+++ b/src/Logistics/app/src/main/java/com/example/logistics/ui/HistoryUI.java
@ -27,7 +27,7 @@ import java.util.Map;
 public class HistoryUI extends Activity implements OnItemClickListener, OnScrollListener, View.OnClickListener  {
-    private String TAG = "HistoryActivity";
+    private String TAG = "HistoryUI";
    private ListView lv_history;
    private ArrayAdapter<String> arr_adapter;
    private SimpleAdapter simp_adapter;
--- a/src/Logistics/app/src/main/java/com/example/logistics/ui/LoginUI.java
+++ b/src/Logistics/app/src/main/java/com/example/logistics/ui/LoginUI.java
@ -32,7 +32,7 @@ public class LoginUI extends Activity {
    int flag = 0; //flag = 0 是用户名登录；=1是手机号
    // 调用Actvity
-    private String TAG = "LoginActivity";
+    private String TAG = "LoginUI";
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
--- a/src/Logistics/app/src/main/java/com/example/logistics/ui/MenuActivity.java
+++ b/src/Logistics/app/src/main/java/com/example/logistics/ui/MenuActivity.java
@ -18,6 +18,8 @@ import com.example.logistics.R;
 public class MenuActivity extends AppCompatActivity implements View.OnClickListener{
    private String TAG = "MenuActivity";
    private LinearLayout ly_one,ly_two,ly_three;
    private TextView mTextView1,mTextView2,mTextView3;
    private TextView mTextNum1,mTextNum2,mTextNum3;
--- a/src/Logistics/app/src/main/java/com/example/logistics/ui/PickUpUI.java
+++ b/src/Logistics/app/src/main/java/com/example/logistics/ui/PickUpUI.java
@ -93,6 +93,8 @@ public class PickUpUI extends Fragment implements View.OnClickListener{
                            js.put("op", "confirm");
                        } catch (JSONException e) {
                            e.printStackTrace();
                        } finally {
                        }
                        flag = 1;
@ -113,6 +115,8 @@ public class PickUpUI extends Fragment implements View.OnClickListener{
                            js.put("op", "confirm");
                        } catch (JSONException e) {
                            e.printStackTrace();
                        } finally {
                        }
                        client.send(js.toString());
@ -154,6 +158,8 @@ public class PickUpUI extends Fragment implements View.OnClickListener{
                    client.connectBlocking();
                } catch (InterruptedException e) {
                    e.printStackTrace();
                }finally {
                }
            }
        }.start();
@ -196,6 +202,8 @@ public class PickUpUI extends Fragment implements View.OnClickListener{
        } catch (JSONException jsonException) {
            jsonException.printStackTrace();
        } finally {
        }
    }
@ -296,6 +304,8 @@ public class PickUpUI extends Fragment implements View.OnClickListener{
                js.put("op", "connect");
            } catch (JSONException jsonException) {
                jsonException.printStackTrace();
            } finally {
            }
            if (null != client) {
--- a/src/Logistics/app/src/main/java/com/example/logistics/ui/SearchUI.java
+++ b/src/Logistics/app/src/main/java/com/example/logistics/ui/SearchUI.java
@ -27,7 +27,8 @@ import java.util.Map;
 public class SearchUI extends Activity implements OnItemClickListener, OnScrollListener, View.OnClickListener {
-    private String TAG = "NoPickActivity";
+    private String TAG = "SearchUI";
    private ListView lv_nopick;
    private ArrayAdapter<String> arr_adapter;
    private SimpleAdapter simp_adapter;
--- a/src/Logistics/app/src/main/java/com/example/logistics/ui/SetUI.java
+++ b/src/Logistics/app/src/main/java/com/example/logistics/ui/SetUI.java
@ -16,6 +16,9 @@ import androidx.annotation.Nullable;
 import com.example.logistics.R;
 public class SetUI extends Fragment implements View.OnClickListener{
    private String TAG = "SetUI";
    private LinearLayout ll_waiting;
    private LinearLayout ll_history;
    private LinearLayout ll_exit;
--- a/src/Logistics/app/src/main/java/com/jilk/ros/Example.java
+++ b/src/Logistics/app/src/main/java/com/jilk/ros/Example.java
@ -89,6 +89,8 @@ public class Example {
        }
        catch (InterruptedException ex) {
            System.out.println("Process was interrupted.");
        } finally {
        }
        /*
        Service<Empty, Topics> topicService =
@ -123,12 +125,16 @@ public class Example {
        Topic<Clock> clockTopic = new Topic<Clock>("/clock", Clock.class, client);
        clockTopic.subscribe();
        try {
-            Thread.sleep(20000);} catch(InterruptedException ex) {}
+            Thread.sleep(20000);} catch(InterruptedException ex) {}finally {
        }
        Clock cl = null;
        try {
            cl = clockTopic.take(); // just gets one
        }
-        catch (InterruptedException ex) {}
+        catch (InterruptedException ex) {}finally {
        }
        cl.print();
        cl.clock.nsecs++;
        clockTopic.unsubscribe();
--- a/src/Logistics/app/src/main/java/com/jilk/ros/Topic.java
+++ b/src/Logistics/app/src/main/java/com/jilk/ros/Topic.java
@ -136,6 +136,8 @@ public class Topic<T extends Message> extends LinkedBlockingQueue<T> implements
                }
                catch (InterruptedException ex) {
                    break;
                } finally {
                }
            }
        }
--- a/src/Logistics/app/src/main/java/com/jilk/ros/message/Message.java
+++ b/src/Logistics/app/src/main/java/com/jilk/ros/message/Message.java
@ -53,6 +53,8 @@ public abstract class Message {
        catch (MessageException ex) {
            // should be changed to be a hooked method to give library user control
            System.out.println(ex.getMessage());
        }finally {
        }
    }
@ -165,6 +167,9 @@ public abstract class Message {
        }
        catch (IllegalAccessException ex) {
            ex.printStackTrace();
        }
        finally {
        }
        return fo;
    }
@ -190,6 +195,9 @@ public abstract class Message {
        }
        catch (ClassCastException ex) {
            throw new RuntimeException("copyFrom error", ex);
        }
        finally {
        }
        // ReflectiveOperationException is not available on Android (Java 1.6)
        /*
--- a/src/Logistics/app/src/main/java/com/jilk/ros/rosbridge/ROSBridgeClient.java
+++ b/src/Logistics/app/src/main/java/com/jilk/ros/rosbridge/ROSBridgeClient.java
@ -58,7 +58,12 @@ public class ROSBridgeClient extends ROSClient {
            try {
                result = client.connectBlocking();
            }
-            catch (InterruptedException ex) {}
+            catch (InterruptedException ex) {
            }
            finally {
            }
        }
        return result;
    }
@ -68,7 +73,12 @@ public class ROSBridgeClient extends ROSClient {
        try {
            client.closeBlocking();
        }
-        catch (InterruptedException ex) {}
+        catch (InterruptedException ex) {
        }
        finally {
        }
    }
    @Override
--- a/src/Logistics/app/src/main/java/com/jilk/ros/rosbridge/implementation/JSON.java
+++ b/src/Logistics/app/src/main/java/com/jilk/ros/rosbridge/implementation/JSON.java
@ -162,6 +162,9 @@ public class JSON {
        }
        catch (IllegalAccessException ex) {
            ex.printStackTrace();
        }
        finally {
        }
        return fo;
    }        
@ -178,6 +181,9 @@ public class JSON {
        }
        catch (Throwable t) {
            System.out.println(t.getMessage());
        }
        finally {
        }
        r.close();        
        return result;
@ -215,6 +221,9 @@ public class JSON {
            //ex.printStackTrace();
            return null;
        }
        finally {
        }
    }
    // Convert the JSON-Simple array to the indicated message, element-by-element
@ -261,6 +270,9 @@ public class JSON {
            ex.printStackTrace();
            return null;
        }
        finally {
        }
    }
    // Convert an individual array or object element to a field in the Message,
--- a/src/Logistics/app/src/main/java/com/jilk/ros/rosbridge/implementation/ROSBridgeWebSocketClient.java
+++ b/src/Logistics/app/src/main/java/com/jilk/ros/rosbridge/implementation/ROSBridgeWebSocketClient.java
@ -61,6 +61,8 @@ public class ROSBridgeWebSocketClient extends WebSocketClient {
            client = new ROSBridgeWebSocketClient(uri);
        } catch (URISyntaxException ex) {
            ex.printStackTrace();
        } finally {
        }
        return client;
    }
@ -114,6 +116,8 @@ public class ROSBridgeWebSocketClient extends WebSocketClient {
                    EventBus.getDefault().post(new PublishEvent(operation, publish.topic, content));
                } catch (ParseException e) {
                    e.printStackTrace();
                } finally {
                }
                System.out.println("Publish " + publish.topic);
@ -126,6 +130,8 @@ public class ROSBridgeWebSocketClient extends WebSocketClient {
                    EventBus.getDefault().post(new PublishEvent(operation, serviceResponse.service, content));
                } catch (ParseException e) {
                    e.printStackTrace();
                } finally {
                }
                System.out.println("Service Response " + serviceResponse.service);
@ -167,6 +173,8 @@ public class ROSBridgeWebSocketClient extends WebSocketClient {
        } catch (Exception ex) {
            System.out.println("Exception in Websocket close hack.");
            ex.printStackTrace();
        } finally {
        }
    }
--- a/src/server/src/main/java/com/example/testdemo/manager/MessageManager.java
+++ b/src/server/src/main/java/com/example/testdemo/manager/MessageManager.java
@ -24,17 +24,17 @@ import java.util.concurrent.atomic.AtomicInteger;
@Slf4j
@ServerEndpoint("/result")
@Component
-public class MessageManager {
+public class QueueManager {
    @Autowired
    private GoodManager gmanager;
    private static String TAG = "SendObjectMessage";
    private static AtomicInteger onlineCount = new AtomicInteger(0);
-    private static ConcurrentLinkedQueue<MessageManager> socket = new ConcurrentLinkedQueue<MessageManager>();
+    private static ConcurrentLinkedQueue<QueueManager> socket = new ConcurrentLinkedQueue<QueueManager>();
    private Session session;
-    private MessageManager mObject = null;
+    private QueueManager mObject = null;
    @OnOpen
    public void onOpen(Session session) {