Huatao_branch
HuaTao 2 years ago
parent 584478398e
commit 4d08d4be05

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 236 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 108 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 110 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 162 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 113 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 110 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 118 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 106 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 131 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 60 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 125 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

@ -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"

@ -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

@ -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);
}
}

@ -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();
}
}
};

@ -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);

@ -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

@ -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);
}
}

@ -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;

@ -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);
}
}

@ -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"

@ -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

Loading…
Cancel
Save