From f5a1bb7aba3cd46a22fede23680ff1f0d5c10c2d Mon Sep 17 00:00:00 2001
From: Li Tianhong <2291218385@qq.com>
Date: Mon, 11 Apr 2022 20:06:54 +0800
Subject: [PATCH] tianjia
---
src/Logistics/.idea/misc.xml | 2 +-
.../com/example/logistics/dao/goodDao.java | 33 +++++++
.../example/logistics/ui/MainActivity.java | 6 +-
.../example/logistics/ui/MenuActivity.java | 2 +-
.../com/example/logistics/ui/MyFragment2.java | 34 +++++--
.../com/example/logistics/ui/MyFragment3.java | 37 ++++++-
.../app/src/main/res/layout/my_fragment2.xml | 4 +-
.../app/src/main/res/layout/my_fragment3.xml | 96 +++++++++++++++++--
8 files changed, 190 insertions(+), 24 deletions(-)
diff --git a/src/Logistics/.idea/misc.xml b/src/Logistics/.idea/misc.xml
index 6b89b6d..383605d 100644
--- a/src/Logistics/.idea/misc.xml
+++ b/src/Logistics/.idea/misc.xml
@@ -24,7 +24,7 @@
-
+
diff --git a/src/Logistics/app/src/main/java/com/example/logistics/dao/goodDao.java b/src/Logistics/app/src/main/java/com/example/logistics/dao/goodDao.java
index 2fc2ece..25d8d28 100644
--- a/src/Logistics/app/src/main/java/com/example/logistics/dao/goodDao.java
+++ b/src/Logistics/app/src/main/java/com/example/logistics/dao/goodDao.java
@@ -24,6 +24,7 @@ public class goodDao {
Connection connection = DBOpenHelper.getConn();
+
int msg = 0;
try{
String sql = "select * from goods where id = ?";
@@ -83,4 +84,36 @@ public class goodDao {
}
return msg;
}
+
+ public boolean delete(String pickupcode){
+
+ Connection connection = DBOpenHelper.getConn();
+ try{
+ String sql = "delete from goods where id = ?";
+
+ if(connection != null){
+ PreparedStatement ps = connection.prepareStatement(sql);
+ if(ps != null){
+ Log.e(TAG, "pickupcode: " + pickupcode);
+ ps.setString(1,pickupcode);
+
+ ps.executeUpdate();
+
+ connection.close();
+ ps.close();
+ return true;
+ }else{
+ Log.e(TAG, "ps is null");
+ return false;
+ }
+ }else{
+ Log.e(TAG, "connection is null");
+ return false;
+ }
+ }catch(Exception e){
+ e.printStackTrace();
+ Log.d(TAG, "delete bug" + e.getMessage());
+ }
+ return false;
+ }
}
diff --git a/src/Logistics/app/src/main/java/com/example/logistics/ui/MainActivity.java b/src/Logistics/app/src/main/java/com/example/logistics/ui/MainActivity.java
index 6fd1b09..fc419de 100644
--- a/src/Logistics/app/src/main/java/com/example/logistics/ui/MainActivity.java
+++ b/src/Logistics/app/src/main/java/com/example/logistics/ui/MainActivity.java
@@ -29,8 +29,7 @@ public class MainActivity extends Activity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
- Intent intent = new Intent(MainActivity.this, MenuActivity.class);
- startActivity(intent);
+
Button loginButton = (Button) this.findViewById(R.id.LoginButton);
Button signUpButton = (Button) this.findViewById(R.id.SignUpButton);
@@ -68,8 +67,9 @@ public class MainActivity extends Activity {
if(msg == 1){
User owner = userDao.findUser(userName.getText().toString().trim());
Intent intent = new Intent(MainActivity.this, MenuActivity.class);
- intent.putExtra("name", owner.getPhoneNum());
+ intent.putExtra("user", owner.getPhoneNum());
startActivity(intent);
+ finish();
}
}
}.start();
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 5f8b8d8..697eba0 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
@@ -35,7 +35,7 @@ public class MenuActivity extends AppCompatActivity implements View.OnClickListe
bindView();
Intent intent = getIntent();
- owner = intent.getStringExtra("name");
+ owner = intent.getStringExtra("user");
selectTab(0);
}
diff --git a/src/Logistics/app/src/main/java/com/example/logistics/ui/MyFragment2.java b/src/Logistics/app/src/main/java/com/example/logistics/ui/MyFragment2.java
index fe58fd6..92f07e0 100644
--- a/src/Logistics/app/src/main/java/com/example/logistics/ui/MyFragment2.java
+++ b/src/Logistics/app/src/main/java/com/example/logistics/ui/MyFragment2.java
@@ -21,6 +21,7 @@ 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;
@@ -91,33 +92,52 @@ public class MyFragment2 extends Fragment implements View.OnClickListener{
button.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- Toast.makeText(mContext, "取件成功", Toast.LENGTH_LONG).show();
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 (pickupcode.equals(QR_pickup) && pickupcode.equals(QR_phone)) {
- Toast.makeText(mContext, "取件成功", Toast.LENGTH_LONG).show();
+ 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 flag = operationDao.add(pickupcode, user);
+
+ boolean flag1 = operationDao.add(pickupcode, user);
+ boolean flag2 = goodDao.delete(pickupcode);
+
+ boolean flag = flag1 & flag2;
if (flag) {
- Log.d("add", "success");
- } else {
- Log.d("add", "failed");
+ msg = 1;
}
+ hand1.sendEmptyMessage(msg);
}
}.start();
} 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);
+ }
+ }
+ };
}
\ No newline at end of file
diff --git a/src/Logistics/app/src/main/java/com/example/logistics/ui/MyFragment3.java b/src/Logistics/app/src/main/java/com/example/logistics/ui/MyFragment3.java
index 3737ef5..0b832bc 100644
--- a/src/Logistics/app/src/main/java/com/example/logistics/ui/MyFragment3.java
+++ b/src/Logistics/app/src/main/java/com/example/logistics/ui/MyFragment3.java
@@ -1,16 +1,28 @@
package com.example.logistics.ui;
import androidx.fragment.app.Fragment;
+
+import android.content.Context;
+import android.content.Intent;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.TextView;
+import android.widget.Toast;
import androidx.annotation.Nullable;
import com.example.logistics.R;
+import org.w3c.dom.Text;
+
public class MyFragment3 extends Fragment implements View.OnClickListener{
+ TextView tv_waiting;
+ TextView tv_history;
+ TextView tv_exit;
+ Context mContext;
+
public MyFragment3(){
}
@@ -20,12 +32,35 @@ public class MyFragment3 extends Fragment implements View.OnClickListener{
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.my_fragment3,container,false);
+ tv_waiting = (TextView) view.findViewById(R.id.waiting);
+ tv_history = (TextView) view.findViewById(R.id.history);
+ tv_exit = (TextView) view.findViewById(R.id.exit);
+
+ tv_waiting.setOnClickListener(this);
+ tv_history.setOnClickListener(this);
+ tv_exit.setOnClickListener(this);
+
+ mContext = getActivity();
+
return view;
}
@Override
public void onClick(View view) {
-
+ switch(view.getId()){
+ case R.id.waiting:
+ Toast.makeText(mContext, "waiting", Toast.LENGTH_SHORT).show();
+ break;
+ case R.id.history:
+ Toast.makeText(mContext, "history", Toast.LENGTH_SHORT).show();
+ break;
+ case R.id.exit:
+ Toast.makeText(mContext, "exit", Toast.LENGTH_SHORT).show();
+ Intent intent = new Intent(mContext, MainActivity.class);
+ startActivity(intent);
+ getActivity().finish();
+ break;
+ }
}
}
diff --git a/src/Logistics/app/src/main/res/layout/my_fragment2.xml b/src/Logistics/app/src/main/res/layout/my_fragment2.xml
index ff1a7a5..d1f3fa6 100644
--- a/src/Logistics/app/src/main/res/layout/my_fragment2.xml
+++ b/src/Logistics/app/src/main/res/layout/my_fragment2.xml
@@ -3,12 +3,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:padding="5dp">
+ android:padding="5dp"
+ android:background="#F5F5F5">
+
+
\ No newline at end of file