diff --git a/four/Fruitparty/.gitignore b/four/Fruitparty/.gitignore
deleted file mode 100644
index 603b140..0000000
--- a/four/Fruitparty/.gitignore
+++ /dev/null
@@ -1,14 +0,0 @@
-*.iml
-.gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-.DS_Store
-/build
-/captures
-.externalNativeBuild
-.cxx
diff --git a/four/Fruitparty/.idea/.gitignore b/four/Fruitparty/.idea/.gitignore
deleted file mode 100644
index 26d3352..0000000
--- a/four/Fruitparty/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/four/Fruitparty/.idea/.name b/four/Fruitparty/.idea/.name
deleted file mode 100644
index ecf9eb5..0000000
--- a/four/Fruitparty/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-Fruitparty
\ No newline at end of file
diff --git a/four/Fruitparty/.idea/codeStyles/Project.xml b/four/Fruitparty/.idea/codeStyles/Project.xml
deleted file mode 100644
index 681f41a..0000000
--- a/four/Fruitparty/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- xmlns:android
-
- ^$
-
-
-
-
-
-
-
-
- xmlns:.*
-
- ^$
-
-
- BY_NAME
-
-
-
-
-
-
- .*:id
-
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
-
-
- .*:name
-
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
-
-
- name
-
- ^$
-
-
-
-
-
-
-
-
- style
-
- ^$
-
-
-
-
-
-
-
-
- .*
-
- ^$
-
-
- BY_NAME
-
-
-
-
-
-
- .*
-
- http://schemas.android.com/apk/res/android
-
-
- ANDROID_ATTRIBUTE_ORDER
-
-
-
-
-
-
- .*
-
- .*
-
-
- BY_NAME
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/four/Fruitparty/.idea/compiler.xml b/four/Fruitparty/.idea/compiler.xml
deleted file mode 100644
index fb7f4a8..0000000
--- a/four/Fruitparty/.idea/compiler.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/four/Fruitparty/.idea/gradle.xml b/four/Fruitparty/.idea/gradle.xml
deleted file mode 100644
index 4877ac9..0000000
--- a/four/Fruitparty/.idea/gradle.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/four/Fruitparty/.idea/jarRepositories.xml b/four/Fruitparty/.idea/jarRepositories.xml
deleted file mode 100644
index a5f05cd..0000000
--- a/four/Fruitparty/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/four/Fruitparty/.idea/misc.xml b/four/Fruitparty/.idea/misc.xml
deleted file mode 100644
index 860da66..0000000
--- a/four/Fruitparty/.idea/misc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/four/Fruitparty/app/.gitignore b/four/Fruitparty/app/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/four/Fruitparty/app/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/four/Fruitparty/app/build.gradle b/four/Fruitparty/app/build.gradle
deleted file mode 100644
index 9928ccc..0000000
--- a/four/Fruitparty/app/build.gradle
+++ /dev/null
@@ -1,35 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
- compileSdkVersion 30
- buildToolsVersion "30.0.2"
- defaultConfig {
- applicationId "com.example.Fruitparty"
- minSdkVersion 23
- targetSdkVersion 30
- versionCode 1
- versionName "1.0"
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
- }
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- }
- }
- compileOptions {
- sourceCompatibility = 1.8
- targetCompatibility = 1.8
- }
-
-}
-
-dependencies {
- implementation fileTree(dir: 'libs', include: ['*.jar'])
- implementation 'androidx.appcompat:appcompat:1.0.2'
- implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
- testImplementation 'junit:junit:4.12'
- androidTestImplementation 'androidx.test.ext:junit:1.1.0'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
- implementation 'liji.library.dev:citypickerview:1.1.0'
-}
diff --git a/four/Fruitparty/app/proguard-rules.pro b/four/Fruitparty/app/proguard-rules.pro
deleted file mode 100644
index f1b4245..0000000
--- a/four/Fruitparty/app/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/four/Fruitparty/app/src/androidTest/java/com/example/Fruitparty/ExampleInstrumentedTest.java b/four/Fruitparty/app/src/androidTest/java/com/example/Fruitparty/ExampleInstrumentedTest.java
deleted file mode 100644
index fd3116f..0000000
--- a/four/Fruitparty/app/src/androidTest/java/com/example/Fruitparty/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.example.Fruitparty;
-
-import android.content.Context;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see Testing documentation
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
- @Test
- public void useAppContext() {
- // Context of the app under test.
- Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-
- assertEquals("com.example.orangesale_05", appContext.getPackageName());
- }
-}
diff --git a/four/Fruitparty/app/src/main/AndroidManifest.xml b/four/Fruitparty/app/src/main/AndroidManifest.xml
deleted file mode 100644
index 83a3908..0000000
--- a/four/Fruitparty/app/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/four/Fruitparty/app/src/main/java/com/example/Fruitparty/MainActivity.java b/four/Fruitparty/app/src/main/java/com/example/Fruitparty/MainActivity.java
deleted file mode 100644
index bd767c7..0000000
--- a/four/Fruitparty/app/src/main/java/com/example/Fruitparty/MainActivity.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.example.Fruitparty;
-
-import android.content.Intent;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.Toast;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import com.example.Fruitparty.activity.IndexActivity;
-import com.example.Fruitparty.activity.RegisterActivity;
-import com.example.Fruitparty.dataoperation.OrangeDatabase;
-
-public class MainActivity extends AppCompatActivity implements View.OnClickListener {
- private Button registerButton, loginButton;
- private EditText usernameText, paswdEdit;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.user_login);
-
- init();
- }
-
- @Override
- public void onClick(View v) {
- switch (v.getId()) {
- case R.id.register:
- Intent intent = new Intent(MainActivity.this, RegisterActivity.class);
- startActivity(intent);
- break;
- case R.id.login:
- //注册时，我们引入了数据库，登录这里可以通过数据库进行验证，验证跳转到首页，不通过进行提示
- if (validateLogin()) {
- Intent intent1 = new Intent(MainActivity.this, IndexActivity.class);
- Bundle bundle = new Bundle();
- OrangeDatabase orangeDatabase = new OrangeDatabase(MainActivity.this);
- bundle.putString("username", usernameText.getText().toString());
- bundle = orangeDatabase.queryUserInfo(orangeDatabase.getReadableDatabase(), bundle);
- intent1.putExtras(bundle);
- startActivity(intent1);
- } else {
- Toast.makeText(MainActivity.this, "账号或者密码错误", Toast.LENGTH_SHORT).show();
- }
- break;
- }
- }
-
- //界面组件初始化
- private void init() {
- usernameText = findViewById(R.id.username);
- paswdEdit = findViewById(R.id.password);
- loginButton = findViewById(R.id.login);
- loginButton.setOnClickListener(this);
- registerButton = findViewById(R.id.register);
- registerButton.setOnClickListener(this);
- }
-
- /**
- * 登录验证
- *
- * @return
- */
- private boolean validateLogin() {
- String username = usernameText.getText().toString();
- String password = paswdEdit.getText().toString();
- OrangeDatabase orangeDatabase = new OrangeDatabase(MainActivity.this);
- SQLiteDatabase sqLiteDatabase = orangeDatabase.getReadableDatabase();
- Cursor cursor = sqLiteDatabase.rawQuery("select * from orange_user where username=? and password=?", new String[]{username, password});
- if (cursor.getCount() > 0) {
- return true;
- }
- return false;
- }
-}
diff --git a/four/Fruitparty/app/src/main/java/com/example/Fruitparty/activity/CategoryActivity.java b/four/Fruitparty/app/src/main/java/com/example/Fruitparty/activity/CategoryActivity.java
deleted file mode 100644
index b594754..0000000
--- a/four/Fruitparty/app/src/main/java/com/example/Fruitparty/activity/CategoryActivity.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.example.Fruitparty.activity;
-
-import android.app.Activity;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
-import android.os.Bundle;
-import android.widget.ListView;
-
-import androidx.annotation.Nullable;
-
-import com.example.Fruitparty.R;
-import com.example.Fruitparty.adapter.Adapter;
-import com.example.Fruitparty.entity.Product;
-import com.example.Fruitparty.fragment.SetDetailFragment;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-
-
-public class CategoryActivity extends Activity {
- public OnChangeListener onchangedListener;
- private List productList;
- private List productCategory = new ArrayList<>();
- private ListView titleList;
- private Adapter adapter;
-
- @Override
- public void onCreate(@Nullable Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.content_category);
- initData();
- init();
- SetDetailFragment fragment = new SetDetailFragment();
- FragmentManager fragmentManager = getFragmentManager();
- FragmentTransaction transaction = fragmentManager.beginTransaction();
- transaction.replace(R.id.category_detail, fragment);
- transaction.commit();
- titleList.setOnItemClickListener((parent, view, position, id) -> {
- adapter.setSelectedPosition(position);
- adapter.notifyDataSetInvalidated();
- if (onchangedListener != null) {
- onchangedListener.changeText(productList.get(position));
- }
- });
-
- }
-
- public void setOnChangeListener(OnChangeListener onChangeListener) {
- this.onchangedListener = onChangeListener;
- }
-
- public interface OnChangeListener {
- void changeText(Product product);
- }
-
- /**
- * 初始化数据
- */
- private void initData() {
- productList = new ArrayList<>();
- productCategory.add("橘子");
- productCategory.add("橙子");
- productCategory.add("柚子");
- Product product = new Product();
- product.setImageUrlId(R.drawable.arrow_down);
- product.setProductName("橘子");
- product.setProductPrice(new BigDecimal("9.9"));
- Product product1 = new Product();
- product1.setImageUrlId(R.drawable.orange);
- product1.setProductName("橙子");
- product1.setProductPrice(new BigDecimal("29.9"));
- Product product2 = new Product();
- product2.setImageUrlId(R.drawable.arrow_left);
- product2.setProductName("柚子");
- product2.setProductPrice(new BigDecimal("19.9"));
- productList.add(product);
- productList.add(product1);
- productList.add(product2);
- }
-
- /**
- * 初始化组件
- */
- private void init() {
- titleList = findViewById(R.id.category_title_list);
- adapter = new Adapter(productCategory, CategoryActivity.this);
- titleList.setAdapter(adapter);
- }
-}
\ No newline at end of file
diff --git a/four/Fruitparty/app/src/main/java/com/example/Fruitparty/activity/IndexActivity.java b/four/Fruitparty/app/src/main/java/com/example/Fruitparty/activity/IndexActivity.java
deleted file mode 100644
index ece6e7d..0000000
--- a/four/Fruitparty/app/src/main/java/com/example/Fruitparty/activity/IndexActivity.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.example.Fruitparty.activity;
-
-import android.app.Activity;
-import android.app.FragmentTransaction;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.LinearLayout;
-
-import androidx.annotation.Nullable;
-
-import com.example.Fruitparty.R;
-import com.example.Fruitparty.fragment.IndexFragment;
-import com.example.Fruitparty.fragment.PearsonFragment;
-import com.example.Fruitparty.fragment.ProductFragment;
-import com.example.Fruitparty.fragment.ShoppingCartFragment;
-
-public class IndexActivity extends Activity implements View.OnClickListener {
- private IndexFragment indexFragment;
- private ProductFragment productFragment;
- private ShoppingCartFragment shoppingCartFragment;
- private PearsonFragment pearsonFragment;
- private LinearLayout indexLine, productLine, shoppingCartLine, pearsonLine;
-
- @Override
- public void onCreate(@Nullable Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_main);
- init();
- initIndexFragment();
- }
-
- /**
- * 组件初始化
- */
- private void init() {
- indexLine = findViewById(R.id.content_index);
- indexLine.setOnClickListener(this);
- productLine = findViewById(R.id.content_product);
- productLine.setOnClickListener(this);
- shoppingCartLine = findViewById(R.id.content_cart);
- shoppingCartLine.setOnClickListener(this);
- pearsonLine = findViewById(R.id.content_pearson);
- pearsonLine.setOnClickListener(this);
- }
-
- @Override
- public void onClick(View v) {
- switch (v.getId()) {
- case R.id.content_index:
- initIndexFragment();
- break;
- case R.id.content_product:
- initproductFragment();
- break;
- case R.id.content_cart:
- initshoppingCartFragment();
- break;
- case R.id.content_pearson:
- initpearsonFragment();
- break;
- }
- }
-
- /**
- * 初始化首页Fragment
- */
- private void initIndexFragment() {
- //开启事务，fragment的控制是由事务来实现的
- FragmentTransaction transaction = getFragmentManager().beginTransaction();
- if (indexFragment == null) {
- indexFragment = new IndexFragment();
- }
- transaction.replace(R.id.main_content, indexFragment);
- transaction.commit();
- }
-
- /**
- * 初始化产品Fragment
- */
- private void initproductFragment() {
- //开启事务，fragment的控制是由事务来实现的
- FragmentTransaction transaction = getFragmentManager().beginTransaction();
- if (productFragment == null) {
- productFragment = new ProductFragment();
- }
- transaction.replace(R.id.main_content, productFragment);
- transaction.commit();
- }
-
- /**
- * 初始化购物车Fragment
- */
- private void initshoppingCartFragment() {
- //开启事务，fragment的控制是由事务来实现的
- FragmentTransaction transaction = getFragmentManager().beginTransaction();
- if (shoppingCartFragment == null) {
- shoppingCartFragment = new ShoppingCartFragment();
- }
- transaction.replace(R.id.main_content, shoppingCartFragment);
- transaction.commit();
- }
-
- /**
- * 初始化个人Fragment
- */
- private void initpearsonFragment() {
- //开启事务，fragment的控制是由事务来实现的
- FragmentTransaction transaction = getFragmentManager().beginTransaction();
- if (pearsonFragment == null) {
- Intent intent = IndexActivity.this.getIntent();
- Bundle bundle = intent.getExtras();
- pearsonFragment = new PearsonFragment();
- pearsonFragment.setArguments(bundle);
- }
- transaction.replace(R.id.main_content, pearsonFragment);
- transaction.commit();
- }
-
-}
diff --git a/four/Fruitparty/app/src/main/java/com/example/Fruitparty/activity/RegisterActivity.java b/four/Fruitparty/app/src/main/java/com/example/Fruitparty/activity/RegisterActivity.java
deleted file mode 100644
index 28c0a78..0000000
--- a/four/Fruitparty/app/src/main/java/com/example/Fruitparty/activity/RegisterActivity.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package com.example.Fruitparty.activity;
-
-import android.content.ContentValues;
-import android.content.Intent;
-import android.database.sqlite.SQLiteDatabase;
-import android.graphics.Color;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.RadioGroup;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-
-import com.lljjcoder.citypickerview.widget.CityPicker;
-import com.example.Fruitparty.R;
-import com.example.Fruitparty.dataoperation.OrangeDatabase;
-
-public class RegisterActivity extends AppCompatActivity implements View.OnClickListener, RadioGroup.OnCheckedChangeListener {
- private EditText usernameEdit, passwordEdit, surePasswordEdit;
- private TextView cityText;
- private CityPicker cityPicker;
- private Button regButton;
- private RadioGroup sexGroup;
- private String sexStr = "男";
-
-
- @Override
- protected void onCreate(@Nullable Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.user_register);
- init();
- }
-
- /**
- * 界面组件初始化
- */
- private void init() {
- cityText = findViewById(R.id.reg_province);
- cityText.setOnClickListener(this);
- usernameEdit = findViewById(R.id.reg_username);
- passwordEdit = findViewById(R.id.reg_password);
- surePasswordEdit = findViewById(R.id.reg_sure_password);
- regButton = findViewById(R.id.reg_register);
- regButton.setOnClickListener(this);
- sexGroup = findViewById(R.id.sex);
- sexGroup.setOnCheckedChangeListener(this);
-
- }
-
- @Override
- public void onClick(View v) {
- switch (v.getId()) {
- case R.id.reg_province:
- initCityPicker();
- cityPicker.show();
- break;
- case R.id.reg_register:
- //注册验证方法
- validateRegister();
- break;
-
- }
- }
-
- /**
- * 初始化城市选择器
- */
- public void initCityPicker() {
- cityPicker = new CityPicker.Builder(RegisterActivity.this)
- .textSize(16)
- .title("地址选择")
- .backgroundPop(0xa0000000)
- .titleBackgroundColor("#EFB81C")
- .titleTextColor("#000000")
- .backgroundPop(0xa0000000)
- .confirTextColor("#000000")
- .cancelTextColor("#000000")
- .province("江西省")
- .city("赣州市")
- .district("章贡区")
- .textColor(Color.parseColor("#000000"))
- .provinceCyclic(true)
- .cityCyclic(false)
- .districtCyclic(false)
- .visibleItemsCount(7)
- .itemPadding(10)
- .onlyShowProvinceAndCity(false)
- .build();
- cityPicker.setOnCityItemClickListener(new CityPicker.OnCityItemClickListener() {
- @Override
- public void onSelected(String... strings) {
- String province = strings[0];
- String city = strings[1];
- String district = strings[2];
- cityText.setText(String.format("%s %s %s", province, city, district));
- }
-
- @Override
- public void onCancel() {
- }
- });
-
- }
-
- /**
- * 注册验证
- */
- public void validateRegister() {
- String username = usernameEdit.getText().toString();
- String password = passwordEdit.getText().toString();
- String surePassword = surePasswordEdit.getText().toString();
- String city = cityText.getText().toString();
- //判断两次密码是否输入一致
- if (password.equals(surePassword)) {
- //这里也可以再进行其它的验证，如是否符合要求等，符合就进行插入数据库操作
- if (!username.equals("") || !password.equals("")) {
- if (!city.equals("")) {
- Bundle bundle = new Bundle();
- bundle.putString("username", username);
- bundle.putString("password", password);
- bundle.putString("sex", sexStr);
- bundle.putString("city", city);
- //本节将使用安卓自身带的SQLite数据库的方式存储注册的信息（之前直接传输显示在界面是的方式）
- OrangeDatabase orangeDatabase = new OrangeDatabase(RegisterActivity.this);
- SQLiteDatabase sqLiteDatabase = orangeDatabase.getWritableDatabase();
- insertData(sqLiteDatabase, bundle);
- Intent intent = new Intent(RegisterActivity.this, IndexActivity.class);
- intent.putExtras(bundle);
- startActivity(intent);
- } else {
- Toast.makeText(RegisterActivity.this, "请选择地址", Toast.LENGTH_SHORT).show();
- }
- } else {
- Toast.makeText(RegisterActivity.this, "账号或密码未填写", Toast.LENGTH_SHORT).show();
- }
- } else {
- Toast.makeText(RegisterActivity.this, "两次密码输入不一致", Toast.LENGTH_SHORT).show();
- }
-
-
- }
-
- @Override
- public void onCheckedChanged(RadioGroup group, int checkedId) {
- //根据用户选择来改变sex的值
- sexStr = checkedId == R.id.reg_man ? "男" : "女";
- }
-
- /**
- * 插入数据库的值
- *
- * @param sqLiteDatabase
- * @param bundle
- */
- private void insertData(SQLiteDatabase sqLiteDatabase, Bundle bundle) {
- ContentValues contentValues = new ContentValues();
- contentValues.put("username", bundle.getString("username"));
- contentValues.put("password", bundle.getString("password"));
- contentValues.put("sex", bundle.getString("sex"));
- contentValues.put("city", bundle.getString("city"));
- sqLiteDatabase.insert("orange_user", null, contentValues);
- sqLiteDatabase.close();
- }
-}
diff --git a/four/Fruitparty/app/src/main/java/com/example/Fruitparty/activity/UserActivity.java b/four/Fruitparty/app/src/main/java/com/example/Fruitparty/activity/UserActivity.java
deleted file mode 100644
index 3d9cca6..0000000
--- a/four/Fruitparty/app/src/main/java/com/example/Fruitparty/activity/UserActivity.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.example.Fruitparty.activity;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import androidx.annotation.Nullable;
-
-import com.example.Fruitparty.R;
-
-public class UserActivity extends Activity implements View.OnClickListener {
- private ImageView userIconImage;
- private TextView usernameText, userSexText, userCityText;
- private LinearLayout usernameLine, userSexline, userCityLine, userPayLine, userSettingLine, userGeneralLine, userSearchProductLine;
-
- @Override
- protected void onCreate(@Nullable Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.content_user);
- init();
- }
-
- /**
- * 组件初始化
- */
- private void init() {
- userIconImage = findViewById(R.id.user_icon);
- usernameText = findViewById(R.id.user_username);
- userSexText = findViewById(R.id.user_sex);
- userCityText = findViewById(R.id.user_city);
- usernameLine = findViewById(R.id.user_username_line);
- userSexline = findViewById(R.id.user_sex_line);
- userCityLine = findViewById(R.id.user_city_line);
- userPayLine = findViewById(R.id.user_pay);
- userSettingLine = findViewById(R.id.user_setting);
- userGeneralLine = findViewById(R.id.user_general);
- userSearchProductLine = findViewById(R.id.user_searchProduct);
- userSearchProductLine.setOnClickListener(this);
- setData();
- }
-
- /**
- * 组件赋值
- */
- private void setData() {
- Intent intent = UserActivity.this.getIntent();
- Bundle bundle = intent.getExtras();
- usernameText.setText(String.format("用户名：%s", bundle.getString("username")));
- userSexText.setText(String.format("性别：%s", bundle.getString("sex")));
- userCityText.setText(String.format("城市：%s", bundle.getString("city")));
- }
-
- @Override
- public void onClick(View v) {
- switch (v.getId()) {
- case R.id.user_searchProduct:
- Intent intent1 = new Intent(UserActivity.this, CategoryActivity.class);
- startActivity(intent1);
- break;
- }
- }
-}
diff --git a/four/Fruitparty/app/src/main/java/com/example/Fruitparty/adapter/Adapter.java b/four/Fruitparty/app/src/main/java/com/example/Fruitparty/adapter/Adapter.java
deleted file mode 100644
index 0611dae..0000000
--- a/four/Fruitparty/app/src/main/java/com/example/Fruitparty/adapter/Adapter.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.example.Fruitparty.adapter;
-
-import android.content.Context;
-import android.graphics.Color;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-import com.example.Fruitparty.R;
-
-import java.util.List;
-
-public class Adapter extends BaseAdapter {
- private List productCategory;
- private LayoutInflater layoutInflater;
- private int selectionPosition = -1;
-
- public Adapter(List productCategory, Context context) {
- this.productCategory = productCategory;
- this.layoutInflater = LayoutInflater.from(context);
- }
-
- @Override
- public int getCount() {
- return productCategory.size();
- }
-
- @Override
- public Object getItem(int position) {
- return productCategory.get(position);
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- ViewHolder viewHolder = null;
- if (convertView == null) {
- viewHolder = new ViewHolder();
- convertView = layoutInflater.inflate(R.layout.category_list_item, null);
- Log.i("adapts", "getView: " + convertView);
- viewHolder.tv = convertView.findViewById(R.id.categor_titles);
- convertView.setTag(viewHolder);
- } else {
- viewHolder = (ViewHolder) convertView.getTag();
- }
- viewHolder.tv.setText(productCategory.get(position));
- if (selectionPosition == position) {
- viewHolder.tv.setBackgroundColor(Color.YELLOW);
- } else {
- viewHolder.tv.setBackgroundColor(Color.WHITE);
- }
- return convertView;
- }
-
- public void setSelectedPosition(int position) {
- this.selectionPosition = position;
- }
-
- class ViewHolder {
- TextView tv;
- }
-}
diff --git a/four/Fruitparty/app/src/main/java/com/example/Fruitparty/adapter/ProductAdapter.java b/four/Fruitparty/app/src/main/java/com/example/Fruitparty/adapter/ProductAdapter.java
deleted file mode 100644
index d15c5ea..0000000
--- a/four/Fruitparty/app/src/main/java/com/example/Fruitparty/adapter/ProductAdapter.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.example.Fruitparty.adapter;
-
-import android.content.Context;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.example.Fruitparty.R;
-import com.example.Fruitparty.entity.Product;
-
-import java.util.List;
-
-public class ProductAdapter extends BaseAdapter {
- private List productList;
- private LayoutInflater layoutInflater;
-
- public ProductAdapter(Context context, List productList) {
- this.productList = productList;
- this.layoutInflater = LayoutInflater.from(context);
- }
-
- @Override
- public int getCount() {
- return productList.size();
- }
-
- @Override
- public Object getItem(int position) {
- return productList.get(position);
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- ViewHolder viewHolder;
- if (convertView == null) {
- convertView = layoutInflater.inflate(R.layout.categoty_detail_content, null);
- viewHolder = new ViewHolder();
- viewHolder.productImage = convertView.findViewById(R.id.category_product_image);
- viewHolder.productName = convertView.findViewById(R.id.category_product_name);
- viewHolder.productPrice = convertView.findViewById(R.id.category_product_price);
- convertView.setTag(viewHolder);
- } else {
- viewHolder = (ViewHolder) convertView.getTag();
- }
- Product product = productList.get(position);
- Log.i("product", "getView: "+product.toString());
- if (product != null) {
- viewHolder.productImage.setBackgroundResource(product.getImageUrlId());
- viewHolder.productName.setText(product.getProductName());
- viewHolder.productPrice.setText(String.valueOf(product.getProductPrice()));
- }
- return convertView;
- }
-
- class ViewHolder {
- ImageView productImage;
- TextView productName, productPrice;
- }
-}
diff --git a/four/Fruitparty/app/src/main/java/com/example/Fruitparty/dataoperation/OrangeDatabase.java b/four/Fruitparty/app/src/main/java/com/example/Fruitparty/dataoperation/OrangeDatabase.java
deleted file mode 100644
index 730d14b..0000000
--- a/four/Fruitparty/app/src/main/java/com/example/Fruitparty/dataoperation/OrangeDatabase.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.example.Fruitparty.dataoperation;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-import android.os.Bundle;
-
-import androidx.annotation.Nullable;
-
-public class OrangeDatabase extends SQLiteOpenHelper {
- public OrangeDatabase(@Nullable Context context) {
- super(context, "orange.db3", null, 1);
- }
-
- @Override
- public void onCreate(SQLiteDatabase db) {
- //创建用户表
- String sql = "create table orange_user(id integer primary key autoincrement, username varchar(50), password varchar(50),sex varchar(10),city carchar(50))";
- db.execSQL(sql);
- }
-
- @Override
- public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-
- }
-
- /**
- * 插入数据
- *
- * @param sqLiteDatabase
- * @param username
- * @param password
- * @param sex
- * @param city
- */
- public void insertUser(SQLiteDatabase sqLiteDatabase, String username, String password, String sex, String city) {
- ContentValues contentValues = new ContentValues();
- contentValues.put("username", username);
- contentValues.put("password", password);
- contentValues.put("sex", sex);
- contentValues.put("city", city);
- sqLiteDatabase.insert("orange_user", null, contentValues);
- sqLiteDatabase.close();
- }
-
- /**
- * 查询数据
- *
- * @param sqLiteDatabase
- * @param bundle
- * @return
- */
- public Bundle queryUserInfo(SQLiteDatabase sqLiteDatabase, Bundle bundle) {
- String username = bundle.getString("username");
- Cursor cursor = sqLiteDatabase.rawQuery("select * from orange_user where username=?", new String[]{username});
- if (cursor != null) {
- while (cursor.moveToNext()) {
- bundle.putString("sex", cursor.getString(3));
- bundle.putString("city", cursor.getString(4));
- }
- }
- cursor.close();
- sqLiteDatabase.close();
- return bundle;
- }
-}
diff --git a/four/Fruitparty/app/src/main/java/com/example/Fruitparty/entity/OrangeUser.java b/four/Fruitparty/app/src/main/java/com/example/Fruitparty/entity/OrangeUser.java
deleted file mode 100644
index 7472940..0000000
--- a/four/Fruitparty/app/src/main/java/com/example/Fruitparty/entity/OrangeUser.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.example.Fruitparty.entity;
-
-public class OrangeUser {
- private Integer id;
- private String username;
- private String password;
- private String sex;
- private String city;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getUsername() {
- return username;
- }
-
- public void setUsername(String username) {
- this.username = username;
- }
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-
- public String getSex() {
- return sex;
- }
-
- public void setSex(String sex) {
- this.sex = sex;
- }
-
- public String getCity() {
- return city;
- }
-
- public void setCity(String city) {
- this.city = city;
- }
-
- @Override
- public String toString() {
- return "OrangeUser{" +
- "username='" + username + '\'' +
- ", password='" + password + '\'' +
- ", sex='" + sex + '\'' +
- ", city='" + city + '\'' +
- '}';
- }
-}
diff --git a/four/Fruitparty/app/src/main/java/com/example/Fruitparty/entity/Product.java b/four/Fruitparty/app/src/main/java/com/example/Fruitparty/entity/Product.java
deleted file mode 100644
index d1fed2e..0000000
--- a/four/Fruitparty/app/src/main/java/com/example/Fruitparty/entity/Product.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.example.Fruitparty.entity;
-
-import java.math.BigDecimal;
-
-public class Product {
-
- public String getProductName() {
- return productName;
- }
-
- public void setProductName(String productName) {
- this.productName = productName;
- }
-
- public BigDecimal getProductPrice() {
- return productPrice;
- }
-
- public void setProductPrice(BigDecimal productPrice) {
- this.productPrice = productPrice;
- }
-
- public Integer getImageUrlId() {
- return imageUrlId;
- }
-
- public void setImageUrlId(Integer imageUrlId) {
- this.imageUrlId = imageUrlId;
- }
-
- private Integer imageUrlId;
- private String productName;
- private BigDecimal productPrice;
-
- @Override
- public String toString() {
- return "Product{" +
- "imageUrlId=" + imageUrlId +
- ", productName='" + productName + '\'' +
- ", productPrice=" + productPrice +
- '}';
- }
-}
diff --git a/four/Fruitparty/app/src/main/java/com/example/Fruitparty/fragment/IndexFragment.java b/four/Fruitparty/app/src/main/java/com/example/Fruitparty/fragment/IndexFragment.java
deleted file mode 100644
index d499031..0000000
--- a/four/Fruitparty/app/src/main/java/com/example/Fruitparty/fragment/IndexFragment.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.example.Fruitparty.fragment;
-
-import android.app.Fragment;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.GridView;
-import android.widget.LinearLayout;
-import android.widget.SearchView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.example.Fruitparty.R;
-import com.example.Fruitparty.adapter.ProductAdapter;
-import com.example.Fruitparty.entity.Product;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-
-public class IndexFragment extends Fragment implements View.OnClickListener {
- private SearchView searchView;
- private LinearLayout orangeLine, youziLine, juziLine, xiguaLine, liLine, appleLine, lemonLine, mangguoLine;
- private GridView gridView;
- private List productList;
- private ProductAdapter productAdapter;
-
- @Nullable
- @Override
- public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
- View view = LayoutInflater.from(getActivity()).inflate(R.layout.content_index, container, false);
- init(view);
- return view;
- }
-
- /**
- * 初始化组件
- */
- private void init(View view) {
- searchView = view.findViewById(R.id.searchView);
- searchView.setOnClickListener(this);
- orangeLine = view.findViewById(R.id.chengzi);
- orangeLine.setOnClickListener(this);
- youziLine = view.findViewById(R.id.youzi);
- youziLine.setOnClickListener(this);
- juziLine = view.findViewById(R.id.juzi);
- juziLine.setOnClickListener(this);
- xiguaLine = view.findViewById(R.id.xigua);
- xiguaLine.setOnClickListener(this);
- liLine = view.findViewById(R.id.li);
- liLine.setOnClickListener(this);
- lemonLine = view.findViewById(R.id.lemon);
- lemonLine.setOnClickListener(this);
- mangguoLine = view.findViewById(R.id.mangguo);
- mangguoLine.setOnClickListener(this);
- appleLine = view.findViewById(R.id.apple);
- appleLine.setOnClickListener(this);
- gridView = view.findViewById(R.id.index_famous_gridview);
- initData();
- productAdapter = new ProductAdapter(getActivity(), productList);
- gridView.setAdapter(productAdapter);
- }
-
-
- @Override
- public void onClick(View v) {
-
- }
-
- /**
- * 初始化商品数据
- */
- private void initData() {
- productList = new ArrayList<>();
- Product product = new Product();
- product.setImageUrlId(R.drawable.juzip);
- product.setProductName("橘子");
- product.setProductPrice(new BigDecimal("9.9"));
- Product product1 = new Product();
- product1.setImageUrlId(R.drawable.orange);
- product1.setProductName("橙子");
- product1.setProductPrice(new BigDecimal("29.9"));
- Product product2 = new Product();
- product2.setImageUrlId(R.drawable.youzip);
- product2.setProductName("柚子");
- product2.setProductPrice(new BigDecimal("19.9"));
- Product product3 = new Product();
- product3.setImageUrlId(R.drawable.xiguap);
- product3.setProductName("西瓜");
- product3.setProductPrice(new BigDecimal("19.9"));
- Product product4 = new Product();
- product4.setImageUrlId(R.drawable.applep);
- product4.setProductName("苹果");
- product4.setProductPrice(new BigDecimal("49.9"));
- Product product5 = new Product();
- product5.setImageUrlId(R.drawable.lemonp);
- product5.setProductName("柠檬");
- product5.setProductPrice(new BigDecimal("9.9"));
- productList.add(product);
- productList.add(product1);
- productList.add(product2);
- productList.add(product3);
- productList.add(product4);
- productList.add(product5);
-
- }
-}
diff --git a/four/Fruitparty/app/src/main/java/com/example/Fruitparty/fragment/PearsonFragment.java b/four/Fruitparty/app/src/main/java/com/example/Fruitparty/fragment/PearsonFragment.java
deleted file mode 100644
index c61c705..0000000
--- a/four/Fruitparty/app/src/main/java/com/example/Fruitparty/fragment/PearsonFragment.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.example.Fruitparty.fragment;
-
-import android.app.Fragment;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.example.Fruitparty.R;
-
-public class PearsonFragment extends Fragment implements View.OnClickListener {
- private ImageView userIconImage;
- private TextView usernameText, userSexText, userCityText;
- private LinearLayout usernameLine, userSexline, userCityLine, userPayLine, userSettingLine, userGeneralLine;
-
-
- @Nullable
- @Override
- public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
- View view = LayoutInflater.from(getActivity()).inflate(R.layout.content_user, container, false);
- init(view);
- return view;
- }
-
- /**
- * 组件初始化
- */
- private void init(View view) {
- userIconImage = view.findViewById(R.id.user_icon);
- usernameText = view.findViewById(R.id.user_username);
- userSexText = view.findViewById(R.id.user_sex);
- userCityText = view.findViewById(R.id.user_city);
- usernameLine = view.findViewById(R.id.user_username_line);
- userSexline = view.findViewById(R.id.user_sex_line);
- userCityLine = view.findViewById(R.id.user_city_line);
- userPayLine = view.findViewById(R.id.user_pay);
- userSettingLine = view.findViewById(R.id.user_setting);
- userGeneralLine = view.findViewById(R.id.user_general);
- setData();
- }
-
- /**
- * 组件赋值
- */
- private void setData() {
- Bundle bundle = getArguments();
- usernameText.setText(String.format("用户名：%s", bundle.getString("username")));
- userSexText.setText(String.format("性别：%s", bundle.getString("sex")));
- userCityText.setText(String.format("城市：%s", bundle.getString("city")));
- }
-
- @Override
- public void onClick(View v) {
-
- }
-
-
-}
diff --git a/four/Fruitparty/app/src/main/java/com/example/Fruitparty/fragment/ProductFragment.java b/four/Fruitparty/app/src/main/java/com/example/Fruitparty/fragment/ProductFragment.java
deleted file mode 100644
index 4fbef6e..0000000
--- a/four/Fruitparty/app/src/main/java/com/example/Fruitparty/fragment/ProductFragment.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.example.Fruitparty.fragment;
-
-import android.app.Fragment;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.example.Fruitparty.R;
-
-public class ProductFragment extends Fragment {
- @Nullable
- @Override
- public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
- View view = LayoutInflater.from(getActivity()).inflate(R.layout.content_product, container, false);
- return view;
- }
-}
diff --git a/four/Fruitparty/app/src/main/java/com/example/Fruitparty/fragment/SetDetailFragment.java b/four/Fruitparty/app/src/main/java/com/example/Fruitparty/fragment/SetDetailFragment.java
deleted file mode 100644
index 6485cc9..0000000
--- a/four/Fruitparty/app/src/main/java/com/example/Fruitparty/fragment/SetDetailFragment.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.example.Fruitparty.fragment;
-
-import android.annotation.SuppressLint;
-import android.app.Fragment;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.example.Fruitparty.R;
-import com.example.Fruitparty.activity.CategoryActivity;
-
-import java.util.Objects;
-
-public class SetDetailFragment extends Fragment {
- private View view;
- private ImageView imageView;
- private TextView nameText, priceText;
-
- @SuppressLint("SetTextI18n")
- @Nullable
- @Override
- public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
- view = inflater.inflate(R.layout.categoty_detail_content, container, false);
- if (view != null) {
- init();
- }
- CategoryActivity categoryActivity = (CategoryActivity) getActivity();
- Objects.requireNonNull(categoryActivity).setOnChangeListener(product -> {
- Log.i("sss", "onCreateView: " + product.getProductName());
- imageView.setBackgroundResource(product.getImageUrlId());
- nameText.setText(product.getProductName());
- priceText.setText(product.getProductPrice().toString());
- });
- return view;
- }
-
- /**
- * 内容组件初始化
- */
- private void init() {
- imageView = view.findViewById(R.id.category_product_image);
- nameText = view.findViewById(R.id.category_product_name);
- priceText = view.findViewById(R.id.category_product_price);
- }
-
-}
diff --git a/four/Fruitparty/app/src/main/java/com/example/Fruitparty/fragment/ShoppingCartFragment.java b/four/Fruitparty/app/src/main/java/com/example/Fruitparty/fragment/ShoppingCartFragment.java
deleted file mode 100644
index 03d2a40..0000000
--- a/four/Fruitparty/app/src/main/java/com/example/Fruitparty/fragment/ShoppingCartFragment.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.example.Fruitparty.fragment;
-
-import android.app.Fragment;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.example.Fruitparty.R;
-
-public class ShoppingCartFragment extends Fragment {
- @Nullable
- @Override
- public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
- View view = LayoutInflater.from(getActivity()).inflate(R.layout.content_shopping, container, false);
- return view;
- }
-}
diff --git a/four/Fruitparty/app/src/main/res/drawable-v24/address.png b/four/Fruitparty/app/src/main/res/drawable-v24/address.png
deleted file mode 100644
index 7318be0..0000000
Binary files a/four/Fruitparty/app/src/main/res/drawable-v24/address.png and /dev/null differ
diff --git a/four/Fruitparty/app/src/main/res/drawable-v24/apple.png b/four/Fruitparty/app/src/main/res/drawable-v24/apple.png
deleted file mode 100644
index 0810381..0000000
Binary files a/four/Fruitparty/app/src/main/res/drawable-v24/apple.png and /dev/null differ
diff --git a/four/Fruitparty/app/src/main/res/drawable-v24/applep.png b/four/Fruitparty/app/src/main/res/drawable-v24/applep.png
deleted file mode 100644
index e26da47..0000000
Binary files a/four/Fruitparty/app/src/main/res/drawable-v24/applep.png and /dev/null differ
diff --git a/four/Fruitparty/app/src/main/res/drawable-v24/arrow_down.png b/four/Fruitparty/app/src/main/res/drawable-v24/arrow_down.png
deleted file mode 100644
index 6d95bb5..0000000
Binary files a/four/Fruitparty/app/src/main/res/drawable-v24/arrow_down.png and /dev/null differ
diff --git a/four/Fruitparty/app/src/main/res/drawable-v24/arrow_left.png b/four/Fruitparty/app/src/main/res/drawable-v24/arrow_left.png
deleted file mode 100644
index 365afe0..0000000
Binary files a/four/Fruitparty/app/src/main/res/drawable-v24/arrow_left.png and /dev/null differ
diff --git a/four/Fruitparty/app/src/main/res/drawable-v24/arrow_right.png b/four/Fruitparty/app/src/main/res/drawable-v24/arrow_right.png
deleted file mode 100644
index 84ded85..0000000
Binary files a/four/Fruitparty/app/src/main/res/drawable-v24/arrow_right.png and /dev/null differ
diff --git a/four/Fruitparty/app/src/main/res/drawable-v24/button_login.xml b/four/Fruitparty/app/src/main/res/drawable-v24/button_login.xml
deleted file mode 100644
index d093f1b..0000000
--- a/four/Fruitparty/app/src/main/res/drawable-v24/button_login.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- -
-
-
-
-
-
- -
-
-
-
-
-
-
\ No newline at end of file
diff --git a/four/Fruitparty/app/src/main/res/drawable-v24/button_register.xml b/four/Fruitparty/app/src/main/res/drawable-v24/button_register.xml
deleted file mode 100644
index 6fe9392..0000000
--- a/four/Fruitparty/app/src/main/res/drawable-v24/button_register.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- -
-
-
-
-
- -
-
-
-
-
-
-
\ No newline at end of file
diff --git a/four/Fruitparty/app/src/main/res/drawable-v24/chengzi.png b/four/Fruitparty/app/src/main/res/drawable-v24/chengzi.png
deleted file mode 100644
index fff0306..0000000
Binary files a/four/Fruitparty/app/src/main/res/drawable-v24/chengzi.png and /dev/null differ
diff --git a/four/Fruitparty/app/src/main/res/drawable-v24/city.png b/four/Fruitparty/app/src/main/res/drawable-v24/city.png
deleted file mode 100644
index 790fb2b..0000000
Binary files a/four/Fruitparty/app/src/main/res/drawable-v24/city.png and /dev/null differ
diff --git a/four/Fruitparty/app/src/main/res/drawable-v24/ic_launcher_background.xml b/four/Fruitparty/app/src/main/res/drawable-v24/ic_launcher_background.xml
deleted file mode 100644
index 0d025f9..0000000
--- a/four/Fruitparty/app/src/main/res/drawable-v24/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/four/Fruitparty/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/four/Fruitparty/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
deleted file mode 100644
index 1f6bb29..0000000
--- a/four/Fruitparty/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
- -
-
-
-
-
-
- -
-
-
-
-
-
-
\ No newline at end of file
diff --git a/four/Fruitparty/app/src/main/res/drawable-v24/juzi.png b/four/Fruitparty/app/src/main/res/drawable-v24/juzi.png
deleted file mode 100644
index 106df92..0000000
Binary files a/four/Fruitparty/app/src/main/res/drawable-v24/juzi.png and /dev/null differ
diff --git a/four/Fruitparty/app/src/main/res/drawable-v24/juzip.png b/four/Fruitparty/app/src/main/res/drawable-v24/juzip.png
deleted file mode 100644
index 4f10b72..0000000
Binary files a/four/Fruitparty/app/src/main/res/drawable-v24/juzip.png and /dev/null differ
diff --git a/four/Fruitparty/app/src/main/res/drawable-v24/lemon.png b/four/Fruitparty/app/src/main/res/drawable-v24/lemon.png
deleted file mode 100644
index 39f12cc..0000000
Binary files a/four/Fruitparty/app/src/main/res/drawable-v24/lemon.png and /dev/null differ
diff --git a/four/Fruitparty/app/src/main/res/drawable-v24/lemonp.png b/four/Fruitparty/app/src/main/res/drawable-v24/lemonp.png
deleted file mode 100644
index ca5eca8..0000000
Binary files a/four/Fruitparty/app/src/main/res/drawable-v24/lemonp.png and /dev/null differ
diff --git a/four/Fruitparty/app/src/main/res/drawable-v24/li.png b/four/Fruitparty/app/src/main/res/drawable-v24/li.png
deleted file mode 100644
index 0834592..0000000
Binary files a/four/Fruitparty/app/src/main/res/drawable-v24/li.png and /dev/null differ
diff --git a/four/Fruitparty/app/src/main/res/drawable-v24/mangguo.png b/four/Fruitparty/app/src/main/res/drawable-v24/mangguo.png
deleted file mode 100644
index 2e9825c..0000000
Binary files a/four/Fruitparty/app/src/main/res/drawable-v24/mangguo.png and /dev/null differ
diff --git a/four/Fruitparty/app/src/main/res/drawable-v24/orange.png b/four/Fruitparty/app/src/main/res/drawable-v24/orange.png
deleted file mode 100644
index 70e8db8..0000000
Binary files a/four/Fruitparty/app/src/main/res/drawable-v24/orange.png and /dev/null differ
diff --git a/four/Fruitparty/app/src/main/res/drawable-v24/password.png b/four/Fruitparty/app/src/main/res/drawable-v24/password.png
deleted file mode 100644
index 1c6c4f5..0000000
Binary files a/four/Fruitparty/app/src/main/res/drawable-v24/password.png and /dev/null differ
diff --git a/four/Fruitparty/app/src/main/res/drawable-v24/pearson.png b/four/Fruitparty/app/src/main/res/drawable-v24/pearson.png
deleted file mode 100644
index 90cf0eb..0000000
Binary files a/four/Fruitparty/app/src/main/res/drawable-v24/pearson.png and /dev/null differ
diff --git a/four/Fruitparty/app/src/main/res/drawable-v24/product.png b/four/Fruitparty/app/src/main/res/drawable-v24/product.png
deleted file mode 100644
index 8f5cb21..0000000
Binary files a/four/Fruitparty/app/src/main/res/drawable-v24/product.png and /dev/null differ
diff --git a/four/Fruitparty/app/src/main/res/drawable-v24/search.png b/four/Fruitparty/app/src/main/res/drawable-v24/search.png
deleted file mode 100644
index a8b5ac0..0000000
Binary files a/four/Fruitparty/app/src/main/res/drawable-v24/search.png and /dev/null differ
diff --git a/four/Fruitparty/app/src/main/res/drawable-v24/setting.png b/four/Fruitparty/app/src/main/res/drawable-v24/setting.png
deleted file mode 100644
index 34c2f2f..0000000
Binary files a/four/Fruitparty/app/src/main/res/drawable-v24/setting.png and /dev/null differ
diff --git a/four/Fruitparty/app/src/main/res/drawable-v24/sex.png b/four/Fruitparty/app/src/main/res/drawable-v24/sex.png
deleted file mode 100644
index acb8197..0000000
Binary files a/four/Fruitparty/app/src/main/res/drawable-v24/sex.png and /dev/null differ
diff --git a/four/Fruitparty/app/src/main/res/drawable-v24/shoppingcart.png b/four/Fruitparty/app/src/main/res/drawable-v24/shoppingcart.png
deleted file mode 100644
index 76c06de..0000000
Binary files a/four/Fruitparty/app/src/main/res/drawable-v24/shoppingcart.png and /dev/null differ
diff --git a/four/Fruitparty/app/src/main/res/drawable-v24/shuiguo.png b/four/Fruitparty/app/src/main/res/drawable-v24/shuiguo.png
deleted file mode 100644
index d316137..0000000
Binary files a/four/Fruitparty/app/src/main/res/drawable-v24/shuiguo.png and /dev/null differ
diff --git a/four/Fruitparty/app/src/main/res/drawable-v24/spinner_drop_down_shape.xml b/four/Fruitparty/app/src/main/res/drawable-v24/spinner_drop_down_shape.xml
deleted file mode 100644
index 64306b1..0000000
--- a/four/Fruitparty/app/src/main/res/drawable-v24/spinner_drop_down_shape.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- -
-
-
-
-
-
-
- -
-
-
-
\ No newline at end of file
diff --git a/four/Fruitparty/app/src/main/res/drawable-v24/sure_apssword.png b/four/Fruitparty/app/src/main/res/drawable-v24/sure_apssword.png
deleted file mode 100644
index 0e7cee9..0000000
Binary files a/four/Fruitparty/app/src/main/res/drawable-v24/sure_apssword.png and /dev/null differ
diff --git a/four/Fruitparty/app/src/main/res/drawable-v24/tab_menu_text.xml b/four/Fruitparty/app/src/main/res/drawable-v24/tab_menu_text.xml
deleted file mode 100644
index fb06945..0000000
--- a/four/Fruitparty/app/src/main/res/drawable-v24/tab_menu_text.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-