From 833c3b27f7308515e49ec8fd9da88436d8461e02 Mon Sep 17 00:00:00 2001
From: yx <2052246757@qq.com>
Date: Tue, 25 Apr 2023 11:08:26 +0800
Subject: [PATCH] test5
---
.../androidTestResultsUserPreferences.xml | 22 +
Test1/.idea/dbnavigator.xml | 613 ++++++++++++++++++
Test1/app/build.gradle | 1 +
Test1/app/src/main/AndroidManifest.xml | 4 +-
.../test1/Activity/CategoryActivity.java | 25 +-
.../example/test1/Activity/IndexActivity.java | 126 +++-
.../test1/Activity/IntroductionActivity.java | 8 +-
.../example/test1/Activity/MainActivity.java | 2 +-
.../test1/Activity/registerActivity.java | 6 +-
.../example/test1/Activity/userActivity.java | 7 +-
.../main/java/com/example/test1/Database.java | 9 +-
.../example/test1/Fragment/IndexFragment.java | 110 ++++
.../test1/Fragment/PersonFragment.java | 64 ++
.../test1/Fragment/ProductFragment.java | 21 +
.../test1/Fragment/ShoppingCartFragment.java | 21 +
.../example/test1/adapter/ProductAdapter.java | 69 ++
.../com/example/test1/entity/BrandBean.java | 10 +
.../com/example/test1/entity/Product.java | 9 +
.../example/test1/entity/ShoppingCart.java | 43 ++
.../example/test1/service/TimeService.java | 88 +++
Test1/app/src/main/res/drawable/baobao.png | Bin 0 -> 1642 bytes
Test1/app/src/main/res/drawable/bl.png | Bin 0 -> 3682 bytes
Test1/app/src/main/res/drawable/bllogo.png | Bin 0 -> 1205 bytes
.../app/src/main/res/drawable/channellogo.png | Bin 0 -> 2048 bytes
Test1/app/src/main/res/drawable/cn.png | Bin 0 -> 5492 bytes
Test1/app/src/main/res/drawable/diao.png | Bin 0 -> 6462 bytes
Test1/app/src/main/res/drawable/diaologo.png | Bin 0 -> 14548 bytes
Test1/app/src/main/res/drawable/guccilogo.png | Bin 0 -> 2769 bytes
Test1/app/src/main/res/drawable/hermes.png | Bin 0 -> 3091 bytes
.../app/src/main/res/drawable/hermeslogo.png | Bin 0 -> 1527 bytes
Test1/app/src/main/res/drawable/index.png | Bin 0 -> 1423 bytes
.../app/src/main/res/drawable/index_menu.xml | 16 +
Test1/app/src/main/res/drawable/kucci.jpg | Bin 0 -> 1073 bytes
Test1/app/src/main/res/drawable/lv.png | Bin 0 -> 3004 bytes
Test1/app/src/main/res/drawable/lvlogo.jpg | Bin 0 -> 1600 bytes
Test1/app/src/main/res/drawable/lvlogo1.jpg | Bin 0 -> 9831 bytes
Test1/app/src/main/res/drawable/miumiu.png | Bin 0 -> 3089 bytes
.../app/src/main/res/drawable/miumiulogo.png | Bin 0 -> 1896 bytes
Test1/app/src/main/res/drawable/person.png | Bin 0 -> 1734 bytes
Test1/app/src/main/res/drawable/prada.png | Bin 0 -> 3600 bytes
Test1/app/src/main/res/drawable/pradalogo.jpg | Bin 0 -> 1927 bytes
.../app/src/main/res/drawable/pradalogo1.webp | Bin 0 -> 6460 bytes
Test1/app/src/main/res/drawable/product.png | Bin 0 -> 1367 bytes
.../app/src/main/res/drawable/reg_number.png | Bin 0 -> 885 bytes
.../src/main/res/drawable/shoppingcart.png | Bin 0 -> 920 bytes
.../app/src/main/res/drawable/user_number.png | Bin 0 -> 1207 bytes
.../src/main/res/layout/content_category.xml | 12 +-
.../app/src/main/res/layout/content_index.xml | 222 +++++++
Test1/app/src/main/res/layout/content_nav.xml | 119 ++++
.../src/main/res/layout/content_product.xml | 11 +
.../src/main/res/layout/content_shopping.xml | 11 +
.../app/src/main/res/layout/index_famous.xml | 55 ++
Test1/app/src/main/res/layout/navigate.xml | 29 +
Test1/app/src/main/res/layout/register.xml | 34 +-
Test1/app/src/main/res/layout/user.xml | 27 +
Test1/app/src/main/res/values/ids.xml | 4 +
Test1/app/src/main/res/values/refs.xml | 2 +
57 files changed, 1775 insertions(+), 25 deletions(-)
create mode 100644 Test1/.idea/androidTestResultsUserPreferences.xml
create mode 100644 Test1/.idea/dbnavigator.xml
create mode 100644 Test1/app/src/main/java/com/example/test1/Fragment/IndexFragment.java
create mode 100644 Test1/app/src/main/java/com/example/test1/Fragment/PersonFragment.java
create mode 100644 Test1/app/src/main/java/com/example/test1/Fragment/ProductFragment.java
create mode 100644 Test1/app/src/main/java/com/example/test1/Fragment/ShoppingCartFragment.java
create mode 100644 Test1/app/src/main/java/com/example/test1/adapter/ProductAdapter.java
create mode 100644 Test1/app/src/main/java/com/example/test1/entity/ShoppingCart.java
create mode 100644 Test1/app/src/main/java/com/example/test1/service/TimeService.java
create mode 100644 Test1/app/src/main/res/drawable/baobao.png
create mode 100644 Test1/app/src/main/res/drawable/bl.png
create mode 100644 Test1/app/src/main/res/drawable/bllogo.png
create mode 100644 Test1/app/src/main/res/drawable/channellogo.png
create mode 100644 Test1/app/src/main/res/drawable/cn.png
create mode 100644 Test1/app/src/main/res/drawable/diao.png
create mode 100644 Test1/app/src/main/res/drawable/diaologo.png
create mode 100644 Test1/app/src/main/res/drawable/guccilogo.png
create mode 100644 Test1/app/src/main/res/drawable/hermes.png
create mode 100644 Test1/app/src/main/res/drawable/hermeslogo.png
create mode 100644 Test1/app/src/main/res/drawable/index.png
create mode 100644 Test1/app/src/main/res/drawable/index_menu.xml
create mode 100644 Test1/app/src/main/res/drawable/kucci.jpg
create mode 100644 Test1/app/src/main/res/drawable/lv.png
create mode 100644 Test1/app/src/main/res/drawable/lvlogo.jpg
create mode 100644 Test1/app/src/main/res/drawable/lvlogo1.jpg
create mode 100644 Test1/app/src/main/res/drawable/miumiu.png
create mode 100644 Test1/app/src/main/res/drawable/miumiulogo.png
create mode 100644 Test1/app/src/main/res/drawable/person.png
create mode 100644 Test1/app/src/main/res/drawable/prada.png
create mode 100644 Test1/app/src/main/res/drawable/pradalogo.jpg
create mode 100644 Test1/app/src/main/res/drawable/pradalogo1.webp
create mode 100644 Test1/app/src/main/res/drawable/product.png
create mode 100644 Test1/app/src/main/res/drawable/reg_number.png
create mode 100644 Test1/app/src/main/res/drawable/shoppingcart.png
create mode 100644 Test1/app/src/main/res/drawable/user_number.png
create mode 100644 Test1/app/src/main/res/layout/content_index.xml
create mode 100644 Test1/app/src/main/res/layout/content_nav.xml
create mode 100644 Test1/app/src/main/res/layout/content_product.xml
create mode 100644 Test1/app/src/main/res/layout/content_shopping.xml
create mode 100644 Test1/app/src/main/res/layout/index_famous.xml
create mode 100644 Test1/app/src/main/res/layout/navigate.xml
create mode 100644 Test1/app/src/main/res/values/ids.xml
create mode 100644 Test1/app/src/main/res/values/refs.xml
diff --git a/Test1/.idea/androidTestResultsUserPreferences.xml b/Test1/.idea/androidTestResultsUserPreferences.xml
new file mode 100644
index 0000000..b294cbc
--- /dev/null
+++ b/Test1/.idea/androidTestResultsUserPreferences.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Test1/.idea/dbnavigator.xml b/Test1/.idea/dbnavigator.xml
new file mode 100644
index 0000000..0fba2e2
--- /dev/null
+++ b/Test1/.idea/dbnavigator.xml
@@ -0,0 +1,613 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Test1/app/build.gradle b/Test1/app/build.gradle
index 986ae0e..29908b0 100644
--- a/Test1/app/build.gradle
+++ b/Test1/app/build.gradle
@@ -33,6 +33,7 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'com.google.android.material:material:1.5.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+ implementation 'com.android.car.ui:car-ui-lib:2.0.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
diff --git a/Test1/app/src/main/AndroidManifest.xml b/Test1/app/src/main/AndroidManifest.xml
index 7cebf00..f3294cb 100644
--- a/Test1/app/src/main/AndroidManifest.xml
+++ b/Test1/app/src/main/AndroidManifest.xml
@@ -2,6 +2,7 @@
+
-
diff --git a/Test1/app/src/main/java/com/example/test1/Activity/CategoryActivity.java b/Test1/app/src/main/java/com/example/test1/Activity/CategoryActivity.java
index c9b6e29..ea70792 100644
--- a/Test1/app/src/main/java/com/example/test1/Activity/CategoryActivity.java
+++ b/Test1/app/src/main/java/com/example/test1/Activity/CategoryActivity.java
@@ -3,11 +3,15 @@ package com.example.test1.Activity;
import android.app.Activity;
import android.app.FragmentManager;
import android.app.FragmentTransaction;
+import android.content.Intent;
import android.os.Bundle;
+import android.view.View;
import android.widget.ListView;
+import android.widget.Toast;
import androidx.annotation.Nullable;
+import com.example.test1.Database;
import com.example.test1.Fragment.SetDetailFragment;
import com.example.test1.R;
import com.example.test1.adapter.Adapter;
@@ -18,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
-public class CategoryActivity extends Activity {
+public class CategoryActivity extends Activity implements View.OnClickListener{
public OnChangeListener onchangedListener;
private List productList;
private List productCategory = new ArrayList<>();
@@ -50,6 +54,16 @@ public class CategoryActivity extends Activity {
this.onchangedListener = onChangeListener;
}
+ @Override
+ public void onClick(View view) {
+ switch (view.getId()){
+ case R.id.category_return:
+ Intent intent1=new Intent(CategoryActivity.this, MainActivity.class);
+ startActivity(intent1);
+ break;
+ }
+ }
+
public interface OnChangeListener {
void changeText(Product product);
}
@@ -79,6 +93,15 @@ public class CategoryActivity extends Activity {
productList.add(product2);
}
+ public void onClick1(View view) {
+ switch (view.getId()){
+ case R.id.category_return:
+ Intent intent1=new Intent(CategoryActivity.this, MainActivity.class);
+ startActivity(intent1);
+ break;
+ }
+ }
+
/**
* 初始化组件
*/
diff --git a/Test1/app/src/main/java/com/example/test1/Activity/IndexActivity.java b/Test1/app/src/main/java/com/example/test1/Activity/IndexActivity.java
index 76cfe0c..e69970f 100644
--- a/Test1/app/src/main/java/com/example/test1/Activity/IndexActivity.java
+++ b/Test1/app/src/main/java/com/example/test1/Activity/IndexActivity.java
@@ -1,4 +1,128 @@
package com.example.test1.Activity;
-public class IndexActivity {
+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.test1.Fragment.IndexFragment;
+import com.example.test1.Fragment.PersonFragment;
+import com.example.test1.Fragment.ProductFragment;
+import com.example.test1.Fragment.ShoppingCartFragment;
+import com.example.test1.R;
+import com.example.test1.service.TimeService;
+
+public class IndexActivity extends Activity implements View.OnClickListener {
+ private IndexFragment indexFragment;
+ private ProductFragment productFragment;
+ private ShoppingCartFragment shoppingCartFragment;
+ private PersonFragment pearsonFragment;
+ private LinearLayout indexLine, productLine, shoppingCartLine, pearsonLine;
+
+ @Override
+ public void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.navigate);
+ init();
+ initIndexFragment();
+ Thread thread = new Thread(runnable);
+ thread.start();
+ }
+
+ /**
+ * 组件初始化
+ */
+ 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 PersonFragment();
+ pearsonFragment.setArguments(bundle);
+ }
+ transaction.replace(R.id.main_content, pearsonFragment);
+ transaction.commit();
+ }
+
+ Runnable runnable = () -> {
+ Intent intent = new Intent(IndexActivity.this, TimeService.class);
+ startService(intent);
+ };
+
}
diff --git a/Test1/app/src/main/java/com/example/test1/Activity/IntroductionActivity.java b/Test1/app/src/main/java/com/example/test1/Activity/IntroductionActivity.java
index 26c11b2..df38d4e 100644
--- a/Test1/app/src/main/java/com/example/test1/Activity/IntroductionActivity.java
+++ b/Test1/app/src/main/java/com/example/test1/Activity/IntroductionActivity.java
@@ -59,26 +59,26 @@ private TextView btn,btn1;
private void initData() {
data = new ArrayList>();
Map map = new HashMap();
- map.put("icon",R.drawable.lvintroduction);
+ map.put("icon",R.drawable.lvlogo);
map.put("title","LV");
map.put("content","路易威登（Louis Vuitton），法国奢侈品品牌，隶属于酩悦·轩尼诗-路易·威登集团，经营产品包括手提包，旅行用品，小型皮具，配饰，鞋履，成衣，腕表，高级珠宝及个性化订制服务等。");
data.add(map);
map = new HashMap();
- map.put("icon",R.drawable.hermersintroduction);
+ map.put("icon",R.drawable.hermeslogo);
map.put("title","hermers");
map.put("content","爱马仕（Hermès）是法国奢侈品品牌，由蒂埃利·爱马仕（Thierry Hermès）于1837年在法国巴黎创立。 [1] 拥有皮具和马具、女士丝制品、男士丝制品、女士成衣、男士成衣、鞋履、腰带、帽子、手套、珠宝、钟表、香水、美妆、家具和生活艺术、餐瓷、petit h十六大工艺部门。 [41] ");
data.add(map);
map = new HashMap();
- map.put("icon",R.drawable.miumiuintroduction);
+ map.put("icon",R.drawable.miumiulogo);
map.put("title","miumiu");
map.put("content","Miu Miu是Miuccia Prada于1992年创立的品牌。 [6] \n" +
"Miu Miu率性且充满实验风格，与Prada是同一设计理念的另一种表达方式，注重优雅精致且不乏趣味，将女性气质发挥到极致。通过成衣、皮具、眼镜、具备突破意义的广告大片，及有独特视角的女人的故事短片系列，使品牌呈现了现代女性的多面特质。");
data.add(map);
map = new HashMap();
- map.put("icon",R.drawable.pradaintroduction);
+ map.put("icon",R.drawable.pradalogo);
map.put("title","prada");
map.put("content","普拉达（PRADA）是意大利奢侈品牌，由玛丽奥·普拉达于1913年在意大利米兰创建。缪西娅·普拉达（Miuccia Prada）的独特天赋在于对新创意的不懈追求，融合了对知识的好奇心和文化兴趣，从而开辟了先驱之路。她不仅能够预测时尚趋势，更能够引领时尚潮流。 [5] ");
data.add(map);
diff --git a/Test1/app/src/main/java/com/example/test1/Activity/MainActivity.java b/Test1/app/src/main/java/com/example/test1/Activity/MainActivity.java
index ffd3514..135b22c 100644
--- a/Test1/app/src/main/java/com/example/test1/Activity/MainActivity.java
+++ b/Test1/app/src/main/java/com/example/test1/Activity/MainActivity.java
@@ -50,7 +50,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
break;
case R.id.login:
if(validateLogin()){
- Intent intent = new Intent(MainActivity.this, CategoryActivity.class);
+ Intent intent = new Intent(MainActivity.this, IndexActivity.class);
Bundle bundle=new Bundle();
Database dateBase=new Database(MainActivity.this);
bundle.putString("username",usernameText.getText().toString());
diff --git a/Test1/app/src/main/java/com/example/test1/Activity/registerActivity.java b/Test1/app/src/main/java/com/example/test1/Activity/registerActivity.java
index 5f0cc51..20690ec 100644
--- a/Test1/app/src/main/java/com/example/test1/Activity/registerActivity.java
+++ b/Test1/app/src/main/java/com/example/test1/Activity/registerActivity.java
@@ -21,7 +21,7 @@ import com.lljjcoder.citypickerview.widget.CityPicker;
public class registerActivity extends AppCompatActivity implements View.OnClickListener, RadioGroup.OnCheckedChangeListener {
private EditText usernameEdit, passwordEdit, surePasswordEdit;
- private TextView cityText;
+ private TextView cityText,numberText;
private CityPicker cityPicker;
private Button regButton;
private RadioGroup sexGroup;
@@ -40,6 +40,7 @@ public class registerActivity extends AppCompatActivity implements View.OnClickL
*/
private void init() {
cityText = findViewById(R.id.province);
+ numberText = findViewById(R.id.reg_number);
cityText.setOnClickListener(this);
usernameEdit = findViewById(R.id.username);
passwordEdit = findViewById(R.id.password);
@@ -114,6 +115,7 @@ public class registerActivity extends AppCompatActivity implements View.OnClickL
String password = passwordEdit.getText().toString();
String surePassword = surePasswordEdit.getText().toString();
String city = cityText.getText().toString();
+ String number = numberText.getText().toString();
//判断两次密码是否输入一致
if (password.equals(surePassword)) {
//这里也可以再进行其它的验证，如是否符合要求等，符合就进行插入数据库操作
@@ -124,6 +126,7 @@ public class registerActivity extends AppCompatActivity implements View.OnClickL
bundle.putString("password", password);
bundle.putString("sex", sexStr);
bundle.putString("city", city);
+ bundle.putString("number", number);
intent.putExtras(bundle);
//用SQLite数据库存储注册信息
Database dateBase= new Database(registerActivity.this);
@@ -156,6 +159,7 @@ public class registerActivity extends AppCompatActivity implements View.OnClickL
contentValues.put("password",bundle.getString("password"));
contentValues.put("sex",bundle.getString("sex"));
contentValues.put("city",bundle.getString("city"));
+ contentValues.put("number",bundle.getString("number"));
sqLiteDatabase.insert("good_user",null,contentValues);
sqLiteDatabase.close();
}
diff --git a/Test1/app/src/main/java/com/example/test1/Activity/userActivity.java b/Test1/app/src/main/java/com/example/test1/Activity/userActivity.java
index cb07934..8702356 100644
--- a/Test1/app/src/main/java/com/example/test1/Activity/userActivity.java
+++ b/Test1/app/src/main/java/com/example/test1/Activity/userActivity.java
@@ -15,8 +15,8 @@ import com.example.test1.R;
public class userActivity extends AppCompatActivity {
private ImageView userSexline, userCityLine, userPayLine, userSettingLine,
- userGeneralLine, usernameLine, userIconImage;
- private TextView userCityText, userSexText, usernameText;
+ userGeneralLine, usernameLine, userIconImage,userNumberLine;
+ private TextView userCityText, userSexText, usernameText,userNumberText;
private LinearLayout userSearchProductLine;
@Override
@@ -33,9 +33,11 @@ public class userActivity extends AppCompatActivity {
usernameText = findViewById(R.id.user_username);
userSexText = findViewById(R.id.user_sex);
userCityText = findViewById(R.id.user_city);
+ userNumberText = findViewById(R.id.user_number);
usernameLine = findViewById(R.id.user_username_line);
userSexline = findViewById(R.id.user_sex_line);
userCityLine = findViewById(R.id.user_city_line);
+ userNumberLine = findViewById(R.id.user_number_line);
userPayLine = findViewById(R.id.user_pay);
userSettingLine = findViewById(R.id.user_setting);
userGeneralLine = findViewById(R.id.user_general);
@@ -55,6 +57,7 @@ public class userActivity extends AppCompatActivity {
usernameText.setText(String.format("用户名：%s", bundle.getString("username")));
userSexText.setText(String.format("性别：%s", bundle.getString("sex")));
userCityText.setText(String.format("城市：%s", bundle.getString("city")));
+ userNumberText.setText(String.format("电话：%s", bundle.getString("number")));
}
public void onClick(View v) {
diff --git a/Test1/app/src/main/java/com/example/test1/Database.java b/Test1/app/src/main/java/com/example/test1/Database.java
index a3a9039..1e0aa50 100644
--- a/Test1/app/src/main/java/com/example/test1/Database.java
+++ b/Test1/app/src/main/java/com/example/test1/Database.java
@@ -11,15 +11,16 @@ import androidx.annotation.Nullable;
public class Database extends SQLiteOpenHelper {
+
public Database(@Nullable Context context) {
- super(context, "orange", null, 1);
+ super(context, "good", null, 4);
}
@Override
public void onCreate(SQLiteDatabase db) {
//创建用户表
- String sql = "create table good_user(id integer primary key autoincrement, username varchar(50), password varchar(50),sex varchar(10),city carchar(50))";
+ String sql = "create table good_user(id integer primary key autoincrement, username varchar(50), password varchar(50),sex varchar(10),city carchar(50),number carchar(50))";
db.execSQL(sql);
}
@@ -29,12 +30,13 @@ public class Database extends SQLiteOpenHelper {
}
//插入数据
- public void insertUser(SQLiteDatabase sqLiteDatabase, String username, String password, String sex, String city) {
+ public void insertUser(SQLiteDatabase sqLiteDatabase, String username, String password, String sex, String city, String number ) {
ContentValues contentValues = new ContentValues();
contentValues.put("username", username);
contentValues.put("password", password);
contentValues.put("sex", sex);
contentValues.put("city", city);
+ contentValues.put("number", number);
sqLiteDatabase.insert("good_user", null, contentValues);
sqLiteDatabase.close();
}
@@ -47,6 +49,7 @@ public class Database extends SQLiteOpenHelper {
while (cursor.moveToNext()) {
bundle.putString("sex", cursor.getString(3));
bundle.putString("city", cursor.getString(4));
+ bundle.putString("number", cursor.getString(5));
}
}
cursor.close();
diff --git a/Test1/app/src/main/java/com/example/test1/Fragment/IndexFragment.java b/Test1/app/src/main/java/com/example/test1/Fragment/IndexFragment.java
new file mode 100644
index 0000000..b27d090
--- /dev/null
+++ b/Test1/app/src/main/java/com/example/test1/Fragment/IndexFragment.java
@@ -0,0 +1,110 @@
+package com.example.test1.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.test1.R;
+import com.example.test1.adapter.ProductAdapter;
+import com.example.test1.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 ProductAdapter productAdapter;
+ private List productList;
+
+ @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.lv1);
+ product.setProductName("lv");
+ product.setProductPrice(new BigDecimal("19999"));
+ Product product1 = new Product();
+ product1.setImageUrlId(R.drawable.lv2);
+ product1.setProductName("prada");
+ product1.setProductPrice(new BigDecimal("29999"));
+ Product product2 = new Product();
+ product2.setImageUrlId(R.drawable.miumiu1);
+ product2.setProductName("miumiu");
+ product2.setProductPrice(new BigDecimal("19999"));
+ Product product3 = new Product();
+ product3.setImageUrlId(R.drawable.prada1);
+ product3.setProductName("hermes");
+ product3.setProductPrice(new BigDecimal("29999"));
+ Product product4 = new Product();
+ product4.setImageUrlId(R.drawable.prada2);
+ product4.setProductName("cn");
+ product4.setProductPrice(new BigDecimal("49999"));
+ Product product5 = new Product();
+ product5.setImageUrlId(R.drawable.hermes1);
+ product5.setProductName("diao");
+ product5.setProductPrice(new BigDecimal("39999"));
+ productList.add(product);
+ productList.add(product1);
+ productList.add(product2);
+ productList.add(product3);
+ productList.add(product4);
+ productList.add(product5);
+
+ }
+}
diff --git a/Test1/app/src/main/java/com/example/test1/Fragment/PersonFragment.java b/Test1/app/src/main/java/com/example/test1/Fragment/PersonFragment.java
new file mode 100644
index 0000000..202dde5
--- /dev/null
+++ b/Test1/app/src/main/java/com/example/test1/Fragment/PersonFragment.java
@@ -0,0 +1,64 @@
+package com.example.test1.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.test1.R;
+
+public class PersonFragment extends Fragment implements View.OnClickListener {
+ private ImageView userIconImage;
+ private TextView usernameText, userSexText, userCityText;
+ private ImageView 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.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/Test1/app/src/main/java/com/example/test1/Fragment/ProductFragment.java b/Test1/app/src/main/java/com/example/test1/Fragment/ProductFragment.java
new file mode 100644
index 0000000..578e4e0
--- /dev/null
+++ b/Test1/app/src/main/java/com/example/test1/Fragment/ProductFragment.java
@@ -0,0 +1,21 @@
+package com.example.test1.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.test1.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/Test1/app/src/main/java/com/example/test1/Fragment/ShoppingCartFragment.java b/Test1/app/src/main/java/com/example/test1/Fragment/ShoppingCartFragment.java
new file mode 100644
index 0000000..c7d1b73
--- /dev/null
+++ b/Test1/app/src/main/java/com/example/test1/Fragment/ShoppingCartFragment.java
@@ -0,0 +1,21 @@
+package com.example.test1.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.test1.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/Test1/app/src/main/java/com/example/test1/adapter/ProductAdapter.java b/Test1/app/src/main/java/com/example/test1/adapter/ProductAdapter.java
new file mode 100644
index 0000000..0cd1e39
--- /dev/null
+++ b/Test1/app/src/main/java/com/example/test1/adapter/ProductAdapter.java
@@ -0,0 +1,69 @@
+package com.example.test1.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.test1.R;
+import com.example.test1.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) {
+ Log.i("aa", "getView: "+"aa");
+ convertView = layoutInflater.inflate(R.layout.category_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/Test1/app/src/main/java/com/example/test1/entity/BrandBean.java b/Test1/app/src/main/java/com/example/test1/entity/BrandBean.java
index 61ebfbe..02417d9 100644
--- a/Test1/app/src/main/java/com/example/test1/entity/BrandBean.java
+++ b/Test1/app/src/main/java/com/example/test1/entity/BrandBean.java
@@ -40,4 +40,14 @@ public class BrandBean implements Serializable {
public void setImg(int img) {
this.img = img;
}
+
+ @Override
+ public String toString() {
+ return "Condition{" +
+ "conditionIcon=" + img +
+ "conditionIcon=" + sales +
+ "conditionIcon=" + price +
+ ", conditionName='" + name + '\'' +
+ '}';
+ }
}
diff --git a/Test1/app/src/main/java/com/example/test1/entity/Product.java b/Test1/app/src/main/java/com/example/test1/entity/Product.java
index 98103ab..4591d51 100644
--- a/Test1/app/src/main/java/com/example/test1/entity/Product.java
+++ b/Test1/app/src/main/java/com/example/test1/entity/Product.java
@@ -31,4 +31,13 @@ public class Product {
private Integer imageUrlId;
private String productName;
private BigDecimal productPrice;
+
+ @Override
+ public String toString() {
+ return "Product{" +
+ "imageUrlId=" + imageUrlId +
+ ", productName='" + productName + '\'' +
+ ", productPrice=" + productPrice +
+ '}';
+ }
}
diff --git a/Test1/app/src/main/java/com/example/test1/entity/ShoppingCart.java b/Test1/app/src/main/java/com/example/test1/entity/ShoppingCart.java
new file mode 100644
index 0000000..951c901
--- /dev/null
+++ b/Test1/app/src/main/java/com/example/test1/entity/ShoppingCart.java
@@ -0,0 +1,43 @@
+package com.example.test1.entity;
+
+public class ShoppingCart {
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ public Integer getProductId() {
+ return ProductId;
+ }
+
+ public void setProductId(Integer productId) {
+ ProductId = productId;
+ }
+
+ public Integer getNumber() {
+ return number;
+ }
+
+ public void setNumber(Integer number) {
+ this.number = number;
+ }
+
+ private Integer id;
+ private Integer userId;
+ private Integer ProductId;
+ /**
+ * 购买数量
+ */
+ private Integer number;
+}
diff --git a/Test1/app/src/main/java/com/example/test1/service/TimeService.java b/Test1/app/src/main/java/com/example/test1/service/TimeService.java
new file mode 100644
index 0000000..f758385
--- /dev/null
+++ b/Test1/app/src/main/java/com/example/test1/service/TimeService.java
@@ -0,0 +1,88 @@
+package com.example.test1.service;
+
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+import android.os.IBinder;
+
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
+
+import com.example.test1.R;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Timer;
+import java.util.TimerTask;
+
+public class TimeService extends Service {
+ private static Timer timer = null;
+ private NotificationManager manager;
+ private NotificationCompat.Builder builder;
+
+ @Nullable
+ @Override
+ public IBinder onBind(Intent intent) {
+ return null;
+ }
+
+ /**
+ * 清除通知
+ */
+ private void cleanAllNotification() {
+ manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+ manager.cancelAll();
+ if (timer != null) {
+ timer.cancel();
+ timer = null;
+ }
+
+ }
+
+ /**
+ * 添加通知
+ */
+ @Override
+ public int onStartCommand(Intent intent, int flags, int startId) {
+ long period = 60 * 1000; //1分钟一个周期
+ if (timer == null) {
+ timer = new Timer();
+ }
+ timer.schedule(new TimerTask() {
+ @Override
+ public void run() {
+ /**
+ * NotificationChannel是android8.0新增的特性，如果App的targetSDKVersion>=26，
+ * 没有设置channel通知渠道的话，就会导致通知无法展示。
+ * 报错内容：Failed to post notification on channel “null”
+ */
+ NotificationChannel channel = null;
+ if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+ channel = new NotificationChannel("channel", "通知", NotificationManager.IMPORTANCE_DEFAULT);
+ }
+ manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+ manager.createNotificationChannel(channel);
+ }
+ builder = new NotificationCompat.Builder(TimeService.this);
+ builder.setContentTitle("提醒系统当前时间");
+ builder.setSmallIcon(R.drawable.lv1);
+ builder.setChannelId("channel");
+ Date date = new Date();
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ builder.setContentText("系统当前时间为：" + formatter.format(date));
+ builder.setAutoCancel(true);
+ builder.setDefaults(Notification.DEFAULT_ALL);
+ Notification notification = builder.build();
+ manager.notify(1, notification);
+
+ }
+ }, 0, period);
+
+ return super.onStartCommand(intent, flags, startId);
+ }
+}
diff --git a/Test1/app/src/main/res/drawable/baobao.png b/Test1/app/src/main/res/drawable/baobao.png
new file mode 100644
index 0000000000000000000000000000000000000000..44ff9fa25fcc818ad6e32a1349384da50fcbd6f6
GIT binary patch
literal 1642
zcmV-w29^1VP)L_tyThb-*=+CPgRxGTCJ;!5jMvGuEHsA-#~YD=Y7LDZs#qD`7f
zG9SszoqNvfk4Z4oq{-ZJXZ>NGKNrqHpgBPs
zuiZ;Gt#}7YtsDKjl_!a&@HrbG#5L@dx$;OKOzTS8u;Sw>GkdUD-oOf3U|%Y1-q3|8
zsgu0>LJJiyJ9V5kU0Mdn&iki6acp~4*t{VN*(nL6VAE>ayzk#GfqX4Oy=IQ3n@8Qdg0&C!1J526Sg^)lx_hCyjgz?omjad0cM1LBOxW5mR
zJLJ%k3{Nkm_1By{rwQxhBdGyPETMt=a9C#@X&&;~&|qcz5-zAcEZ
z$(PqWOoXuVF%>C?}a@-{^@2`>|}9
zpQOH|HvPq}<^B;6YwrAWWjt>6UQE!LH~w`=_lC7e4FE7r27oR1oJ3FW!TSN=j=z+y
zAb`mhQD)I!@aRMCUsRz?W;|y0bOhN~U?GMrW29vcO$$14Cf74Mc-092Uz9vP^|u!W
z)+KcL=#Jg3{TsKQT-<({vkSIpt-e|PK5pBbIJxJ4ZQI~i(qHxrw6-6hjhi>dBda=N
z84xW8(8kOO*X~^c;8??iD9v#}x(JOW089WK06GQ-D|qIK1!MpIZ?+wZAAaE8Gz?>U
z7ZQt68+`Q{ApB#eBlM?dQ+nsF;nl0Ios#oI<0+aFru8CFvI`cDFZ?2iYr5C{y+r_k
zVUP(~3+FKxF$&OJniU4M4!&y%}=U$UpPCWIrImKyK
zdep&SpnFRoA)3i4pil&(Imml~pj9&qGfP$^Pzw`K2!99MI0ml0eCw(q
z2`SIYB_UJV^M*-R8t0L*%Gx6UF{n1Q+AoXX<^N=jbV?2bt6?IJ<_>6ils{|E18hi-tIgG27Tmm
z3cGfXVrbZhQoyG5F23*gu=C9kENipmEt?WDU(iUnvX+F906SLDfn!
zLyja95-3+t>CfVkTMc;m3V;1=8QZs}kZ=Xwc|V7(>r8CFPT}jrXFx>LMO4?GI3yXU
z1P5$UCTbO?Rh
zzpOoTA`;=jyOV$$#S6PUY~PYZ@8L15=!oL_>tguFO9R+`n+15YURfp&DbT$>kPre*
z*8Q1NtSA
zZcpLGSB4ab)X1pvKL4V`oy+GCQDsR3K+rZNfJdGaTEj=hXu>QZK8a{l;KBQvjK4lV
z;Kv;)AAP8~zC$BAuRoD>3vtnvCK5w1sqXrI(LxhXJ$7NRJmjiJ_?HiCU8vvKjd)C16s`3YTvOA2WX_;od)6R2N^kS(QBX#mu~hH(!)HZ!o%gfg;oTL%#0N$hvY`osBeEg%@k
odCrgjH@+?EnA(07*qoM6N<$f+8UfsQ>@~
literal 0
HcmV?d00001
diff --git a/Test1/app/src/main/res/drawable/bl.png b/Test1/app/src/main/res/drawable/bl.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f975fb500c5bb515514e9a3e361a1c45050870f
GIT binary patch
literal 3682
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
A{r~^~
literal 0
HcmV?d00001
diff --git a/Test1/app/src/main/res/drawable/bllogo.png b/Test1/app/src/main/res/drawable/bllogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b87a95866521e35012780ee76a4254ca313b55d
GIT binary patch
literal 1205
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
Yf3IS0z@;n|UH||907*qoM6N<$g1eZpga7~l
literal 0
HcmV?d00001
diff --git a/Test1/app/src/main/res/drawable/diaologo.png b/Test1/app/src/main/res/drawable/diaologo.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb7b82bced30fccaa3530bf8bedd21158c5dc9e7
GIT binary patch
literal 14548
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
literal 0
HcmV?d00001
diff --git a/Test1/app/src/main/res/drawable/guccilogo.png b/Test1/app/src/main/res/drawable/guccilogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..f871202db41781dda3e363427af2b986bcd28b0c
GIT binary patch
literal 2769
zcmV;?3NH1DP);l9q<{qbG9
zv-Un~pZ&NOrJ3`c*>m0Sfw|?vQ`|XpXG8%vp=CciW88{k4(;LVEqk!Q+
zJ#Y;8kEuTi`T=JHgMcpJd0+=nNYj8Y>VV6Dj{wtwEx=}=2%HBD0R94e8`x@SMgzA3
zGtBd|z(U}#ga0|eYM=vH3_N4~*4NNo4~#VRJPvdNvw$;!2Z3(@dmOxH0yhEkfZf1a
zU_USkm
zW=ErKEC+rR`fez&294@E;6k9r`n?tnRvYm15N#f~#r$>%3AVxdJqJt%o&b&@0sDBb
z)$Z$Djco!RGX
z4r2%ox>GQ<*5`-Nlv@Wpm7sz@Bq$RFTlX|0y#iXEJ7Q?Nke={yx#3X&?oLqmt_r^$
z@o)U4Fb3^DAm#RIpw)byiFO~*67~|%+GQ?A1G*R3*~2z<_&2^_22)a2FZ7T(xOby4
zPMFV@lyqVE%i7#)rP!g|_;{ez-)qcQxy6m;exhb4=t&46VTQm
zL(qjL|Hc=LhpfqNU?Om31;&Ml`@_H{b3Y-baTfyH%zX#iO*~)<@YWdGCSV1n&ixwL
zj+W69;+Nw>;A;`THMqX40q#JZeGyrTE-Xf!I1Zc^`t99FxCe<|7U!dm*|Vw+_$|_N
zyMePJX!`;`M)uBB>-!5#on2_DN9mfmXaMc)-nL`Hw%Pws3w+vCybl>twlW@!wsQ}7
zgz_bm13rg@yODBZ?ILteaaq-kz_*aT*$uphpk+M__@!yrH4ge2=#170d(N2;06Jo9H?&)=^22~HnNQFvxE?qVx4qR+
zQp82HOp+em^XSl7V`w^4(E4@Pp#dox`Xt7mk2=G{Z+F>=xr!>PsG^E0s;HuhDypcW
ziYj^qz2-a)VFYpjO+^l`k;v_krxc)n7DYbSQ|?Un+cp}QhQhxSP#Cufow5%gx575V
zXCpzs^C^QSV|vUDt~j>#jZ^DUG+
z#4(LJ1Uw2niS)@qq+e>0yL1Z5!B>VUg&k5VV_3ly7*TjvANh{lclVLh$ON#|5y2(Y
z4J=APcN4)uIRU&eW!-rcIkg4+B0ZcnH&Q;zXH=vpN6yi(he)=4_Mu!E{~%@kpr!dr
zh|jf^2r40m3@e-2S2FM!Lisv>R|@(M5S%r8f!Aed$E~3@tR-6(7n4!`imlPl$-w6_
zlsUB%S+e&Lk&6<6dUVkAdF%k*l%XAC2^xSMloBIT;Rb>uwSjEMhRKxnv^F$nSh!c#x{yf~Cw*NQmAegw+h+|pC3C7m^C&-qde5#>?U?x}_
zjts9j!Swn`^b|xF4!s$t*$-3lh18SHRoI7Q?ub3e{0E)QMpY;aQsBNjH4SnE`+X#;
zU?qePac|4OV-)h{wZ~kGEShT)l;1-(r}qSceOl=%6t`5K3q6N-sU&DcC+a>im)(|p
zg7Utw)8Y-G=bf%Xae@hN&$BW#MJmdmm5H1|Q7?)q#fsb*a&aoI|$DVL=8yGYGEh
z6D0Q!g9gMtnzWMMVFhq?s2!W>frC685qOgH+jw8(HM9BLnUFSz4xP4O9whyltuLA#
zb{lT5ND+ez2u24BC@()PJ`rkEE9HvNg_)FW4Zr@&GuCelw*&cTG9w4vL$FiN6MSVa
z2~I~!*yi&HmAz>F(YpvX&4w5n7bXx?2_EWGk8v*LzSsLn=TiaAG<(zv=shWy8=@Y0
z>g+l@NpDLHM9bgia|peJ(JS}@^Z6^mm$-Tr!*C0yXez#%WM`O5
zDG$E6u9rx*dx31D6}VGP9wnOtJr#x^Yt|K%FQCrcjf6Cw@>G!qlm>FYgFYIHm2^}J3oK-=^{6kgt$%jF)Z)QOXo=WC-G
zDQkb5^mWeO6g+as{uz#RTOZ)?f&~i-t5&Vrgu|Kbd0x)cI}R!Pmw+9)TrTRB=m7o;
XnU57=^H7WB00000NkvXXu0mjfRX8TJ
literal 0
HcmV?d00001
diff --git a/Test1/app/src/main/res/drawable/hermes.png b/Test1/app/src/main/res/drawable/hermes.png
new file mode 100644
index 0000000000000000000000000000000000000000..3482b641e1eaa088e5e66d2593366bb5cf72beea
GIT binary patch
literal 3091
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
literal 0
HcmV?d00001
diff --git a/Test1/app/src/main/res/drawable/index.png b/Test1/app/src/main/res/drawable/index.png
new file mode 100644
index 0000000000000000000000000000000000000000..24b11e64362963321a64ec1f62326a4f1f20fb49
GIT binary patch
literal 1423
zcmV;A1#tR_P)!!TBod{{)P0JQh_
z_wR3SZ~tSu;`yG)f&~jIYHMrXC%Mtfi^yL9wkoAg_#G1f0)9GMvSi8JnwpwVNUk0I
zj%1kRmRKy7v2EM(GcMp`BBp6B3WY*nku+RRMBXLYEFyQ3i~O~}oMfFt^^3?RrPLwUCX>kwR#sMiP+nesJIMwBAlVQOhnGhpkz+kQJp)tKF{O&=
zy1qfvv=0GPIMl^lF1Id~N_|tPk7=530C>?u{V+T{ytcKq^_Qt=nRG>TU4KT?w0!`|
z9jZ%2?oXvssqy;RwtX@di(POQ1P#F4Kp?Os9*>{4ZTq*$>X}qU48wSpXezZLLBlYbNbdA-r%A3ld-iOm6i2pgcgExK
z6C$#Xy8uYBeu_%OG|hP;(n9hcmlKgDrPNaZt`@Dju>WcRhXFj`@qaXv$!sh3
zN1AYGnWni2z$uctC&(V9)J_1o(q)f@ZQEBOk;uVdFnAluMgSnWw5qCVMRj#`OK)%Q
zgvpFs5yLPV0URee-=VSqp0_M(@08USfUfJWX`1%3+ZK^d01qjpI>+l*Fp*?3xgrn<
zv;dgnP=g}!s8Z^vFN(*3X_`Bn?M(;(M5G762Bp-uh5F=8#5B##0QLh2JJcl+*{GEI
z(r?j)U>L?407phG&)W+9kYnbEX`0Uh*asl!P+b64E2Tbv~?I6
z6=eW6$K&x!`IhJZRKzfhH%adDP(SB#xs|C@>iqP|E(~X}X#;SJ%ZbQdrPOm?J37W?
zBJv)|ZQhq6(yWwv?0N_u4~Aj9#fJ
zdzHtgbcS64;B2SY%0H6mz^YztMJhIvB9soxHRHoDEFI+wd07|JQ
z08Id3n&$Q!qOb&{)9Ev#IW3>z{}Ho^%rx9Ii3BG$DGjD+-Yp`pJO5q603ael@`8vQ
z7#tkjeeT@3%YMi8wIaH%uNILrBv<0vh7%+SAV%_qii(P_6NyB)u$Rff*F-c;dyC{m
zK9kXCbcdgD0Ur}FO>-WABmjuWl0km&;>G3F)z#+#
z)B%8q3<3DPn4lyRMd}+Akqbrm3yR2mXN%*WH$RcrHXo_$`X=WlYDNq#2VDT}vMkHa
z_cHHfPo+{vMC3t?oG0CA3d0
d7PGjS@DCb(+#a)*F$(|y002ovPDHLkV1kTlmTCY1
literal 0
HcmV?d00001
diff --git a/Test1/app/src/main/res/drawable/index_menu.xml b/Test1/app/src/main/res/drawable/index_menu.xml
new file mode 100644
index 0000000..14636dd
--- /dev/null
+++ b/Test1/app/src/main/res/drawable/index_menu.xml
@@ -0,0 +1,16 @@
+
+