pull/17/head
Xie Changrong 3 years ago
parent fe9633f168
commit 7889a9e970

@ -43,4 +43,5 @@ dependencies {
testImplementation 'junit:junit:4.13.2' testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
implementation "org.java-websocket:Java-WebSocket:1.4.0"
} }

@ -8,7 +8,7 @@
function callJS(){ function callJS(){
var ros = new ROSLIB.Ros({ var ros = new ROSLIB.Ros({
url : 'ws://192.168.43.164:9090' url : 'ws://192.168.43.20:9090'
}); });
ros.on('connection', function() { ros.on('connection', function() {
@ -86,11 +86,11 @@
console.log('Connection to websocket server closed.'); console.log('Connection to websocket server closed.');
}); });
goal.send(); //goal.send();
/*var cmdVel = new ROSLIB.Topic({ var cmdVel = new ROSLIB.Topic({
ros : ros, ros : ros,
name : '/cmd_vel_mux/input/navi', name : '/cmd_vel',
messageType : 'geometry_msgs/Twist' messageType : 'geometry_msgs/Twist'
}); });
@ -106,7 +106,7 @@
z : 0.0 z : 0.0
} }
}); });
cmdVel.publish(twist);*/ cmdVel.publish(twist);
} }
</script> </script>

@ -1,4 +1,4 @@
package com.example.logistics.dao; package com.example.logistics.manager;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.Context; import android.content.Context;
@ -7,8 +7,6 @@ import android.util.Log;
import com.example.logistics.tools.DBOpenHelper; import com.example.logistics.tools.DBOpenHelper;
import com.example.logistics.tools.MD5Utils; import com.example.logistics.tools.MD5Utils;
import com.example.logistics.ui.MainActivity;
import com.example.logistics.ui.MenuActivity;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
@ -18,7 +16,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
public class goodDao { public class goodManager {
private static final String TAG = "goodDao"; private static final String TAG = "goodDao";
@ -165,5 +163,61 @@ public class goodDao {
return datalist; return datalist;
} }
public int pickup(String pickupcode, String phonenum){
HashMap<String, Object> map = new HashMap<>();
Connection connection = DBOpenHelper.getConn();
int msg = 0;
try{
String sql = "select * from goods where id=?";
if(connection != null){
PreparedStatement ps = connection.prepareStatement(sql);
if(ps != null){
Log.e(TAG, "pickupcode: " + pickupcode);
ps.setInt(1,Integer.parseInt(pickupcode));
ResultSet rs = ps.executeQuery();
int count = rs.getMetaData().getColumnCount();
while(rs.next()){
for(int i = 1; i <= count; i++){
String field = rs.getMetaData().getColumnName(i);
map.put(field, rs.getString(field));
}
}
connection.close();
ps.close();
if(map.size() != 0){
StringBuilder s = new StringBuilder();
for(String key:map.keySet()){
if(key.equals("phonenum")){
if(phonenum.equals(map.get(key).toString().substring(7,11))){
msg = 1; //password correct
}else{
msg = 2; //password incorrect
}
break;
}
}
}else{
Log.e(TAG, "result is null");
msg = 3; //result is null
}
}else{
Log.e(TAG, "ps is null");
msg = 0;
}
}else{
Log.e(TAG, "connection is null");
msg = 0;
}
}catch (Exception e){
e.printStackTrace();
Log.d(TAG, "login bug: " + e.getMessage());
msg = 0;
}
return msg;
}
} }

@ -1,10 +1,8 @@
package com.example.logistics.dao; package com.example.logistics.manager;
import android.util.Log; import android.util.Log;
import com.example.logistics.entity.User;
import com.example.logistics.tools.DBOpenHelper; import com.example.logistics.tools.DBOpenHelper;
import com.example.logistics.tools.MD5Utils;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
@ -16,7 +14,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
public class operationDao { public class operationManager {
private static final String TAG = "operationDao"; private static final String TAG = "operationDao";
public boolean add(String pickupcode, String phonenum){ public boolean add(String pickupcode, String phonenum){

@ -1,4 +1,4 @@
package com.example.logistics.dao; package com.example.logistics.manager;
import android.util.Log; import android.util.Log;
@ -12,7 +12,7 @@ import java.util.HashMap;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.Connection; import java.sql.Connection;
public class userDao { public class userManager {
private static final String TAG = "userDao"; private static final String TAG = "userDao";
@ -46,6 +46,7 @@ public class userDao {
StringBuilder s = new StringBuilder(); StringBuilder s = new StringBuilder();
for(String key:map.keySet()){ for(String key:map.keySet()){
if(key.equals("password")){ if(key.equals("password")){
if(password.equals(map.get(key))){ if(password.equals(map.get(key))){
msg = 1; //password correct msg = 1; //password correct
}else{ }else{

@ -7,9 +7,9 @@ import java.sql.SQLException;
public class DBOpenHelper { public class DBOpenHelper {
private static String diver = "com.mysql.jdbc.Driver"; private static String diver = "com.mysql.jdbc.Driver";
//加入utf-8是为了后面往表中输入中文表中不会出现乱码的情况 //加入utf-8是为了后面往表中输入中文表中不会出现乱码的情况
private static String url = "jdbc:mysql://49.235.83.73:3306/logistics?characterEncoding=utf-8"; private static String url = "jdbc:mysql://192.168.43.203:3306/logistics?characterEncoding=utf-8";
private static String user = "root";//用户名 private static String user = "root";//用户名
private static String password = "123";//密码 private static String password = "";//密码
/* /*
* *
* */ * */

@ -0,0 +1,35 @@
package com.example.logistics.tools;
import android.util.Log;
import org.java_websocket.client.WebSocketClient;
import org.java_websocket.drafts.Draft_6455;
import org.java_websocket.handshake.ServerHandshake;
import java.net.URI;
public class JWebSocketClient extends WebSocketClient {
public JWebSocketClient(URI serverUri) {
super(serverUri, new Draft_6455());
}
@Override
public void onOpen(ServerHandshake handshakedata) {
Log.e("JWebSocketClient", "onOpen()");
}
@Override
public void onMessage(String message) {
Log.e("JWebSocketClient", "onMessage()");
}
@Override
public void onClose(int code, String reason, boolean remote) {
Log.e("JWebSocketClient", "onClose()");
}
@Override
public void onError(Exception ex) {
Log.e("JWebSocketClient", "onError()");
}
}

@ -1,11 +1,8 @@
package com.example.logistics.ui; package com.example.logistics.ui;
import androidx.appcompat.app.AppCompatActivity;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.Activity; import android.app.Activity;
import android.content.Intent; import android.content.Intent;
import android.media.Image;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.Message; import android.os.Message;
@ -22,8 +19,7 @@ import android.widget.AdapterView.OnItemClickListener;
import android.widget.Toast; import android.widget.Toast;
import com.example.logistics.R; import com.example.logistics.R;
import com.example.logistics.dao.goodDao; import com.example.logistics.manager.operationManager;
import com.example.logistics.dao.operationDao;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -101,8 +97,8 @@ public class HistoryActivity extends Activity implements OnItemClickListener, On
new Thread(){ new Thread(){
@Override @Override
public void run(){ public void run(){
operationDao operationDao = new operationDao(); operationManager operationManager = new operationManager();
dataList = operationDao.history(phonenum); dataList = operationManager.history(phonenum);
int msg = 1; int msg = 1;
hand1.sendEmptyMessage(msg); hand1.sendEmptyMessage(msg);

@ -1,9 +1,8 @@
package com.example.logistics.ui; package com.example.logistics.ui;
import com.example.logistics.R; import com.example.logistics.R;
import com.example.logistics.dao.userDao; import com.example.logistics.manager.userManager;
import com.example.logistics.entity.User; import com.example.logistics.entity.User;
import com.example.logistics.tools.MD5Utils;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.Activity; import android.app.Activity;
@ -17,9 +16,6 @@ import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.Toast; import android.widget.Toast;
import java.text.SimpleDateFormat;
import java.util.Date;
public class MainActivity extends Activity { public class MainActivity extends Activity {
@ -60,12 +56,12 @@ public class MainActivity extends Activity {
new Thread(){ new Thread(){
@Override @Override
public void run(){ public void run(){
userDao userDao = new userDao(); userManager userManager = new userManager();
int msg = userDao.login(userName.getText().toString().trim(), passWord.getText().toString().trim()); int msg = userManager.login(userName.getText().toString().trim(), passWord.getText().toString().trim());
Log.e("MAin", "msg"); Log.e("MAin", "msg");
hand1.sendEmptyMessage(msg); hand1.sendEmptyMessage(msg);
if(msg == 1){ if(msg == 1){
User owner = userDao.findUser(userName.getText().toString().trim()); User owner = userManager.findUser(userName.getText().toString().trim());
Intent intent = new Intent(MainActivity.this, MenuActivity.class); Intent intent = new Intent(MainActivity.this, MenuActivity.class);
intent.putExtra("user", owner.getPhoneNum()); intent.putExtra("user", owner.getPhoneNum());
startActivity(intent); startActivity(intent);

@ -18,14 +18,14 @@ import com.example.logistics.R;
import org.w3c.dom.Text; import org.w3c.dom.Text;
public class MyFragment3 extends Fragment implements View.OnClickListener{ public class MeUI extends Fragment implements View.OnClickListener{
private LinearLayout ll_waiting; private LinearLayout ll_waiting;
private LinearLayout ll_history; private LinearLayout ll_history;
private LinearLayout ll_exit; private LinearLayout ll_exit;
private Context mContext; private Context mContext;
private String user; private String user;
public MyFragment3(){ public MeUI(){
} }
@Nullable @Nullable

@ -93,7 +93,7 @@ public class MenuActivity extends AppCompatActivity implements View.OnClickListe
mTextView1.setSelected(true); mTextView1.setSelected(true);
mTextNum1.setVisibility(View.INVISIBLE); mTextNum1.setVisibility(View.INVISIBLE);
if (mFrag1 == null) { if (mFrag1 == null) {
mFrag1 = new MyFragment1(); mFrag1 = new SearchUI();
transaction.add(R.id.fragment_container, mFrag1); transaction.add(R.id.fragment_container, mFrag1);
@ -106,7 +106,7 @@ public class MenuActivity extends AppCompatActivity implements View.OnClickListe
mTextView2.setSelected(true); mTextView2.setSelected(true);
mTextNum2.setVisibility(View.INVISIBLE); mTextNum2.setVisibility(View.INVISIBLE);
if (mFrag2 == null) { if (mFrag2 == null) {
mFrag2 = new MyFragment2(); mFrag2 = new PickUpUI();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("user", owner); bundle.putString("user", owner);
mFrag2.setArguments(bundle); mFrag2.setArguments(bundle);
@ -120,7 +120,7 @@ public class MenuActivity extends AppCompatActivity implements View.OnClickListe
mTextView3.setSelected(true); mTextView3.setSelected(true);
mTextNum3.setVisibility(View.INVISIBLE); mTextNum3.setVisibility(View.INVISIBLE);
if (mFrag3 == null) { if (mFrag3 == null) {
mFrag3 = new MyFragment3(); mFrag3 = new MeUI();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("user", owner); bundle.putString("user", owner);
mFrag3.setArguments(bundle); mFrag3.setArguments(bundle);

@ -1,220 +0,0 @@
package com.example.logistics.ui;
import androidx.fragment.app.Fragment;
import android.annotation.SuppressLint;
import android.app.AlertDialog;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.Nullable;
import com.example.logistics.R;
import com.example.logistics.dao.goodDao;
import com.example.logistics.dao.operationDao;
import com.example.logistics.dao.userDao;
import com.example.logistics.entity.User;
import com.google.zxing.integration.android.IntentIntegrator;
import com.google.zxing.integration.android.IntentResult;
import com.journeyapps.barcodescanner.CaptureActivity;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
public class MyFragment2 extends Fragment implements View.OnClickListener{
private Button mButton;
private Context mContext;
private WebView mWebView;
public MyFragment2(){
}
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.my_fragment2,container,false);
mWebView = (WebView) view.findViewById(R.id.webview);
WebSettings webSettings = mWebView.getSettings();
mButton = (Button)view.findViewById(R.id.Pick_Button);
mButton.setOnClickListener(this);
mContext = getActivity();
webSettings.setJavaScriptEnabled(true);
mWebView.loadUrl("file:///android_asset/js.html");
Log.i("set", "listner");
mWebView.setWebViewClient(new WebViewClient(){
@Override
public void onPageFinished(WebView view, String url){
super.onPageFinished(view, url);
String jsStr1 = "";
try{
InputStream in1 = mContext.getAssets().open("em.js");
byte buff[] = new byte[1024];
ByteArrayOutputStream fromFile = new ByteArrayOutputStream();
do {
int numRead = in1.read(buff);
if (numRead <= 0) {
break;
}
fromFile.write(buff, 0, numRead);
} while (true);
jsStr1 = fromFile.toString();
in1.close();
fromFile.close();
} catch (IOException e) {
e.printStackTrace();
}
mWebView.loadUrl("javascript:" + jsStr1);
String jsStr2 = "";
try{
InputStream in2 = mContext.getAssets().open("roslib.min.js");
byte buff[] = new byte[1024];
ByteArrayOutputStream fromFile = new ByteArrayOutputStream();
do {
int numRead = in2.read(buff);
if (numRead <= 0) {
break;
}
fromFile.write(buff, 0, numRead);
} while (true);
jsStr2 = fromFile.toString();
in2.close();
fromFile.close();
} catch (IOException e) {
e.printStackTrace();
}
mWebView.loadUrl("javascript:" + jsStr2);
}
});
return view;
}
@Override
public void onClick(View view) {
switch(view.getId()){
case R.id.Pick_Button:
/*new IntentIntegrator(getActivity())
.setDesiredBarcodeFormats(IntentIntegrator.QR_CODE)// 扫码的类型,一维码,二维码,一/二维码,默认为一/二维码
.setPrompt("请对准摄像头")
.setCameraId(0)
.setBeepEnabled(false)
.setCaptureActivity(CaptureActivity.class)
.initiateScan();*/
pickup("abnc");
}
}
public void test(){
mWebView.loadUrl("javascript:callJS()");
Log.i("abc", "bcd");
}
@Override
@SuppressLint("MissingSuperCall")
public void onActivityResult(int requestCode, int resultCode, Intent data) {
IntentResult result = IntentIntegrator.parseActivityResult(requestCode, resultCode, data);
if(result != null) {
if(result.getContents() != null) {
//Toast.makeText(mContext, "Scanned: " + result.getContents(), Toast.LENGTH_LONG).show();
pickup(result.getContents());
}
}
}
public void pickup(String result){
AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
View view2 = View.inflate(mContext, R.layout.pickup, null);
EditText PickUpCode = (EditText) view2.findViewById(R.id.pk_PickUp);
EditText PhoneNum = (EditText) view2.findViewById(R.id.pk_PhoneNum);
Button button = (Button) view2.findViewById(R.id.pk_button);
builder.setTitle("取件").setView(view2);
builder.create().show();
button.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
String pickupcode = PickUpCode.getText().toString().trim();
String phonenum = PhoneNum.getText().toString().trim();
Log.d("onclick", "123");
//String QR_pickup = result.split(" ")[0];
//String QR_phone = result.split(" ")[1];
if(true){
//if (pickupcode.equals(QR_pickup) && phonenum.equals(QR_phone)) {
/*new Thread() {
@Override
public void run() {
int msg = 0;
operationDao operationDao = new operationDao();
goodDao goodDao = new goodDao();
Bundle bundle = getArguments();
String user = bundle.getString("user");
boolean flag1 = operationDao.add(pickupcode, user);
boolean flag2 = goodDao.delete(pickupcode);
boolean flag = flag1 & flag2;
if (flag) {
msg = 1;
}
int msg = 1;
test();
hand1.sendEmptyMessage(msg);
}
}.start();*/
Toast.makeText(mContext, "取件成功", Toast.LENGTH_LONG).show();
test();
} else {
Toast.makeText(mContext, "取件失败", Toast.LENGTH_LONG).show();
}
}
});
}
@SuppressLint("HandlerLeak")
final Handler hand1 = new Handler() {
@Override
public void handleMessage(Message msg) {
if (msg.what == 1) {
Toast.makeText(mContext, "取件成功", Toast.LENGTH_SHORT).show();
} else {
Toast.makeText(mContext, "取件失败", Toast.LENGTH_SHORT);
}
}
};
}

@ -1,9 +1,5 @@
package com.example.logistics.ui; package com.example.logistics.ui;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.Activity; import android.app.Activity;
import android.content.Intent; import android.content.Intent;
@ -19,21 +15,14 @@ import android.widget.AdapterView;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.ImageButton; import android.widget.ImageButton;
import android.widget.ListView; import android.widget.ListView;
import android.widget.NumberPicker;
import android.widget.SimpleAdapter; import android.widget.SimpleAdapter;
import android.widget.Toast; import android.widget.Toast;
import com.example.logistics.R; import com.example.logistics.R;
import com.example.logistics.dao.goodDao; import com.example.logistics.manager.goodManager;
import com.example.logistics.dao.userDao;
import com.example.logistics.entity.User;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.ListIterator;
import java.util.Map; import java.util.Map;
public class NoPickActivity extends Activity implements OnItemClickListener, OnScrollListener, View.OnClickListener { public class NoPickActivity extends Activity implements OnItemClickListener, OnScrollListener, View.OnClickListener {
@ -110,8 +99,8 @@ public class NoPickActivity extends Activity implements OnItemClickListener, OnS
new Thread(){ new Thread(){
@Override @Override
public void run(){ public void run(){
goodDao goodDao = new goodDao(); goodManager goodManager = new goodManager();
dataList = goodDao.nopick(phonenum); dataList = goodManager.nopick(phonenum);
int msg = 1; int msg = 1;
hand1.sendEmptyMessage(msg); hand1.sendEmptyMessage(msg);

@ -0,0 +1,306 @@
package com.example.logistics.ui;
import androidx.fragment.app.Fragment;
import android.annotation.SuppressLint;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.webkit.WebSettings;
import android.widget.Button;
import android.widget.EditText;
import android.widget.Toast;
import androidx.annotation.Nullable;
import com.example.logistics.R;
import com.example.logistics.manager.goodManager;
import com.example.logistics.manager.operationManager;
import com.example.logistics.tools.JWebSocketClient;
import com.google.zxing.integration.android.IntentIntegrator;
import com.google.zxing.integration.android.IntentResult;
import org.java_websocket.handshake.ServerHandshake;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
public class PickUpUI extends Fragment implements View.OnClickListener{
private Button mButton;
private Context mContext;
private JWebSocketClient client;
private AlertDialog alert;
private AlertDialog alert2;
private EditText PickUpCode;
private EditText PhoneNum;
private String pickupcode;
private String phonenum;
private int shelfnum = 1;
private int floornum = 1;
private String ws = "ws://192.168.43.203:8080/result";
private String TAG = "PickUpUI";
int flag = 0; //flag=0:chushi
public PickUpUI(){
}
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.my_fragment2,container,false);
mButton = (Button)view.findViewById(R.id.Pick_Button);
mButton.setOnClickListener(this);
mContext = getActivity();
Log.i("set", "listner");
setAlert();
return view;
}
void setAlert(){
alert = new android.app.AlertDialog.Builder(mContext)
.setTitle("提醒")
.setMessage("是否确认取件")
.setPositiveButton("确认", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
Log.d("alert","yes");
//add(operation);
JSONObject js = new JSONObject();
try {
js.put("content", "yes");
js.put("op", "confirm");
} catch (JSONException e) {
e.printStackTrace();
}
flag = 1;
mButton.setText("确认");
client.send(js.toString());
Log.d("alert", "send");
}
})
.setNegativeButton("取消", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
Log.d("alert","no");
JSONObject js = new JSONObject();
try {
js.put("confirm", "no");
js.put("op", "confirm");
} catch (JSONException e) {
e.printStackTrace();
}
client.send(js.toString());
}
})
.create();
Log.d(TAG, "setAlert");
}
void setWebsocket(){
URI uri = URI.create(ws);
client = new JWebSocketClient(uri){
@Override
public void onMessage(String message) {
Log.e("JWebSocketClientService", "收到的消息:" + message);
Log.e("alert",message);
if(message.equals("confirm")){
alert.dismiss();
hand2.sendEmptyMessage(3);
Log.e("alert","show");
}
}
@Override
public void onOpen(ServerHandshake handshakedata) {
super.onOpen(handshakedata);
Log.e("JWebSocketClientService", "websocket连接成功");
};
};
connect();
}
private void connect() {
new Thread() {
@Override
public void run() {
try {
//connectBlocking多出一个等待操作会先连接再发送否则未连接发送会报错
client.connectBlocking();
} catch (InterruptedException e) {
e.printStackTrace();
}
}
}.start();
}
@SuppressLint("HandlerLeak")
final Handler hand2 = new Handler(){
@Override
public void handleMessage(Message msg){
alert.show();
}
};
@Override
public void onClick(View view) {
switch(view.getId()){
case R.id.Pick_Button:
Log.e(TAG, "onclick");
if(flag == 1){
confirm();
}else{
pickup();
}
}
}
void confirm(){
JSONObject js = new JSONObject();
try {
js.put("op","finish");
client.send(js.toString());
flag = 0;
mButton.setText("取件");
client.onClose(1,"close",true);
Log.d("finish", "over");
} catch (JSONException jsonException) {
jsonException.printStackTrace();
}
}
public void pickup(){
AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
View view2 = View.inflate(mContext, R.layout.pickup, null);
PickUpCode = (EditText) view2.findViewById(R.id.pk_PickUp);
PhoneNum = (EditText) view2.findViewById(R.id.pk_PhoneNum);
Button button = (Button) view2.findViewById(R.id.pk_button);
builder.setTitle("取件").setView(view2);
alert2 = builder.create();
alert2.show();
button.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Log.e(TAG,"onclick");
setWebsocket();
pickupcode = PickUpCode.getText().toString().trim();
phonenum = PhoneNum.getText().toString().trim();
Log.d("onclick", "123");
new Thread() {
@Override
public void run() {
int msg = 0;
operationManager operationManager = new operationManager();
goodManager goodManager = new goodManager();
Bundle bundle = getArguments();
String user = bundle.getString("user");
msg = goodManager.pickup(pickupcode,phonenum);
Log.d(TAG, "pickup");
if(msg != 1){
Log.d(TAG, "pickup,failed");
hand1.sendEmptyMessage(msg);
return;
}
Log.d(TAG, "pickup,success");
boolean flag1 = operationManager.add(pickupcode, user);
boolean flag2 = goodManager.delete(pickupcode);
boolean flag = flag1 & flag2;
if (flag) {
msg = 1;
}
hand1.sendEmptyMessage(msg);
}
}.start();
}
});
}
@SuppressLint("HandlerLeak")
final Handler hand1 = new Handler() {
@Override
public void handleMessage(Message msg) {
if(msg.what == 0){
Toast.makeText(mContext, "取件失败", Toast.LENGTH_SHORT).show();
}else if(msg.what == 1){
Toast.makeText(mContext, "加入队列成功", Toast.LENGTH_SHORT).show();
joinQueue();
}else if(msg.what == 2){
Toast.makeText(mContext, "手机号错误", Toast.LENGTH_SHORT).show();
}else if(msg.what == 3){
Toast.makeText(mContext, "取件码不存在", Toast.LENGTH_SHORT).show();
}
}
};
void joinQueue(){
alert2.dismiss();
if (client != null && client.isOpen()) {
JSONObject js = new JSONObject();
JSONObject con = new JSONObject();
try {
Log.d(TAG, pickupcode);
Log.d(TAG, phonenum);
con.put("code", Integer.parseInt(pickupcode));
con.put("shelf", shelfnum);
con.put("floor", floornum);
con.put("user", "xcr");
js.put("content", con);
js.put("op", "connect");
} catch (JSONException jsonException) {
jsonException.printStackTrace();
}
if (null != client) {
Log.e("JWebSocketClientService", "发送的消息:" + js.toString());
client.send(js.toString());
//暂时将发送的消息加入消息列表,实际以发送成功为准(也就是服务器返回你发的消息时)
}
}
}
}

@ -2,9 +2,7 @@ package com.example.logistics.ui;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.AlertDialog;
import android.content.Context; import android.content.Context;
import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.Message; import android.os.Message;
@ -14,23 +12,21 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import com.example.logistics.R; import com.example.logistics.R;
import com.example.logistics.dao.goodDao; import com.example.logistics.manager.goodManager;
import com.example.logistics.dao.userDao;
public class MyFragment1 extends Fragment implements View.OnClickListener{ public class SearchUI extends Fragment implements View.OnClickListener{
private Context mContext; private Context mContext;
private Button mButton; private Button mButton;
private EditText mPickUpCode; private EditText mPickUpCode;
private EditText mPhoneNum; private EditText mPhoneNum;
public MyFragment1(){ public SearchUI(){
} }
@Nullable @Nullable
@ -60,8 +56,8 @@ public class MyFragment1 extends Fragment implements View.OnClickListener{
new Thread(){ new Thread(){
@Override @Override
public void run(){ public void run(){
goodDao goodDao = new goodDao(); goodManager goodManager = new goodManager();
int msg = goodDao.search(mPickUpCode.getText().toString().trim(), mPhoneNum.getText().toString().trim(), getActivity()); int msg = goodManager.search(mPickUpCode.getText().toString().trim(), mPhoneNum.getText().toString().trim(), getActivity());
Log.e("Main", "msg"); Log.e("Main", "msg");
hand1.sendEmptyMessage(msg); hand1.sendEmptyMessage(msg);
} }

@ -12,7 +12,7 @@ import android.widget.EditText;
import android.widget.Toast; import android.widget.Toast;
import com.example.logistics.R; import com.example.logistics.R;
import com.example.logistics.dao.userDao; import com.example.logistics.manager.userManager;
import com.example.logistics.entity.User; import com.example.logistics.entity.User;
public class SignUpActivity extends Activity { public class SignUpActivity extends Activity {
@ -79,14 +79,14 @@ public class SignUpActivity extends Activity {
@Override @Override
public void run(){ public void run(){
int msg = 0; int msg = 0;
userDao userDao = new userDao(); userManager userManager = new userManager();
User uu = userDao.findUser(user.getUserName()); User uu = userManager.findUser(user.getUserName());
if(uu != null){ if(uu != null){
msg = 1; //have this account msg = 1; //have this account
}else{ }else{
boolean flag = userDao.register(user); boolean flag = userManager.register(user);
if(flag){ if(flag){
msg = 2; msg = 2;
} }

@ -0,0 +1,33 @@
HELP.md
target/
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/
### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr
### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
build/
!**/src/main/**/build/
!**/src/test/**/build/
### VS Code ###
.vscode/

Binary file not shown.

@ -0,0 +1,2 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar

316
src/server/mvnw vendored

@ -0,0 +1,316 @@
#!/bin/sh
# ----------------------------------------------------------------------------
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
# Maven Start Up Batch script
#
# Required ENV vars:
# ------------------
# JAVA_HOME - location of a JDK home dir
#
# Optional ENV vars
# -----------------
# M2_HOME - location of maven2's installed home dir
# MAVEN_OPTS - parameters passed to the Java VM when running Maven
# e.g. to debug Maven itself, use
# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
# ----------------------------------------------------------------------------
if [ -z "$MAVEN_SKIP_RC" ] ; then
if [ -f /usr/local/etc/mavenrc ] ; then
. /usr/local/etc/mavenrc
fi
if [ -f /etc/mavenrc ] ; then
. /etc/mavenrc
fi
if [ -f "$HOME/.mavenrc" ] ; then
. "$HOME/.mavenrc"
fi
fi
# OS specific support. $var _must_ be set to either true or false.
cygwin=false;
darwin=false;
mingw=false
case "`uname`" in
CYGWIN*) cygwin=true ;;
MINGW*) mingw=true;;
Darwin*) darwin=true
# Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
# See https://developer.apple.com/library/mac/qa/qa1170/_index.html
if [ -z "$JAVA_HOME" ]; then
if [ -x "/usr/libexec/java_home" ]; then
export JAVA_HOME="`/usr/libexec/java_home`"
else
export JAVA_HOME="/Library/Java/Home"
fi
fi
;;
esac
if [ -z "$JAVA_HOME" ] ; then
if [ -r /etc/gentoo-release ] ; then
JAVA_HOME=`java-config --jre-home`
fi
fi
if [ -z "$M2_HOME" ] ; then
## resolve links - $0 may be a link to maven's home
PRG="$0"
# need this for relative symlinks
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG="`dirname "$PRG"`/$link"
fi
done
saveddir=`pwd`
M2_HOME=`dirname "$PRG"`/..
# make it fully qualified
M2_HOME=`cd "$M2_HOME" && pwd`
cd "$saveddir"
# echo Using m2 at $M2_HOME
fi
# For Cygwin, ensure paths are in UNIX format before anything is touched
if $cygwin ; then
[ -n "$M2_HOME" ] &&
M2_HOME=`cygpath --unix "$M2_HOME"`
[ -n "$JAVA_HOME" ] &&
JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
[ -n "$CLASSPATH" ] &&
CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
fi
# For Mingw, ensure paths are in UNIX format before anything is touched
if $mingw ; then
[ -n "$M2_HOME" ] &&
M2_HOME="`(cd "$M2_HOME"; pwd)`"
[ -n "$JAVA_HOME" ] &&
JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
fi
if [ -z "$JAVA_HOME" ]; then
javaExecutable="`which javac`"
if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
# readlink(1) is not available as standard on Solaris 10.
readLink=`which readlink`
if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
if $darwin ; then
javaHome="`dirname \"$javaExecutable\"`"
javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
else
javaExecutable="`readlink -f \"$javaExecutable\"`"
fi
javaHome="`dirname \"$javaExecutable\"`"
javaHome=`expr "$javaHome" : '\(.*\)/bin'`
JAVA_HOME="$javaHome"
export JAVA_HOME
fi
fi
fi
if [ -z "$JAVACMD" ] ; then
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
else
JAVACMD="`\\unset -f command; \\command -v java`"
fi
fi
if [ ! -x "$JAVACMD" ] ; then
echo "Error: JAVA_HOME is not defined correctly." >&2
echo " We cannot execute $JAVACMD" >&2
exit 1
fi
if [ -z "$JAVA_HOME" ] ; then
echo "Warning: JAVA_HOME environment variable is not set."
fi
CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
# traverses directory structure from process work directory to filesystem root
# first directory with .mvn subdirectory is considered project base directory
find_maven_basedir() {
if [ -z "$1" ]
then
echo "Path not specified to find_maven_basedir"
return 1
fi
basedir="$1"
wdir="$1"
while [ "$wdir" != '/' ] ; do
if [ -d "$wdir"/.mvn ] ; then
basedir=$wdir
break
fi
# workaround for JBEAP-8937 (on Solaris 10/Sparc)
if [ -d "${wdir}" ]; then
wdir=`cd "$wdir/.."; pwd`
fi
# end of workaround
done
echo "${basedir}"
}
# concatenates all lines of a file
concat_lines() {
if [ -f "$1" ]; then
echo "$(tr -s '\n' ' ' < "$1")"
fi
}
BASE_DIR=`find_maven_basedir "$(pwd)"`
if [ -z "$BASE_DIR" ]; then
exit 1;
fi
##########################################################################################
# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
# This allows using the maven wrapper in projects that prohibit checking in binary data.
##########################################################################################
if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
if [ "$MVNW_VERBOSE" = true ]; then
echo "Found .mvn/wrapper/maven-wrapper.jar"
fi
else
if [ "$MVNW_VERBOSE" = true ]; then
echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
fi
if [ -n "$MVNW_REPOURL" ]; then
jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
else
jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
fi
while IFS="=" read key value; do
case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
esac
done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
if [ "$MVNW_VERBOSE" = true ]; then
echo "Downloading from: $jarUrl"
fi
wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
if $cygwin; then
wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
fi
if command -v wget > /dev/null; then
if [ "$MVNW_VERBOSE" = true ]; then
echo "Found wget ... using wget"
fi
if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
else
wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
fi
elif command -v curl > /dev/null; then
if [ "$MVNW_VERBOSE" = true ]; then
echo "Found curl ... using curl"
fi
if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
curl -o "$wrapperJarPath" "$jarUrl" -f
else
curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
fi
else
if [ "$MVNW_VERBOSE" = true ]; then
echo "Falling back to using Java to download"
fi
javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
# For Cygwin, switch paths to Windows format before running javac
if $cygwin; then
javaClass=`cygpath --path --windows "$javaClass"`
fi
if [ -e "$javaClass" ]; then
if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
if [ "$MVNW_VERBOSE" = true ]; then
echo " - Compiling MavenWrapperDownloader.java ..."
fi
# Compiling the Java class
("$JAVA_HOME/bin/javac" "$javaClass")
fi
if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
# Running the downloader
if [ "$MVNW_VERBOSE" = true ]; then
echo " - Running MavenWrapperDownloader.java ..."
fi
("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
fi
fi
fi
fi
##########################################################################################
# End of extension
##########################################################################################
export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
if [ "$MVNW_VERBOSE" = true ]; then
echo $MAVEN_PROJECTBASEDIR
fi
MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
[ -n "$M2_HOME" ] &&
M2_HOME=`cygpath --path --windows "$M2_HOME"`
[ -n "$JAVA_HOME" ] &&
JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
[ -n "$CLASSPATH" ] &&
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
[ -n "$MAVEN_PROJECTBASEDIR" ] &&
MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
fi
# Provide a "standardized" way to retrieve the CLI args that will
# work with both Windows and non-Windows executions.
MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
export MAVEN_CMD_LINE_ARGS
WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
exec "$JAVACMD" \
$MAVEN_OPTS \
$MAVEN_DEBUG_OPTS \
-classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
"-Dmaven.home=${M2_HOME}" \
"-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

188
src/server/mvnw.cmd vendored

@ -0,0 +1,188 @@
@REM ----------------------------------------------------------------------------
@REM Licensed to the Apache Software Foundation (ASF) under one
@REM or more contributor license agreements. See the NOTICE file
@REM distributed with this work for additional information
@REM regarding copyright ownership. The ASF licenses this file
@REM to you under the Apache License, Version 2.0 (the
@REM "License"); you may not use this file except in compliance
@REM with the License. You may obtain a copy of the License at
@REM
@REM https://www.apache.org/licenses/LICENSE-2.0
@REM
@REM Unless required by applicable law or agreed to in writing,
@REM software distributed under the License is distributed on an
@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@REM KIND, either express or implied. See the License for the
@REM specific language governing permissions and limitations
@REM under the License.
@REM ----------------------------------------------------------------------------
@REM ----------------------------------------------------------------------------
@REM Maven Start Up Batch script
@REM
@REM Required ENV vars:
@REM JAVA_HOME - location of a JDK home dir
@REM
@REM Optional ENV vars
@REM M2_HOME - location of maven2's installed home dir
@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
@REM e.g. to debug Maven itself, use
@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
@REM ----------------------------------------------------------------------------
@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
@echo off
@REM set title of command window
title %0
@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
@REM set %HOME% to equivalent of $HOME
if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
@REM Execute a user defined script before this one
if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
@REM check for pre script, once with legacy .bat ending and once with .cmd ending
if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
:skipRcPre
@setlocal
set ERROR_CODE=0
@REM To isolate internal variables from possible post scripts, we use another setlocal
@setlocal
@REM ==== START VALIDATION ====
if not "%JAVA_HOME%" == "" goto OkJHome
echo.
echo Error: JAVA_HOME not found in your environment. >&2
echo Please set the JAVA_HOME variable in your environment to match the >&2
echo location of your Java installation. >&2
echo.
goto error
:OkJHome
if exist "%JAVA_HOME%\bin\java.exe" goto init
echo.
echo Error: JAVA_HOME is set to an invalid directory. >&2
echo JAVA_HOME = "%JAVA_HOME%" >&2
echo Please set the JAVA_HOME variable in your environment to match the >&2
echo location of your Java installation. >&2
echo.
goto error
@REM ==== END VALIDATION ====
:init
@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
@REM Fallback to current working directory if not found.
set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
set EXEC_DIR=%CD%
set WDIR=%EXEC_DIR%
:findBaseDir
IF EXIST "%WDIR%"\.mvn goto baseDirFound
cd ..
IF "%WDIR%"=="%CD%" goto baseDirNotFound
set WDIR=%CD%
goto findBaseDir
:baseDirFound
set MAVEN_PROJECTBASEDIR=%WDIR%
cd "%EXEC_DIR%"
goto endDetectBaseDir
:baseDirNotFound
set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
cd "%EXEC_DIR%"
:endDetectBaseDir
IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
@setlocal EnableExtensions EnableDelayedExpansion
for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
:endReadAdditionalConfig
SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
)
@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
if exist %WRAPPER_JAR% (
if "%MVNW_VERBOSE%" == "true" (
echo Found %WRAPPER_JAR%
)
) else (
if not "%MVNW_REPOURL%" == "" (
SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
)
if "%MVNW_VERBOSE%" == "true" (
echo Couldn't find %WRAPPER_JAR%, downloading it ...
echo Downloading from: %DOWNLOAD_URL%
)
powershell -Command "&{"^
"$webclient = new-object System.Net.WebClient;"^
"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
"}"^
"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
"}"
if "%MVNW_VERBOSE%" == "true" (
echo Finished downloading %WRAPPER_JAR%
)
)
@REM End of extension
@REM Provide a "standardized" way to retrieve the CLI args that will
@REM work with both Windows and non-Windows executions.
set MAVEN_CMD_LINE_ARGS=%*
%MAVEN_JAVA_EXE% ^
%JVM_CONFIG_MAVEN_PROPS% ^
%MAVEN_OPTS% ^
%MAVEN_DEBUG_OPTS% ^
-classpath %WRAPPER_JAR% ^
"-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
%WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
if ERRORLEVEL 1 goto error
goto end
:error
set ERROR_CODE=1
:end
@endlocal & set ERROR_CODE=%ERROR_CODE%
if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
@REM check for post script, once with legacy .bat ending and once with .cmd ending
if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
:skipRcPost
@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
if "%MAVEN_BATCH_PAUSE%"=="on" pause
if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
cmd /C exit /B %ERROR_CODE%

@ -0,0 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.5.4</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.example</groupId>
<artifactId>testdemo</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>testdemo</name>
<description>testdemo</description>
<properties>
<java.version>1.8</java.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.73</version>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
<version>3.141.59</version>
</dependency>
</dependencies>
<profiles>
<profile>
<id>sonar</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<sonar.host.url>http://127.0.0.1:9000/</sonar.host.url>
</properties>
</profile>
</profiles>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
<version>3.6.0.1398</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>7</source>
<target>7</target>
</configuration>
</plugin>
</plugins>
</build>
</project>

@ -0,0 +1,42 @@
package com.example.testdemo;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.sun.javafx.webkit.EventLoopImpl;
import org.openqa.selenium.*;
import org.openqa.selenium.chrome.ChromeDriver;
import org.openqa.selenium.chrome.ChromeOptions;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
import javax.script.ScriptException;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.sql.Driver;
import java.util.Arrays;
import java.util.List;
import java.util.Random;
import java.util.concurrent.ConcurrentLinkedQueue;
@SpringBootApplication
public class TestdemoApplication {
public static void main(String[] args) {
SpringApplication.run(TestdemoApplication.class, args);
}
}

@ -0,0 +1,176 @@
package com.example.testdemo.config;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import jdk.nashorn.internal.scripts.JS;
import lombok.extern.slf4j.Slf4j;
import org.openqa.selenium.JavascriptExecutor;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.chrome.ChromeDriver;
import org.openqa.selenium.chrome.ChromeOptions;
import org.springframework.stereotype.Component;
import sun.rmi.runtime.Log;
import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
import javax.script.ScriptException;
import javax.websocket.*;
import javax.websocket.server.ServerEndpoint;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicInteger;
/**
* @Description : //描述
*/
@Slf4j
@ServerEndpoint("/result")
@Component
public class SendObjectMessage {
/** 记录当前在线连接数 */
private static AtomicInteger onlineCount = new AtomicInteger(0);
private static ConcurrentLinkedQueue<SendObjectMessage> socket = new ConcurrentLinkedQueue<SendObjectMessage>();
/**
*
*/
private Session session;
private SendObjectMessage mObject = null;
/**
*
*/
@OnOpen
public void onOpen(Session session) {
this.session = session;
socket.add(this);
onlineCount.incrementAndGet(); // 在线数加1
if(mObject == null){
mObject = socket.peek();
}
/*try {
sendMessage("连接成功!");
} catch (IOException e) {
e.printStackTrace();
}*/
log.info("有新连接加入,当前在线人数为:{}", onlineCount.get());
}
/**
*
*/
@OnClose
public void onClose(Session session) {
socket.remove(this);
// 在线数减1
onlineCount.decrementAndGet();
log.info("用户退出,当前在线人数为:{}", onlineCount.get());
}
/**
*
*
* @param message
*
*/
@OnMessage
public void onMessage(String message, Session session) throws IOException {
if (message != null && !message.isEmpty()) {
//socket.peek().sendMessage(message);
JSONObject js = JSONObject.parseObject(message);
String op = js.getString("op");
if(op.equals("connect")){
JSONObject content = js.getJSONObject("content");
String user = content.getString("user");
//JSONArray note = content.getJSONArray("note");
Integer code = content.getInteger("code");
Integer shelf = content.getInteger("shelf");
Integer floor = content.getInteger("floor");
System.out.println(content);
mObject.sendMessage("confirm");
}else if(op.equals("confirm")){
String con = js.getString("content");
if(con.equals("yes")){
try {
testSelenium1();
} catch (Exception e) {
e.printStackTrace();
}
System.out.println("robot");
}else if(con.equals("no")){
System.out.println("no");
}
}else if(op.equals("finish")){
System.out.println("fin");
mObject.onClose(mObject.session);
socket.poll();
if(socket.peek() != null){
mObject = socket.peek();
mObject.sendMessage("confirm");
}else{
mObject = null;
}
}
}
log.info("服务端收到客户端的消息:{}", message);
}
@OnError
public void onError(Throwable error) {
log.error("发生错误");
error.printStackTrace();
}
/**
*
*/
public void sendMessage(String message) throws IOException {
//如果开启@Async异步需要加锁否则就会报错
synchronized (session){
this.session.getBasicRemote().sendText(message);
}
}
/**
*
*/
public static void testSelenium1() throws Exception {
// 使用HtmlUnitDriver 是不需要 安装 浏览器 和 驱动支持\
System.setProperty("webdriver.chrome.driver", "D:\\chromedriver.exe");
ChromeOptions chromeOptions = new ChromeOptions();
chromeOptions.setHeadless(true);
WebDriver driver = new ChromeDriver(chromeOptions);
//ChromeDriver driver = new ChromeDriver();
JavascriptExecutor executor = (JavascriptExecutor) driver;
String strFile = Thread.currentThread().getClass().getResource("/").getPath();
//driver.get(strFile + "/test.html");
driver.get("file://" + strFile + "/test.html");
}
private static String readJsFile(String url) throws Exception {
StringBuffer script = new StringBuffer();
File file = new File(url);
FileReader filereader = new FileReader(file);
BufferedReader bufferedReader = new BufferedReader(filereader);
String tempString = null;
while ((tempString = bufferedReader.readLine()) != null) {
script.append(tempString).append("\n");
}
bufferedReader.close();
filereader.close();
return script.toString();
}
}

@ -0,0 +1,17 @@
package com.example.testdemo.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.socket.server.standard.ServerEndpointExporter;
/**
* @Description : websocket //描述
*/
@Configuration
public class WebSocketConfig {
@Bean
public ServerEndpointExporter serverEndpointExporter(){
return new ServerEndpointExporter();
}
}

@ -0,0 +1,18 @@
server:
port: 8080
servlet:
contest-path: /
spring:
application:
name: springboot websocket
mvc:
static-path-pattern: /**
thymeleaf:
mode: HTML5
suffix: .html
encoding: UTF-8
prefix:
classpath: /template
cache: false

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -0,0 +1,59 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<script type="text/javascript" src="./em.js"></script>
<script type="text/javascript" src="./roslib.min.js"></script>
<script type="text/javascript" type="text/javascript">
// Connecting to ROS
// -----------------
var ros = new ROSLIB.Ros({
url : 'ws://192.168.43.20:9090'
});
ros.on('connection', function() {
console.log('Connected to websocket server.');
});
ros.on('error', function(error) {
console.log('Error connecting to websocket server: ', error);
});
ros.on('close', function() {
console.log('Connection to websocket server closed.');
});
// Publishing a Topic
// ------------------
var cmdVel = new ROSLIB.Topic({
ros : ros,
name : '/cmd_vel',
messageType : 'geometry_msgs/Twist'
});
var twist = new ROSLIB.Message({
linear : {
x : 0.1,
y : 0.2,
z : 0.3
},
angular : {
x : -0.1,
y : -0.2,
z : -0.3
}
});
cmdVel.publish(twist);
</script>
</head>
<body>
<h1>Simple roslib Example</h1>
<p>Check your Web Console for output.</p>
</body>
</html>

@ -0,0 +1,97 @@
// document.write('<script type="text/javascript" src="http://cdn.robotwebtools.org/EventEmitter2/current/eventemitter2.min.js"></script>\n');
// document.write('<script type="text/javascript" src="http://cdn.robotwebtools.org/roslibjs/current/roslib.min.js"></script>\n');
var ros = new ROSLIB.Ros({
url : 'ws://192.168.43.20:9090'
});
ros.on('connection', function() {
console.log('Connected to websocket server.');
});
ros.on('error', function(error) {
console.log('Error connecting to websocket server: ', error);
});
ros.on('close', function() {
console.log('Connection to websocket server closed.');
});
var move_base= new ROSLIB.ActionClient({
ros : ros,
serverName : '/move_base',
actionName : 'move_base_msgs/MoveBaseAction'
});
var currentTime = new Date();
var secs = Math.floor(currentTime.getTime()/1000)
var nsecs = Math.round(1000000000*(currentTime.getTime()/1000-secs))
var goal = new ROSLIB.Goal({
actionClient: move_base,
goalMessage:{
target_pose:{
header:{
frame_id:'map',
stamp:{
secs: secs,
nsecs:nsecs
}
},
pose:{
position:{
x:-3.97, //-0.743 -0.0273 取件点
y:1.68, //3.00 -0.09
z:0.000
},
orientation:{
x:0.000,
y:0.000,
z:0.000,
w:1.000
}
}
}
}
});
goal.on('feedback', function(feedback) {
console.log('Feedback: ' + feedback.sequence);
});
goal.on('result', function(result) {
console.log('Final Result: ' + result.sequence);
});
ros.on('connection', function() {
console.log('Connected to websocket server.');
});
ros.on('error', function(error) {
console.log('Error connecting to websocket server: ', error);
});
ros.on('close', function() {
console.log('Connection to websocket server closed.');
});
//goal.send();
var cmdVel = new ROSLIB.Topic({
ros : ros,
name : '/cmd_vel',
messageType : 'geometry_msgs/Twist'
});
var twist = new ROSLIB.Message({
linear : {
x : 0.1,
y : 0.2,
z : 0.3
},
angular : {
x : -0.1,
y : -0.2,
z : -0.3
}
});
cmdVel.publish(twist);

@ -0,0 +1,13 @@
package com.example.testdemo;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@SpringBootTest
class TestdemoApplicationTests {
@Test
void contextLoads() {
}
}
Loading…
Cancel
Save