diff --git a/doc/~$机器人的物流“智取”系统设计规格说明书.doc b/doc/~$机器人的物流“智取”系统设计规格说明书.doc
deleted file mode 100644
index 4cd48a3..0000000
Binary files a/doc/~$机器人的物流“智取”系统设计规格说明书.doc and /dev/null differ
diff --git a/doc/~$机器人的物流“智取”系统需求规格说明书.docx b/doc/~$机器人的物流“智取”系统需求规格说明书.docx
deleted file mode 100644
index 1e67cfe..0000000
Binary files a/doc/~$机器人的物流“智取”系统需求规格说明书.docx and /dev/null differ
diff --git a/doc/~WRL2154.tmp b/doc/~WRL2154.tmp
deleted file mode 100644
index d5fd9e8..0000000
Binary files a/doc/~WRL2154.tmp and /dev/null differ
diff --git a/doc/基于机器人的物流“智取”系统设计规格说明书.doc b/doc/基于机器人的物流“智取”系统设计规格说明书.doc
index 4f29ea6..dfb25a9 100644
Binary files a/doc/基于机器人的物流“智取”系统设计规格说明书.doc and b/doc/基于机器人的物流“智取”系统设计规格说明书.doc differ
diff --git a/model/设计规格说明书/用例设计/“智取”功能-顺序图.png b/model/设计规格说明书/用例设计/“智取”功能-顺序图.png
new file mode 100644
index 0000000..fea75c2
Binary files /dev/null and b/model/设计规格说明书/用例设计/“智取”功能-顺序图.png differ
diff --git a/model/设计规格说明书/用例设计/历史记录 顺序图.vsdx b/model/设计规格说明书/用例设计/“智取”功能-顺序图.vsdx
similarity index 65%
rename from model/设计规格说明书/用例设计/历史记录 顺序图.vsdx
rename to model/设计规格说明书/用例设计/“智取”功能-顺序图.vsdx
index 302c6f1..9228657 100644
Binary files a/model/设计规格说明书/用例设计/历史记录 顺序图.vsdx and b/model/设计规格说明书/用例设计/“智取”功能-顺序图.vsdx differ
diff --git a/model/设计规格说明书/用例设计/分析类图.png b/model/设计规格说明书/用例设计/分析类图.png
deleted file mode 100644
index cec65c7..0000000
Binary files a/model/设计规格说明书/用例设计/分析类图.png and /dev/null differ
diff --git a/model/设计规格说明书/用例设计/分析类图.vsdx b/model/设计规格说明书/用例设计/分析类图.vsdx
deleted file mode 100644
index 6b6aeaf..0000000
Binary files a/model/设计规格说明书/用例设计/分析类图.vsdx and /dev/null differ
diff --git a/model/设计规格说明书/用例设计/加入取件队列-顺序图.png b/model/设计规格说明书/用例设计/加入取件队列-顺序图.png
new file mode 100644
index 0000000..8a05568
Binary files /dev/null and b/model/设计规格说明书/用例设计/加入取件队列-顺序图.png differ
diff --git a/model/设计规格说明书/用例设计/取件交互行为 顺序图.vsdx b/model/设计规格说明书/用例设计/加入取件队列-顺序图.vsdx
similarity index 78%
rename from model/设计规格说明书/用例设计/取件交互行为 顺序图.vsdx
rename to model/设计规格说明书/用例设计/加入取件队列-顺序图.vsdx
index 0640744..7f8b1bf 100644
Binary files a/model/设计规格说明书/用例设计/取件交互行为 顺序图.vsdx and b/model/设计规格说明书/用例设计/加入取件队列-顺序图.vsdx differ
diff --git a/model/设计规格说明书/用例设计/加入等待队列 顺序图.png b/model/设计规格说明书/用例设计/加入等待队列 顺序图.png
deleted file mode 100644
index a3cfac5..0000000
Binary files a/model/设计规格说明书/用例设计/加入等待队列 顺序图.png and /dev/null differ
diff --git a/model/设计规格说明书/用例设计/加入等待队列 顺序图.vsdx b/model/设计规格说明书/用例设计/加入等待队列 顺序图.vsdx
deleted file mode 100644
index adf72ac..0000000
Binary files a/model/设计规格说明书/用例设计/加入等待队列 顺序图.vsdx and /dev/null differ
diff --git a/model/设计规格说明书/用例设计/历史记录 顺序图.png b/model/设计规格说明书/用例设计/历史记录 顺序图.png
deleted file mode 100644
index 65d9bde..0000000
Binary files a/model/设计规格说明书/用例设计/历史记录 顺序图.png and /dev/null differ
diff --git a/model/设计规格说明书/用例设计/历史记录-顺序图.png b/model/设计规格说明书/用例设计/历史记录-顺序图.png
new file mode 100644
index 0000000..d7b4a80
Binary files /dev/null and b/model/设计规格说明书/用例设计/历史记录-顺序图.png differ
diff --git a/model/设计规格说明书/用例设计/历史记录-顺序图.vsdx b/model/设计规格说明书/用例设计/历史记录-顺序图.vsdx
new file mode 100644
index 0000000..1dedaa6
Binary files /dev/null and b/model/设计规格说明书/用例设计/历史记录-顺序图.vsdx differ
diff --git a/model/设计规格说明书/用例设计/历史记录.vsdx b/model/设计规格说明书/用例设计/历史记录.vsdx
deleted file mode 100644
index 8b7c0b8..0000000
Binary files a/model/设计规格说明书/用例设计/历史记录.vsdx and /dev/null differ
diff --git a/model/设计规格说明书/用例设计/发送取件指令 顺序图.png b/model/设计规格说明书/用例设计/发送取件指令 顺序图.png
deleted file mode 100644
index cb202c0..0000000
Binary files a/model/设计规格说明书/用例设计/发送取件指令 顺序图.png and /dev/null differ
diff --git a/model/设计规格说明书/用例设计/发送取件指令-顺序图.png b/model/设计规格说明书/用例设计/发送取件指令-顺序图.png
new file mode 100644
index 0000000..314a7fe
Binary files /dev/null and b/model/设计规格说明书/用例设计/发送取件指令-顺序图.png differ
diff --git a/model/设计规格说明书/用例设计/发送取件指令-顺序图.vsdx b/model/设计规格说明书/用例设计/发送取件指令-顺序图.vsdx
new file mode 100644
index 0000000..5d953e2
Binary files /dev/null and b/model/设计规格说明书/用例设计/发送取件指令-顺序图.vsdx differ
diff --git a/model/设计规格说明书/用例设计/取件交互.vsdx b/model/设计规格说明书/用例设计/取件交互.vsdx
deleted file mode 100644
index 9877de9..0000000
Binary files a/model/设计规格说明书/用例设计/取件交互.vsdx and /dev/null differ
diff --git a/model/设计规格说明书/用例设计/取件交互行为 顺序图.png b/model/设计规格说明书/用例设计/取件交互行为 顺序图.png
deleted file mode 100644
index d84643a..0000000
Binary files a/model/设计规格说明书/用例设计/取件交互行为 顺序图.png and /dev/null differ
diff --git a/model/设计规格说明书/用例设计/未取件.vsdx b/model/设计规格说明书/用例设计/未取件.vsdx
deleted file mode 100644
index 3304c49..0000000
Binary files a/model/设计规格说明书/用例设计/未取件.vsdx and /dev/null differ
diff --git a/model/设计规格说明书/用例设计/查询余件 顺序图.png b/model/设计规格说明书/用例设计/查询余件 顺序图.png
deleted file mode 100644
index 6cbce02..0000000
Binary files a/model/设计规格说明书/用例设计/查询余件 顺序图.png and /dev/null differ
diff --git a/model/设计规格说明书/用例设计/查询余件-顺序图.png b/model/设计规格说明书/用例设计/查询余件-顺序图.png
new file mode 100644
index 0000000..f648b1b
Binary files /dev/null and b/model/设计规格说明书/用例设计/查询余件-顺序图.png differ
diff --git a/model/设计规格说明书/用例设计/登录 顺序图.vsdx b/model/设计规格说明书/用例设计/查询余件-顺序图.vsdx
similarity index 78%
rename from model/设计规格说明书/用例设计/登录 顺序图.vsdx
rename to model/设计规格说明书/用例设计/查询余件-顺序图.vsdx
index 21badd9..aa97052 100644
Binary files a/model/设计规格说明书/用例设计/登录 顺序图.vsdx and b/model/设计规格说明书/用例设计/查询余件-顺序图.vsdx differ
diff --git a/model/设计规格说明书/用例设计/查询快递.vsdx b/model/设计规格说明书/用例设计/查询快递.vsdx
deleted file mode 100644
index eb8d08a..0000000
Binary files a/model/设计规格说明书/用例设计/查询快递.vsdx and /dev/null differ
diff --git a/model/设计规格说明书/用例设计/注册 顺序图.png b/model/设计规格说明书/用例设计/注册 顺序图.png
deleted file mode 100644
index 1ef7bcd..0000000
Binary files a/model/设计规格说明书/用例设计/注册 顺序图.png and /dev/null differ
diff --git a/model/设计规格说明书/用例设计/用例图.png b/model/设计规格说明书/用例设计/用例图.png
deleted file mode 100644
index c9a56be..0000000
Binary files a/model/设计规格说明书/用例设计/用例图.png and /dev/null differ
diff --git a/model/设计规格说明书/用例设计/用例图.vsdx b/model/设计规格说明书/用例设计/用例图.vsdx
deleted file mode 100644
index 714876c..0000000
Binary files a/model/设计规格说明书/用例设计/用例图.vsdx and /dev/null differ
diff --git a/model/设计规格说明书/用例设计/用户注册-顺序图.png b/model/设计规格说明书/用例设计/用户注册-顺序图.png
new file mode 100644
index 0000000..d6335ab
Binary files /dev/null and b/model/设计规格说明书/用例设计/用户注册-顺序图.png differ
diff --git a/model/设计规格说明书/用例设计/查询余件 顺序图.vsdx b/model/设计规格说明书/用例设计/用户注册-顺序图.vsdx
similarity index 78%
rename from model/设计规格说明书/用例设计/查询余件 顺序图.vsdx
rename to model/设计规格说明书/用例设计/用户注册-顺序图.vsdx
index 43c8649..b4d1b78 100644
Binary files a/model/设计规格说明书/用例设计/查询余件 顺序图.vsdx and b/model/设计规格说明书/用例设计/用户注册-顺序图.vsdx differ
diff --git a/model/设计规格说明书/用例设计/用户注册.vsdx b/model/设计规格说明书/用例设计/用户注册.vsdx
deleted file mode 100644
index 3a1dd26..0000000
Binary files a/model/设计规格说明书/用例设计/用户注册.vsdx and /dev/null differ
diff --git a/model/设计规格说明书/用例设计/用户登录-顺序图.png b/model/设计规格说明书/用例设计/用户登录-顺序图.png
new file mode 100644
index 0000000..71c4892
Binary files /dev/null and b/model/设计规格说明书/用例设计/用户登录-顺序图.png differ
diff --git a/model/设计规格说明书/用例设计/系统设置 顺序图.vsdx b/model/设计规格说明书/用例设计/用户登录-顺序图.vsdx
similarity index 79%
rename from model/设计规格说明书/用例设计/系统设置 顺序图.vsdx
rename to model/设计规格说明书/用例设计/用户登录-顺序图.vsdx
index 9541999..afa5715 100644
Binary files a/model/设计规格说明书/用例设计/系统设置 顺序图.vsdx and b/model/设计规格说明书/用例设计/用户登录-顺序图.vsdx differ
diff --git a/model/设计规格说明书/用例设计/用户登录.vsdx b/model/设计规格说明书/用例设计/用户登录.vsdx
deleted file mode 100644
index 8bdc30e..0000000
Binary files a/model/设计规格说明书/用例设计/用户登录.vsdx and /dev/null differ
diff --git a/model/设计规格说明书/用例设计/登录 顺序图.png b/model/设计规格说明书/用例设计/登录 顺序图.png
deleted file mode 100644
index 5841751..0000000
Binary files a/model/设计规格说明书/用例设计/登录 顺序图.png and /dev/null differ
diff --git a/model/设计规格说明书/用例设计/系统设置 顺序图.png b/model/设计规格说明书/用例设计/系统设置 顺序图.png
deleted file mode 100644
index b690b0c..0000000
Binary files a/model/设计规格说明书/用例设计/系统设置 顺序图.png and /dev/null differ
diff --git a/model/设计规格说明书/用例设计/系统设置-顺序图.png b/model/设计规格说明书/用例设计/系统设置-顺序图.png
new file mode 100644
index 0000000..80de3af
Binary files /dev/null and b/model/设计规格说明书/用例设计/系统设置-顺序图.png differ
diff --git a/model/设计规格说明书/用例设计/发送取件指令 顺序图.vsdx b/model/设计规格说明书/用例设计/系统设置-顺序图.vsdx
similarity index 80%
rename from model/设计规格说明书/用例设计/发送取件指令 顺序图.vsdx
rename to model/设计规格说明书/用例设计/系统设置-顺序图.vsdx
index 9c80ef1..67a402e 100644
Binary files a/model/设计规格说明书/用例设计/发送取件指令 顺序图.vsdx and b/model/设计规格说明书/用例设计/系统设置-顺序图.vsdx differ
diff --git a/model/设计规格说明书/用户界面顺序图.png b/model/设计规格说明书/用户界面顺序图.png
new file mode 100644
index 0000000..689ab4d
Binary files /dev/null and b/model/设计规格说明书/用户界面顺序图.png differ
diff --git a/model/设计规格说明书/用户界面顺序图.vsdx b/model/设计规格说明书/用户界面顺序图.vsdx
index 1813c39..18daffe 100644
Binary files a/model/设计规格说明书/用户界面顺序图.vsdx and b/model/设计规格说明书/用户界面顺序图.vsdx differ
diff --git a/model/设计规格说明书/类设计/精化关键设计类间关系.png b/model/设计规格说明书/类设计/精化关键设计类间关系.png
new file mode 100644
index 0000000..ad3a616
Binary files /dev/null and b/model/设计规格说明书/类设计/精化关键设计类间关系.png differ
diff --git a/model/设计规格说明书/类设计/精化关键设计类间关系.vsdx b/model/设计规格说明书/类设计/精化关键设计类间关系.vsdx
new file mode 100644
index 0000000..58d644e
Binary files /dev/null and b/model/设计规格说明书/类设计/精化关键设计类间关系.vsdx differ
diff --git a/model/设计规格说明书/类设计/精化用户界面类关系.png b/model/设计规格说明书/类设计/精化用户界面类关系.png
new file mode 100644
index 0000000..d22a7c8
Binary files /dev/null and b/model/设计规格说明书/类设计/精化用户界面类关系.png differ
diff --git a/model/设计规格说明书/类设计/精化用户界面类关系.vsdx b/model/设计规格说明书/类设计/精化用户界面类关系.vsdx
new file mode 100644
index 0000000..9cd3238
Binary files /dev/null and b/model/设计规格说明书/类设计/精化用户界面类关系.vsdx differ
diff --git a/model/设计规格说明书/类设计/精化类间关系.png b/model/设计规格说明书/类设计/精化类间关系.png
new file mode 100644
index 0000000..b72c851
Binary files /dev/null and b/model/设计规格说明书/类设计/精化类间关系.png differ
diff --git a/model/设计规格说明书/类设计/精化类间关系.vsdx b/model/设计规格说明书/类设计/精化类间关系.vsdx
new file mode 100644
index 0000000..134f716
Binary files /dev/null and b/model/设计规格说明书/类设计/精化类间关系.vsdx differ
diff --git a/src/Logistics/app/src/main/AndroidManifest.xml b/src/Logistics/app/src/main/AndroidManifest.xml
index d870dab..ba12327 100644
--- a/src/Logistics/app/src/main/AndroidManifest.xml
+++ b/src/Logistics/app/src/main/AndroidManifest.xml
@@ -16,16 +16,16 @@
android:supportsRtl="true"
android:theme="@style/Theme.Logistics">
<activity
- android:name=".ui.HistoryActivity"
+ android:name=".ui.HistoryUI"
android:exported="false" />
<activity
- android:name=".ui.SearchActivity"
+ android:name=".ui.SearchUI"
android:exported="false" />
<activity
android:name=".ui.MenuActivity"
android:exported="false" />
<activity
- android:name=".ui.LoginActivity"
+ android:name=".ui.LoginUI"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -33,7 +33,7 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity android:name=".ui.SignUpActivity" />
+ <activity android:name=".ui.SignUpUI" />
<activity
android:name="com.journeyapps.barcodescanner.CaptureActivity"
android:screenOrientation="portrait"
diff --git a/src/Logistics/app/src/main/java/com/example/logistics/ui/FindActivity.java b/src/Logistics/app/src/main/java/com/example/logistics/ui/FindUI.java
similarity index 95%
rename from src/Logistics/app/src/main/java/com/example/logistics/ui/FindActivity.java
rename to src/Logistics/app/src/main/java/com/example/logistics/ui/FindUI.java
index b5386b4..0878eeb 100644
--- a/src/Logistics/app/src/main/java/com/example/logistics/ui/FindActivity.java
+++ b/src/Logistics/app/src/main/java/com/example/logistics/ui/FindUI.java
@@ -20,13 +20,13 @@ import androidx.fragment.app.Fragment;
import com.example.logistics.R;
import com.example.logistics.manager.goodManager;
-public class FindActivity extends Fragment implements View.OnClickListener{
+public class FindUI extends Fragment implements View.OnClickListener{
private Context mContext;
private Button mButton;
private EditText mPickUpCode;
private EditText mPhoneNum;
- public FindActivity(){
+ public FindUI(){
}
@Nullable
diff --git a/src/Logistics/app/src/main/java/com/example/logistics/ui/HistoryActivity.java b/src/Logistics/app/src/main/java/com/example/logistics/ui/HistoryUI.java
similarity index 92%
rename from src/Logistics/app/src/main/java/com/example/logistics/ui/HistoryActivity.java
rename to src/Logistics/app/src/main/java/com/example/logistics/ui/HistoryUI.java
index 3a89a44..114308f 100644
--- a/src/Logistics/app/src/main/java/com/example/logistics/ui/HistoryActivity.java
+++ b/src/Logistics/app/src/main/java/com/example/logistics/ui/HistoryUI.java
@@ -25,7 +25,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-public class HistoryActivity extends Activity implements OnItemClickListener, OnScrollListener, View.OnClickListener {
+public class HistoryUI extends Activity implements OnItemClickListener, OnScrollListener, View.OnClickListener {
private String TAG = "HistoryActivity";
private ListView lv_history;
@@ -111,7 +111,7 @@ public class HistoryActivity extends Activity implements OnItemClickListener, On
@Override
public void handleMessage(Message msg){
if(msg.what == 1){
- simp_adapter=new SimpleAdapter(HistoryActivity.this, dataList, R.layout.item, new String[]{"pickupcode","time"}, new int[]{R.id.np_id,R.id.np_time});
+ simp_adapter=new SimpleAdapter(HistoryUI.this, dataList, R.layout.item, new String[]{"pickupcode","time"}, new int[]{R.id.np_id,R.id.np_time});
lv_history.setAdapter(simp_adapter);
}
}
diff --git a/src/Logistics/app/src/main/java/com/example/logistics/ui/LoginActivity.java b/src/Logistics/app/src/main/java/com/example/logistics/ui/LoginUI.java
similarity index 89%
rename from src/Logistics/app/src/main/java/com/example/logistics/ui/LoginActivity.java
rename to src/Logistics/app/src/main/java/com/example/logistics/ui/LoginUI.java
index 7b4ba8d..4d626fe 100644
--- a/src/Logistics/app/src/main/java/com/example/logistics/ui/LoginActivity.java
+++ b/src/Logistics/app/src/main/java/com/example/logistics/ui/LoginUI.java
@@ -1,15 +1,12 @@
package com.example.logistics.ui;
import com.example.logistics.R;
-import com.example.logistics.manager.goodManager;
-import com.example.logistics.manager.operationManager;
import com.example.logistics.manager.userManager;
import com.example.logistics.entity.User;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.AlertDialog;
-import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
@@ -20,11 +17,8 @@ import android.widget.Button;
import android.widget.EditText;
import android.widget.Toast;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-public class LoginActivity extends Activity {
+public class LoginUI extends Activity {
private int islogin = 0;
private Button loginButton;
@@ -50,9 +44,9 @@ public class LoginActivity extends Activity {
phonenumButton = (Button) this.findViewById(R.id.phonenum);
- AlertDialog.Builder builder = new AlertDialog.Builder(LoginActivity.this);
+ AlertDialog.Builder builder = new AlertDialog.Builder(LoginUI.this);
- View view2 = View.inflate(LoginActivity.this, R.layout.forget, null);
+ View view2 = View.inflate(LoginUI.this, R.layout.forget, null);
builder.setTitle("取件").setView(view2);
@@ -76,7 +70,7 @@ public class LoginActivity extends Activity {
new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(LoginActivity.this, SignUpActivity.class);
+ Intent intent = new Intent(LoginUI.this, SignUpUI.class);
Log.d(TAG, "signup");
startActivity(intent);
}
@@ -156,7 +150,7 @@ public class LoginActivity extends Activity {
hand1.sendEmptyMessage(msg);
if(msg == 1){
User owner = userManager.findUser(userName.getText().toString().trim());
- Intent intent = new Intent(LoginActivity.this, MenuActivity.class);
+ Intent intent = new Intent(LoginUI.this, MenuActivity.class);
if(flag == 1){
intent.putExtra("user", userName.getText().toString().trim());
}else{
@@ -190,9 +184,9 @@ public class LoginActivity extends Activity {
@Override
public void handleMessage(Message msg) {
if(msg.what == 0){
- Toast.makeText(LoginActivity.this, "修改失败", Toast.LENGTH_SHORT).show();
+ Toast.makeText(LoginUI.this, "修改失败", Toast.LENGTH_SHORT).show();
}else if(msg.what == 1) {
- Toast.makeText(LoginActivity.this, "修改成功", Toast.LENGTH_SHORT).show();
+ Toast.makeText(LoginUI.this, "修改成功", Toast.LENGTH_SHORT).show();
}
}
};
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 ae76baa..8645404 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
@@ -93,7 +93,7 @@ public class MenuActivity extends AppCompatActivity implements View.OnClickListe
mTextView1.setSelected(true);
mTextNum1.setVisibility(View.INVISIBLE);
if (mFrag1 == null) {
- mFrag1 = new FindActivity();
+ mFrag1 = new FindUI();
transaction.add(R.id.fragment_container, mFrag1);
@@ -106,7 +106,7 @@ public class MenuActivity extends AppCompatActivity implements View.OnClickListe
mTextView2.setSelected(true);
mTextNum2.setVisibility(View.INVISIBLE);
if (mFrag2 == null) {
- mFrag2 = new PickUpActivity();
+ mFrag2 = new PickUpUI();
Bundle bundle = new Bundle();
bundle.putString("user", owner);
mFrag2.setArguments(bundle);
@@ -120,7 +120,7 @@ public class MenuActivity extends AppCompatActivity implements View.OnClickListe
mTextView3.setSelected(true);
mTextNum3.setVisibility(View.INVISIBLE);
if (mFrag3 == null) {
- mFrag3 = new SetActivity();
+ mFrag3 = new SetUI();
Bundle bundle = new Bundle();
bundle.putString("user", owner);
mFrag3.setArguments(bundle);
diff --git a/src/Logistics/app/src/main/java/com/example/logistics/ui/PickUpActivity.java b/src/Logistics/app/src/main/java/com/example/logistics/ui/PickUpUI.java
similarity index 98%
rename from src/Logistics/app/src/main/java/com/example/logistics/ui/PickUpActivity.java
rename to src/Logistics/app/src/main/java/com/example/logistics/ui/PickUpUI.java
index f0b8fea..0ffd4f1 100644
--- a/src/Logistics/app/src/main/java/com/example/logistics/ui/PickUpActivity.java
+++ b/src/Logistics/app/src/main/java/com/example/logistics/ui/PickUpUI.java
@@ -38,7 +38,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
-public class PickUpActivity extends Fragment implements View.OnClickListener{
+public class PickUpUI extends Fragment implements View.OnClickListener{
private Button mButton;
private Context mContext;
@@ -58,7 +58,7 @@ public class PickUpActivity extends Fragment implements View.OnClickListener{
int flag = 0; //flag=0:chushi
- public PickUpActivity(){
+ public PickUpUI(){
}
@Nullable
diff --git a/src/Logistics/app/src/main/java/com/example/logistics/ui/SearchActivity.java b/src/Logistics/app/src/main/java/com/example/logistics/ui/SearchUI.java
similarity index 93%
rename from src/Logistics/app/src/main/java/com/example/logistics/ui/SearchActivity.java
rename to src/Logistics/app/src/main/java/com/example/logistics/ui/SearchUI.java
index c824188..b5d3499 100644
--- a/src/Logistics/app/src/main/java/com/example/logistics/ui/SearchActivity.java
+++ b/src/Logistics/app/src/main/java/com/example/logistics/ui/SearchUI.java
@@ -25,7 +25,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-public class SearchActivity extends Activity implements OnItemClickListener, OnScrollListener, View.OnClickListener {
+public class SearchUI extends Activity implements OnItemClickListener, OnScrollListener, View.OnClickListener {
private String TAG = "NoPickActivity";
private ListView lv_nopick;
@@ -113,7 +113,7 @@ public class SearchActivity extends Activity implements OnItemClickListener, OnS
@Override
public void handleMessage(Message msg){
if(msg.what == 1){
- simp_adapter=new SimpleAdapter(SearchActivity.this, dataList, R.layout.item, new String[]{"id","time"}, new int[]{R.id.np_id,R.id.np_time});
+ simp_adapter=new SimpleAdapter(SearchUI.this, dataList, R.layout.item, new String[]{"id","time"}, new int[]{R.id.np_id,R.id.np_time});
lv_nopick.setAdapter(simp_adapter);
}
}
diff --git a/src/Logistics/app/src/main/java/com/example/logistics/ui/SetActivity.java b/src/Logistics/app/src/main/java/com/example/logistics/ui/SetUI.java
similarity index 85%
rename from src/Logistics/app/src/main/java/com/example/logistics/ui/SetActivity.java
rename to src/Logistics/app/src/main/java/com/example/logistics/ui/SetUI.java
index 7aa06a4..b01353a 100644
--- a/src/Logistics/app/src/main/java/com/example/logistics/ui/SetActivity.java
+++ b/src/Logistics/app/src/main/java/com/example/logistics/ui/SetUI.java
@@ -15,14 +15,14 @@ import androidx.annotation.Nullable;
import com.example.logistics.R;
-public class SetActivity extends Fragment implements View.OnClickListener{
+public class SetUI extends Fragment implements View.OnClickListener{
private LinearLayout ll_waiting;
private LinearLayout ll_history;
private LinearLayout ll_exit;
private Context mContext;
private String user;
- public SetActivity(){
+ public SetUI(){
}
@Nullable
@@ -52,19 +52,19 @@ public class SetActivity extends Fragment implements View.OnClickListener{
Intent intent;
switch(view.getId()){
case R.id.waiting:
- intent = new Intent(mContext, SearchActivity.class);
+ intent = new Intent(mContext, SearchUI.class);
intent.putExtra("user", user);
startActivity(intent);
break;
case R.id.history:
- intent = new Intent(mContext, HistoryActivity.class);
+ intent = new Intent(mContext, HistoryUI.class);
intent.putExtra("user", user);
startActivity(intent);
break;
case R.id.exit:
Toast.makeText(mContext, "exit", Toast.LENGTH_SHORT).show();
- intent = new Intent(mContext, LoginActivity.class);
+ intent = new Intent(mContext, LoginUI.class);
startActivity(intent);
getActivity().finish();
break;
diff --git a/src/Logistics/app/src/main/java/com/example/logistics/ui/SignUpActivity.java b/src/Logistics/app/src/main/java/com/example/logistics/ui/SignUpUI.java
similarity index 82%
rename from src/Logistics/app/src/main/java/com/example/logistics/ui/SignUpActivity.java
rename to src/Logistics/app/src/main/java/com/example/logistics/ui/SignUpUI.java
index 55ef479..e7fdfe2 100644
--- a/src/Logistics/app/src/main/java/com/example/logistics/ui/SignUpActivity.java
+++ b/src/Logistics/app/src/main/java/com/example/logistics/ui/SignUpUI.java
@@ -15,7 +15,7 @@ import com.example.logistics.R;
import com.example.logistics.manager.userManager;
import com.example.logistics.entity.User;
-public class SignUpActivity extends Activity {
+public class SignUpUI extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -38,7 +38,7 @@ public class SignUpActivity extends Activity {
@Override
public void onClick(View v) {
// 跳转到登录界面
- Intent intent = new Intent(SignUpActivity.this, LoginActivity.class);
+ Intent intent = new Intent(SignUpUI.this, LoginUI.class);
startActivity(intent);
}
}
@@ -58,17 +58,17 @@ public class SignUpActivity extends Activity {
String strPhoneNumber = phone.getText().toString().trim();
if (strUserName.length() > 10) {
- Toast.makeText(SignUpActivity.this, "用户名长度必须小于10！", Toast.LENGTH_SHORT).show();
+ Toast.makeText(SignUpUI.this, "用户名长度必须小于10！", Toast.LENGTH_SHORT).show();
} else if (strUserName.length() == 0) {
- Toast.makeText(SignUpActivity.this, "用户名不能为空！", Toast.LENGTH_SHORT).show();
+ Toast.makeText(SignUpUI.this, "用户名不能为空！", Toast.LENGTH_SHORT).show();
} else if (strPassWord.length() > 16) {
- Toast.makeText(SignUpActivity.this, "密码长度必须小于16！", Toast.LENGTH_SHORT).show();
+ Toast.makeText(SignUpUI.this, "密码长度必须小于16！", Toast.LENGTH_SHORT).show();
} else if (strPassWord.length() == 0) {
- Toast.makeText(SignUpActivity.this, "密码不能为空！", Toast.LENGTH_SHORT).show();
+ Toast.makeText(SignUpUI.this, "密码不能为空！", Toast.LENGTH_SHORT).show();
} else if (!strPassWord.equals(strPassWordAgain)) {
- Toast.makeText(SignUpActivity.this, "两次密码输入不一致！", Toast.LENGTH_SHORT).show();
+ Toast.makeText(SignUpUI.this, "两次密码输入不一致！", Toast.LENGTH_SHORT).show();
} else {
- Toast.makeText(SignUpActivity.this, "注册成功！", Toast.LENGTH_SHORT).show();
+ Toast.makeText(SignUpUI.this, "注册成功！", Toast.LENGTH_SHORT).show();
User user = new User();
user.setUserName(strUserName);
@@ -106,7 +106,7 @@ public class SignUpActivity extends Activity {
Toast.makeText(getApplicationContext(), "该账号已存在，请换一个注册", Toast.LENGTH_SHORT).show();
}else if(msg.what == 2){
Toast.makeText(getApplicationContext(), "注册成功", Toast.LENGTH_SHORT).show();
- Intent intent = new Intent(SignUpActivity.this, LoginActivity.class);
+ Intent intent = new Intent(SignUpUI.this, LoginUI.class);
startActivity(intent);
}
}
diff --git a/src/Logistics/app/src/main/res/layout/activity_main.xml b/src/Logistics/app/src/main/res/layout/activity_main.xml
index d7bfeb4..64d5903 100644
--- a/src/Logistics/app/src/main/res/layout/activity_main.xml
+++ b/src/Logistics/app/src/main/res/layout/activity_main.xml
@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context="com.example.logistics.ui.LoginActivity">
+ tools:context="com.example.logistics.ui.LoginUI">
<!--使用线性布局-->
<LinearLayout
android:id="@+id/linearLayout2"
diff --git a/src/Logistics/app/src/main/res/layout/activity_sign_up.xml b/src/Logistics/app/src/main/res/layout/activity_sign_up.xml
index 9d9a60e..59b09a4 100644
--- a/src/Logistics/app/src/main/res/layout/activity_sign_up.xml
+++ b/src/Logistics/app/src/main/res/layout/activity_sign_up.xml
@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context="com.example.logistics.ui.SignUpActivity">
+ tools:context="com.example.logistics.ui.SignUpUI">
<!--使用线性布局-->
<LinearLayout