From 8b58e99d71257fb15ac7842e8812296f7281dfa8 Mon Sep 17 00:00:00 2001 From: ghtMare <2467889729@qq.com> Date: Thu, 20 Apr 2023 13:51:46 +0800 Subject: [PATCH] code improvements --- .../example/Cat/ExampleInstrumentedTest.java | 2 +- app/src/main/AndroidManifest.xml | 10 ++++----- .../{activity => }/GoodsActivity.java | 7 +++--- .../activity/{activity => }/MainActivity.java | 22 ++++++++++++------- .../{activity => }/RegisterActivity.java | 5 ++--- .../activity/{activity => }/UserActivity.java | 13 ++++++++--- .../{activity => }/UserMessageActivity.java | 12 +++++----- .../User_Database.java | 19 ++++++++-------- .../activity => entity}/UserInfo.java | 2 +- .../ContentFragment.java | 4 ++-- .../activity => fragment}/TitleFragment.java | 5 +++-- app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/layout/content_user.xml | 1 - 13 files changed, 59 insertions(+), 45 deletions(-) rename app/src/main/java/com/example/Cat/activity/{activity => }/GoodsActivity.java (91%) rename app/src/main/java/com/example/Cat/activity/{activity => }/MainActivity.java (72%) rename app/src/main/java/com/example/Cat/activity/{activity => }/RegisterActivity.java (98%) rename app/src/main/java/com/example/Cat/activity/{activity => }/UserActivity.java (80%) rename app/src/main/java/com/example/Cat/activity/{activity => }/UserMessageActivity.java (75%) rename app/src/main/java/com/example/Cat/{activity/activity => databaseoperation}/User_Database.java (88%) rename app/src/main/java/com/example/Cat/{activity/activity => entity}/UserInfo.java (95%) rename app/src/main/java/com/example/Cat/{activity/activity => fragment}/ContentFragment.java (92%) rename app/src/main/java/com/example/Cat/{activity/activity => fragment}/TitleFragment.java (93%) diff --git a/app/src/androidTest/java/com/example/Cat/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/example/Cat/ExampleInstrumentedTest.java index 813797f..780d613 100644 --- a/app/src/androidTest/java/com/example/Cat/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/example/Cat/ExampleInstrumentedTest.java @@ -22,6 +22,6 @@ public class ExampleInstrumentedTest { // Context of the app under test. Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - assertEquals("com.example.orangesale_01", appContext.getPackageName()); + assertEquals("com.example.Cat", appContext.getPackageName()); } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 641cee4..a1441c3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,18 +10,18 @@ android:supportsRtl="true" android:theme="@style/AppTheme"> - + - - - + + + \ No newline at end of file diff --git a/app/src/main/java/com/example/Cat/activity/activity/GoodsActivity.java b/app/src/main/java/com/example/Cat/activity/GoodsActivity.java similarity index 91% rename from app/src/main/java/com/example/Cat/activity/activity/GoodsActivity.java rename to app/src/main/java/com/example/Cat/activity/GoodsActivity.java index 55fb24b..4bbe28d 100644 --- a/app/src/main/java/com/example/Cat/activity/activity/GoodsActivity.java +++ b/app/src/main/java/com/example/Cat/activity/GoodsActivity.java @@ -1,15 +1,14 @@ -package com.example.Cat.activity.activity; +package com.example.Cat.activity; -import androidx.appcompat.app.AppCompatActivity; -import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; import android.os.Bundle; -import android.view.View; import com.example.Cat.R; +import com.example.Cat.fragment.ContentFragment; +import com.example.Cat.fragment.TitleFragment; public class GoodsActivity extends FragmentActivity { diff --git a/app/src/main/java/com/example/Cat/activity/activity/MainActivity.java b/app/src/main/java/com/example/Cat/activity/MainActivity.java similarity index 72% rename from app/src/main/java/com/example/Cat/activity/activity/MainActivity.java rename to app/src/main/java/com/example/Cat/activity/MainActivity.java index cdf29e5..492c76b 100644 --- a/app/src/main/java/com/example/Cat/activity/activity/MainActivity.java +++ b/app/src/main/java/com/example/Cat/activity/MainActivity.java @@ -1,4 +1,4 @@ -package com.example.Cat.activity.activity; +package com.example.Cat.activity; import androidx.appcompat.app.AppCompatActivity; @@ -8,12 +8,12 @@ import android.os.Bundle; import android.view.View; import android.widget.Button; import android.widget.EditText; -import android.widget.ImageView; import android.widget.Toast; import com.example.Cat.R; +import com.example.Cat.databaseoperation.User_Database; +import com.example.Cat.entity.UserInfo; -import java.util.ArrayList; import java.util.List; public class MainActivity extends AppCompatActivity implements View.OnClickListener { @@ -58,16 +58,22 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe public void Verification(){ //UserInfo info; Intent intent = new Intent(MainActivity.this, UserActivity.class); - intent.putExtra("username",usernameText.getText().toString()); + //intent.putExtra("username",usernameText.getText().toString()); User_Database user=new User_Database(MainActivity.this); SQLiteDatabase sqLiteDatabase=user.getReadableDatabase(); - list=user.queryByName(sqLiteDatabase,usernameText.getText().toString()); + UserInfo info=user.queryByName(sqLiteDatabase,usernameText.getText().toString()); //info=list.get(0); - if(paswdEdit.getText().toString().equals(list.get(0).paswd)){ - startActivity(intent); + if(info!=null){ + intent.putExtra("username",usernameText.getText().toString()); + if(paswdEdit.getText().toString().equals(info.getPaswd())){ + startActivity(intent); + } + else{ + Toast.makeText(this, "密码错误！", Toast.LENGTH_SHORT).show(); + } } else{ - Toast.makeText(this, "密码错误！", Toast.LENGTH_SHORT).show(); + Toast.makeText(this, "用户不存在！", Toast.LENGTH_SHORT).show(); } } } diff --git a/app/src/main/java/com/example/Cat/activity/activity/RegisterActivity.java b/app/src/main/java/com/example/Cat/activity/RegisterActivity.java similarity index 98% rename from app/src/main/java/com/example/Cat/activity/activity/RegisterActivity.java rename to app/src/main/java/com/example/Cat/activity/RegisterActivity.java index f6134cf..8f7b1cb 100644 --- a/app/src/main/java/com/example/Cat/activity/activity/RegisterActivity.java +++ b/app/src/main/java/com/example/Cat/activity/RegisterActivity.java @@ -1,12 +1,10 @@ -package com.example.Cat.activity.activity; +package com.example.Cat.activity; import android.content.Intent; import android.database.sqlite.SQLiteDatabase; import android.graphics.Color; import android.os.Bundle; -import android.util.Log; import android.view.View; -import android.view.Window; import android.widget.Button; import android.widget.EditText; import android.widget.RadioGroup; @@ -17,6 +15,7 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import com.example.Cat.R; +import com.example.Cat.databaseoperation.User_Database; import com.lljjcoder.citypickerview.widget.CityPicker; public class RegisterActivity extends AppCompatActivity implements View.OnClickListener,RadioGroup.OnCheckedChangeListener { diff --git a/app/src/main/java/com/example/Cat/activity/activity/UserActivity.java b/app/src/main/java/com/example/Cat/activity/UserActivity.java similarity index 80% rename from app/src/main/java/com/example/Cat/activity/activity/UserActivity.java rename to app/src/main/java/com/example/Cat/activity/UserActivity.java index 5487eb0..88a75f8 100644 --- a/app/src/main/java/com/example/Cat/activity/activity/UserActivity.java +++ b/app/src/main/java/com/example/Cat/activity/UserActivity.java @@ -1,9 +1,10 @@ -package com.example.Cat.activity.activity; +package com.example.Cat.activity; import android.app.Activity; import android.content.Intent; import android.os.Bundle; import android.view.View; +import android.widget.Button; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; @@ -15,6 +16,7 @@ import com.example.Cat.R; public class UserActivity extends Activity implements View.OnClickListener{ private ImageView userIconImage; public String username; + Button button; private TextView usernameText; private LinearLayout usernameLine, userSettingLine,userProductLine; @@ -36,6 +38,8 @@ public class UserActivity extends Activity implements View.OnClickListener{ userProductLine = findViewById(R.id.user_product); userProductLine.setOnClickListener(this); userSettingLine.setOnClickListener(this); + button=findViewById(R.id.exit); + button.setOnClickListener(this); setData(); } @@ -51,14 +55,17 @@ public class UserActivity extends Activity implements View.OnClickListener{ public void onClick(View v) { switch (v.getId()) { case R.id.user_product: - Intent intent2 = new Intent(this,GoodsActivity.class); + Intent intent2 = new Intent(this, GoodsActivity.class); startActivity(intent2); break; case R.id.user_setting: - Intent intent3 = new Intent(this,UserMessageActivity.class); + Intent intent3 = new Intent(this, UserMessageActivity.class); intent3.putExtra("username",username); startActivity(intent3); break; + case R.id.exit: + Intent intent4 = new Intent(this, MainActivity.class); + startActivity(intent4); } } } diff --git a/app/src/main/java/com/example/Cat/activity/activity/UserMessageActivity.java b/app/src/main/java/com/example/Cat/activity/UserMessageActivity.java similarity index 75% rename from app/src/main/java/com/example/Cat/activity/activity/UserMessageActivity.java rename to app/src/main/java/com/example/Cat/activity/UserMessageActivity.java index a124866..0091d77 100644 --- a/app/src/main/java/com/example/Cat/activity/activity/UserMessageActivity.java +++ b/app/src/main/java/com/example/Cat/activity/UserMessageActivity.java @@ -1,4 +1,4 @@ -package com.example.Cat.activity.activity; +package com.example.Cat.activity; import androidx.appcompat.app.AppCompatActivity; @@ -9,6 +9,8 @@ import android.view.View; import android.widget.TextView; import com.example.Cat.R; +import com.example.Cat.databaseoperation.User_Database; +import com.example.Cat.entity.UserInfo; import java.util.List; @@ -29,11 +31,11 @@ public class UserMessageActivity extends AppCompatActivity implements View.OnCli username = intent.getStringExtra("username"); User_Database user=new User_Database(UserMessageActivity.this); SQLiteDatabase sqLiteDatabase=user.getReadableDatabase(); - list=user.queryByName(sqLiteDatabase,username); + UserInfo info=user.queryByName(sqLiteDatabase,username); user.close(); - usernameText.setText(String.format("%s", list.get(0).username)); - sexText.setText(String.format("%s",list.get(0).sex)); - addressText.setText(String.format("%s", list.get(0).city)); + usernameText.setText(String.format("%s", info.getUsername())); + sexText.setText(String.format("%s",info.getSex())); + addressText.setText(String.format("%s", info.getCity())); } private void init() { usernameText = findViewById(R.id.username); diff --git a/app/src/main/java/com/example/Cat/activity/activity/User_Database.java b/app/src/main/java/com/example/Cat/databaseoperation/User_Database.java similarity index 88% rename from app/src/main/java/com/example/Cat/activity/activity/User_Database.java rename to app/src/main/java/com/example/Cat/databaseoperation/User_Database.java index 90c215a..8700ab5 100644 --- a/app/src/main/java/com/example/Cat/activity/activity/User_Database.java +++ b/app/src/main/java/com/example/Cat/databaseoperation/User_Database.java @@ -1,4 +1,4 @@ -package com.example.Cat.activity.activity; +package com.example.Cat.databaseoperation; import android.content.ContentValues; import android.content.Context; @@ -7,7 +7,7 @@ import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; import android.util.Log; -import androidx.annotation.NonNull; +import com.example.Cat.entity.UserInfo; import java.util.ArrayList; import java.util.List; @@ -46,9 +46,9 @@ public class User_Database extends SQLiteOpenHelper { values.put("sex", sex); values.put("city", city); //验证用户名是否存在 - List userListByName=queryByName(sqLiteDatabase,username); + UserInfo userListByName=queryByName(sqLiteDatabase,username); //存在返回“repeat”,不存在则继续添加 - if(!userListByName.isEmpty()) return"repeat"; + if(userListByName!=null) return"repeat"; long res=sqLiteDatabase.insert("user", null, values); sqLiteDatabase.close(); if(res==-1) return"false"; @@ -81,7 +81,7 @@ public class User_Database extends SQLiteOpenHelper { public List queryData(SQLiteDatabase sqLiteDatabase) { Cursor cursor = sqLiteDatabase.query("user", null, null, null, null, null, "id ASC"); List list = new ArrayList(); - while (cursor.moveToNext()) { + while (cursor.moveToNext()&&cursor!=null) { int id = cursor.getInt(cursor.getColumnIndex("id")); Log.i("SQLite","id="+id); String username = cursor.getString(1); @@ -100,16 +100,17 @@ public class User_Database extends SQLiteOpenHelper { } //根据传入用户名查询记录 - public List queryByName(SQLiteDatabase sqLiteDatabase,String name) { + public UserInfo queryByName(SQLiteDatabase sqLiteDatabase,String name) { Cursor cursor = sqLiteDatabase.query("user", null, "username=?", new String[]{name}, null, null, "id ASC"); - List list = new ArrayList(); - while (cursor.moveToNext()) { + UserInfo list=null; + //List list = new ArrayList(); + while (cursor.moveToNext()&&cursor!=null) { int id = cursor.getInt(cursor.getColumnIndex("id")); String username = cursor.getString(1); String paswd = cursor.getString(2); String sex = cursor.getString(3); String city = cursor.getString(4); - list.add(new UserInfo(id, username, paswd, sex, city)); + list=new UserInfo(id, username, paswd, sex, city); } cursor.close(); // sqLiteDatabase.close(); diff --git a/app/src/main/java/com/example/Cat/activity/activity/UserInfo.java b/app/src/main/java/com/example/Cat/entity/UserInfo.java similarity index 95% rename from app/src/main/java/com/example/Cat/activity/activity/UserInfo.java rename to app/src/main/java/com/example/Cat/entity/UserInfo.java index 30fc9b2..3712350 100644 --- a/app/src/main/java/com/example/Cat/activity/activity/UserInfo.java +++ b/app/src/main/java/com/example/Cat/entity/UserInfo.java @@ -1,4 +1,4 @@ -package com.example.Cat.activity.activity; +package com.example.Cat.entity; public class UserInfo { int id; diff --git a/app/src/main/java/com/example/Cat/activity/activity/ContentFragment.java b/app/src/main/java/com/example/Cat/fragment/ContentFragment.java similarity index 92% rename from app/src/main/java/com/example/Cat/activity/activity/ContentFragment.java rename to app/src/main/java/com/example/Cat/fragment/ContentFragment.java index 4c81ca7..f59b8f7 100644 --- a/app/src/main/java/com/example/Cat/activity/activity/ContentFragment.java +++ b/app/src/main/java/com/example/Cat/fragment/ContentFragment.java @@ -1,4 +1,4 @@ -package com.example.Cat.activity.activity; +package com.example.Cat.fragment; import android.os.Bundle; @@ -12,7 +12,7 @@ import android.widget.ImageView; import android.widget.TextView; import com.example.Cat.R; -import com.example.Cat.activity.activity.MainActivity; +import com.example.Cat.activity.GoodsActivity; public class ContentFragment extends Fragment { diff --git a/app/src/main/java/com/example/Cat/activity/activity/TitleFragment.java b/app/src/main/java/com/example/Cat/fragment/TitleFragment.java similarity index 93% rename from app/src/main/java/com/example/Cat/activity/activity/TitleFragment.java rename to app/src/main/java/com/example/Cat/fragment/TitleFragment.java index 73372bb..3aa551d 100644 --- a/app/src/main/java/com/example/Cat/activity/activity/TitleFragment.java +++ b/app/src/main/java/com/example/Cat/fragment/TitleFragment.java @@ -1,4 +1,4 @@ -package com.example.Cat.activity.activity; +package com.example.Cat.fragment; import android.os.Bundle; import androidx.fragment.app.Fragment; @@ -11,6 +11,7 @@ import android.widget.ListView; import android.widget.TextView; import com.example.Cat.R; +import com.example.Cat.activity.GoodsActivity; public class TitleFragment extends Fragment { @@ -42,7 +43,7 @@ public class TitleFragment extends Fragment { @Override public void onItemClick(AdapterView adapterView, View view, int i, long l) { //通过activity实例获取另一个Fragment对象 - com.example.Cat.activity.activity.ContentFragment content=(com.example.Cat.activity.activity.ContentFragment)((GoodsActivity)getActivity()) + ContentFragment content=(ContentFragment)((GoodsActivity)getActivity()) .getSupportFragmentManager().findFragmentById(R.id.setcontent); content.setText(contents[i]); content.imageView.findViewById(R.id.icon11); diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index c0024de..41691b0 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="horizontal" - tools:context=".activity.activity.GoodsActivity"> + tools:context=".activity.GoodsActivity"> diff --git a/app/src/main/res/layout/content_user.xml b/app/src/main/res/layout/content_user.xml index fb9f504..6d2b1b6 100644 --- a/app/src/main/res/layout/content_user.xml +++ b/app/src/main/res/layout/content_user.xml @@ -105,7 +105,6 @@