diff --git a/doc/基于机器人的物流“智取”系统设计规格说明书.doc b/doc/基于机器人的物流“智取”系统设计规格说明书.doc index dfb25a9..454bd9f 100644 Binary files a/doc/基于机器人的物流“智取”系统设计规格说明书.doc and b/doc/基于机器人的物流“智取”系统设计规格说明书.doc differ diff --git a/doc/基于机器人的物流“智取”系统需求构思及描述.docx b/doc/基于机器人的物流“智取”系统需求构思及描述.docx index 8feda22..269deda 100644 Binary files a/doc/基于机器人的物流“智取”系统需求构思及描述.docx and b/doc/基于机器人的物流“智取”系统需求构思及描述.docx differ diff --git a/doc/基于机器人的物流“智取”系统需求规格说明书.docx b/doc/基于机器人的物流“智取”系统需求规格说明书.docx index 6305696..4c7d6ba 100644 Binary files a/doc/基于机器人的物流“智取”系统需求规格说明书.docx and b/doc/基于机器人的物流“智取”系统需求规格说明书.docx differ diff --git a/model/设计规格说明书/数据设计/good.png b/model/设计规格说明书/数据设计/good.png index 86ddacd..c79e28c 100644 Binary files a/model/设计规格说明书/数据设计/good.png and b/model/设计规格说明书/数据设计/good.png differ diff --git a/model/设计规格说明书/数据设计/good.vsdx b/model/设计规格说明书/数据设计/good.vsdx index 12c0e40..be96fef 100644 Binary files a/model/设计规格说明书/数据设计/good.vsdx and b/model/设计规格说明书/数据设计/good.vsdx differ diff --git a/model/设计规格说明书/数据设计/operation.png b/model/设计规格说明书/数据设计/operation.png index 868e2b4..da00892 100644 Binary files a/model/设计规格说明书/数据设计/operation.png and b/model/设计规格说明书/数据设计/operation.png differ diff --git a/model/设计规格说明书/数据设计/operation.vsdx b/model/设计规格说明书/数据设计/operation.vsdx index d164861..678a108 100644 Binary files a/model/设计规格说明书/数据设计/operation.vsdx and b/model/设计规格说明书/数据设计/operation.vsdx differ diff --git a/model/设计规格说明书/数据设计/user.png b/model/设计规格说明书/数据设计/user.png index e8b6aaa..b0163ed 100644 Binary files a/model/设计规格说明书/数据设计/user.png and b/model/设计规格说明书/数据设计/user.png differ diff --git a/model/设计规格说明书/数据设计/user.vsdx b/model/设计规格说明书/数据设计/user.vsdx index 7359aba..7f9609d 100644 Binary files a/model/设计规格说明书/数据设计/user.vsdx and b/model/设计规格说明书/数据设计/user.vsdx differ diff --git a/model/设计规格说明书/用例设计/加入取件队列-顺序图.vsdx b/model/设计规格说明书/用例设计/加入取件队列-顺序图.vsdx index 7f8b1bf..21a054b 100644 Binary files a/model/设计规格说明书/用例设计/加入取件队列-顺序图.vsdx and b/model/设计规格说明书/用例设计/加入取件队列-顺序图.vsdx differ diff --git a/model/设计规格说明书/用例设计/发送取件指令-顺序图.png b/model/设计规格说明书/用例设计/发送取件指令-顺序图.png index 314a7fe..f28c024 100644 Binary files a/model/设计规格说明书/用例设计/发送取件指令-顺序图.png and b/model/设计规格说明书/用例设计/发送取件指令-顺序图.png differ diff --git a/model/设计规格说明书/用例设计/发送取件指令-顺序图.vsdx b/model/设计规格说明书/用例设计/发送取件指令-顺序图.vsdx index 5d953e2..f0c9eb5 100644 Binary files a/model/设计规格说明书/用例设计/发送取件指令-顺序图.vsdx and b/model/设计规格说明书/用例设计/发送取件指令-顺序图.vsdx differ diff --git a/model/设计规格说明书/用例设计/查询余件-顺序图.png b/model/设计规格说明书/用例设计/查询余件-顺序图.png index f648b1b..0ff0373 100644 Binary files a/model/设计规格说明书/用例设计/查询余件-顺序图.png and b/model/设计规格说明书/用例设计/查询余件-顺序图.png differ diff --git a/model/设计规格说明书/用例设计/查询余件-顺序图.vsdx b/model/设计规格说明书/用例设计/查询余件-顺序图.vsdx index aa97052..666a4cf 100644 Binary files a/model/设计规格说明书/用例设计/查询余件-顺序图.vsdx and b/model/设计规格说明书/用例设计/查询余件-顺序图.vsdx differ diff --git a/model/设计规格说明书/用例设计/用户注册-顺序图.png b/model/设计规格说明书/用例设计/用户注册-顺序图.png index d6335ab..6a1e300 100644 Binary files a/model/设计规格说明书/用例设计/用户注册-顺序图.png and b/model/设计规格说明书/用例设计/用户注册-顺序图.png differ diff --git a/model/设计规格说明书/用例设计/用户注册-顺序图.vsdx b/model/设计规格说明书/用例设计/用户注册-顺序图.vsdx index b4d1b78..f527f40 100644 Binary files a/model/设计规格说明书/用例设计/用户注册-顺序图.vsdx and b/model/设计规格说明书/用例设计/用户注册-顺序图.vsdx differ diff --git a/model/设计规格说明书/类设计/PickUpUI类对象状态图.png b/model/设计规格说明书/类设计/PickUpUI类对象状态图.png new file mode 100644 index 0000000..0aa6e90 Binary files /dev/null and b/model/设计规格说明书/类设计/PickUpUI类对象状态图.png differ diff --git a/model/设计规格说明书/类设计/PickUpUI类对象状态图.vsdx b/model/设计规格说明书/类设计/PickUpUI类对象状态图.vsdx new file mode 100644 index 0000000..5970f5f Binary files /dev/null and b/model/设计规格说明书/类设计/PickUpUI类对象状态图.vsdx differ diff --git a/model/设计规格说明书/类设计/pickup方法算法设计.png b/model/设计规格说明书/类设计/pickup方法算法设计.png new file mode 100644 index 0000000..9472d72 Binary files /dev/null and b/model/设计规格说明书/类设计/pickup方法算法设计.png differ diff --git a/model/设计规格说明书/类设计/pickup方法算法设计.vsdx b/model/设计规格说明书/类设计/pickup方法算法设计.vsdx new file mode 100644 index 0000000..aa8b8aa Binary files /dev/null and b/model/设计规格说明书/类设计/pickup方法算法设计.vsdx differ diff --git a/model/设计规格说明书/类设计/精化用户界面类关系 - 副本 (2).vsdx b/model/设计规格说明书/类设计/精化用户界面类关系 - 副本 (2).vsdx new file mode 100644 index 0000000..9cd3238 Binary files /dev/null and b/model/设计规格说明书/类设计/精化用户界面类关系 - 副本 (2).vsdx differ diff --git a/model/设计规格说明书/类设计/精化设计类方法.png b/model/设计规格说明书/类设计/精化设计类方法.png new file mode 100644 index 0000000..983f08d Binary files /dev/null and b/model/设计规格说明书/类设计/精化设计类方法.png differ diff --git a/model/设计规格说明书/部署图.png b/model/设计规格说明书/部署图.png index 7364b2a..4b4c306 100644 Binary files a/model/设计规格说明书/部署图.png and b/model/设计规格说明书/部署图.png differ diff --git a/model/设计规格说明书/部署图.vsdx b/model/设计规格说明书/部署图.vsdx index 086ac01..7426be9 100644 Binary files a/model/设计规格说明书/部署图.vsdx and b/model/设计规格说明书/部署图.vsdx differ diff --git a/src/Logistics/.idea/misc.xml b/src/Logistics/.idea/misc.xml index 92bf35a..69e6dc4 100644 --- a/src/Logistics/.idea/misc.xml +++ b/src/Logistics/.idea/misc.xml @@ -19,9 +19,9 @@ - + - + diff --git a/src/Logistics/app/src/main/java/com/example/logistics/ui/FindUI.java b/src/Logistics/app/src/main/java/com/example/logistics/ui/FindUI.java index 0878eeb..0c5832c 100644 --- a/src/Logistics/app/src/main/java/com/example/logistics/ui/FindUI.java +++ b/src/Logistics/app/src/main/java/com/example/logistics/ui/FindUI.java @@ -21,6 +21,9 @@ import com.example.logistics.R; import com.example.logistics.manager.goodManager; public class FindUI extends Fragment implements View.OnClickListener{ + + private String TAG = "FindUI"; + private Context mContext; private Button mButton; private EditText mPickUpCode; @@ -33,12 +36,16 @@ public class FindUI extends Fragment implements View.OnClickListener{ @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + + Log.d(TAG, "onCreate"); View view = inflater.inflate(R.layout.my_fragment1,container,false); + mButton = (Button)view.findViewById(R.id.Sea_Button); mPickUpCode = (EditText)view.findViewById(R.id.Sea_PickUpCode); mPhoneNum = (EditText)view.findViewById(R.id.Sea_PhoneNum); mButton.setOnClickListener(this); mContext = getActivity(); + return view; } @@ -46,7 +53,10 @@ public class FindUI extends Fragment implements View.OnClickListener{ public void onClick(View v) { switch(v.getId()){ case R.id.Sea_Button: + + Log.d(TAG, "search"); search(v); + break; } } diff --git 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 index 8645404..8528c9a 100644 --- 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 @@ -17,6 +17,7 @@ import androidx.fragment.app.FragmentManager; import com.example.logistics.R; public class MenuActivity extends AppCompatActivity implements View.OnClickListener{ + private LinearLayout ly_one,ly_two,ly_three; private TextView mTextView1,mTextView2,mTextView3; private TextView mTextNum1,mTextNum2,mTextNum3; @@ -29,6 +30,7 @@ public class MenuActivity extends AppCompatActivity implements View.OnClickListe private String owner; @Override protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); setContentView(R.layout.activity_menu); diff --git 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 index 0ffd4f1..c52e0e9 100644 --- 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 @@ -246,9 +246,12 @@ public class PickUpUI extends Fragment implements View.OnClickListener{ boolean flag1 = operationManager.add(pickupcode, user); boolean flag2 = goodManager.delete(pickupcode); - boolean flag = flag1 & flag2; - if (flag) { - msg = 1; + + if (!flag1) { + msg = 2; + } + if(!flag2){ + msg = 3; } hand1.sendEmptyMessage(msg); @@ -268,9 +271,9 @@ public class PickUpUI extends Fragment implements View.OnClickListener{ Toast.makeText(mContext, "加入队列成功", Toast.LENGTH_SHORT).show(); joinQueue(); }else if(msg.what == 2){ - Toast.makeText(mContext, "手机号错误", Toast.LENGTH_SHORT).show(); + Toast.makeText(mContext, "出库失败", Toast.LENGTH_SHORT).show(); }else if(msg.what == 3){ - Toast.makeText(mContext, "取件码不存在", Toast.LENGTH_SHORT).show(); + Toast.makeText(mContext, "保存记录失败", Toast.LENGTH_SHORT).show(); } } }; diff --git a/src/Logistics/app/src/main/java/com/example/logistics/ui/SignUpUI.java b/src/Logistics/app/src/main/java/com/example/logistics/ui/SignUpUI.java index e7fdfe2..b1a9528 100644 --- a/src/Logistics/app/src/main/java/com/example/logistics/ui/SignUpUI.java +++ b/src/Logistics/app/src/main/java/com/example/logistics/ui/SignUpUI.java @@ -6,6 +6,7 @@ import android.content.Intent; import android.os.Bundle; import android.os.Handler; import android.os.Message; +import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.EditText; @@ -16,8 +17,12 @@ import com.example.logistics.manager.userManager; import com.example.logistics.entity.User; public class SignUpUI extends Activity { + + private String TAG = "SignUpUI"; + @Override protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); setContentView(R.layout.activity_sign_up); @@ -28,16 +33,20 @@ public class SignUpUI extends Activity { new View.OnClickListener() { @Override public void onClick(View v) { + Log.d(TAG, "SignUp:onClick"); register(v); } } ); + // 返回登录按钮监听器 backLoginButton.setOnClickListener( new View.OnClickListener() { @Override public void onClick(View v) { // 跳转到登录界面 + Log.d(TAG, "BackLogin:onClick"); + Intent intent = new Intent(SignUpUI.this, LoginUI.class); startActivity(intent); } @@ -47,6 +56,9 @@ public class SignUpUI extends Activity { } public void register(View view){ + + Log.d(TAG, "register"); + EditText userName = (EditText) this.findViewById(R.id.UserNameEdit); EditText passWord = (EditText) this.findViewById(R.id.PassWordEdit); EditText passWordAgain = (EditText) this.findViewById(R.id.PassWordAgainEdit); @@ -58,16 +70,33 @@ public class SignUpUI extends Activity { String strPhoneNumber = phone.getText().toString().trim(); if (strUserName.length() > 10) { + + Log.d(TAG, "username out of length"); Toast.makeText(SignUpUI.this, "用户名长度必须小于10！", Toast.LENGTH_SHORT).show(); + } else if (strUserName.length() == 0) { + + Log.d(TAG, "username is none"); Toast.makeText(SignUpUI.this, "用户名不能为空！", Toast.LENGTH_SHORT).show(); + } else if (strPassWord.length() > 16) { + + Log.d(TAG, "password out of length"); Toast.makeText(SignUpUI.this, "密码长度必须小于16！", Toast.LENGTH_SHORT).show(); + } else if (strPassWord.length() == 0) { + + Log.d(TAG, "password is none"); Toast.makeText(SignUpUI.this, "密码不能为空！", Toast.LENGTH_SHORT).show(); + } else if (!strPassWord.equals(strPassWordAgain)) { + + Log.d(TAG, "password is not same"); Toast.makeText(SignUpUI.this, "两次密码输入不一致！", Toast.LENGTH_SHORT).show(); + } else { + + Log.d(TAG, "register success"); Toast.makeText(SignUpUI.this, "注册成功！", Toast.LENGTH_SHORT).show(); User user = new User(); @@ -78,17 +107,27 @@ public class SignUpUI extends Activity { new Thread(){ @Override public void run(){ + + Log.d(TAG, "register thread"); int msg = 0; userManager userManager = new userManager(); User uu = userManager.findUser(user.getUserName()); if(uu != null){ + + Log.d(TAG, "have this account"); msg = 1; //have this account + }else{ + + Log.d(TAG, "have no this account"); boolean flag = userManager.register(user); if(flag){ + + Log.d(TAG, "register success"); msg = 2; + } } hand.sendEmptyMessage(msg); @@ -100,14 +139,24 @@ public class SignUpUI extends Activity { @SuppressLint("HandlerLeak") final Handler hand = new Handler(){ public void handleMessage(Message msg){ + + Log.d(TAG, "msg is:" + msg.toString()); + if(msg.what == 0){ + Toast.makeText(getApplicationContext(), "注册失败", Toast.LENGTH_SHORT).show(); + }else if(msg.what == 1){ + Toast.makeText(getApplicationContext(), "该账号已存在，请换一个注册", Toast.LENGTH_SHORT).show(); + }else if(msg.what == 2){ + Toast.makeText(getApplicationContext(), "注册成功", Toast.LENGTH_SHORT).show(); + Intent intent = new Intent(SignUpUI.this, LoginUI.class); startActivity(intent); + } } };