From 3a43575d3643aea4a92ed603f0ab82604dc26ac8 Mon Sep 17 00:00:00 2001 From: Cyh020229 <2782998497@qq.com> Date: Wed, 3 May 2023 21:12:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=BA=94=E6=AC=A1=E5=AE=9E=E9=AA=8C?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OrangeSale/.idea/vcs.xml | 6 ++ OrangeSale/app/src/main/AndroidManifest.xml | 1 + .../orangesale_02/CategoryActivity.java | 5 +- .../example/orangesale_02/IndexActivity.java | 3 +- .../example/orangesale_02/MainActivity.java | 2 +- .../orangesale_02/adapter/Adapter.java | 2 +- .../orangesale_02/adapter/ProductAdapter.java | 6 +- .../orangesale_02/entity/OrangeUser.java | 2 +- .../example/orangesale_02/entity/Product.java | 2 +- .../orangesale_02/fragment/IndexFragment.java | 32 ++++----- .../fragment/PearsonFragment.java | 4 +- .../fragment/ProductFragment.java | 4 +- .../fragment/ShoppingCartFragment.java | 4 +- .../app/src/main/res/drawable/pearson.png | Bin 0 -> 3302 bytes .../app/src/main/res/drawable/product.png | Bin 0 -> 1315 bytes .../src/main/res/drawable/shoppingcart.png | Bin 0 -> 1155 bytes .../app/src/main/res/drawable/shuiguo.png | Bin 0 -> 1212 bytes .../app/src/main/res/layout/activity_main.xml | 35 ++++++---- .../res/layout/categoty_detail_content.xml | 4 +- .../app/src/main/res/layout/content_index.xml | 62 +++++++++--------- .../app/src/main/res/layout/content_nav.xml | 11 ++-- .../app/src/main/res/layout/index_famous.xml | 5 +- 22 files changed, 103 insertions(+), 87 deletions(-) create mode 100644 OrangeSale/.idea/vcs.xml create mode 100644 OrangeSale/app/src/main/res/drawable/pearson.png create mode 100644 OrangeSale/app/src/main/res/drawable/product.png create mode 100644 OrangeSale/app/src/main/res/drawable/shoppingcart.png create mode 100644 OrangeSale/app/src/main/res/drawable/shuiguo.png diff --git a/OrangeSale/.idea/vcs.xml b/OrangeSale/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/OrangeSale/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/OrangeSale/app/src/main/AndroidManifest.xml b/OrangeSale/app/src/main/AndroidManifest.xml index d3a0dc3..392e730 100644 --- a/OrangeSale/app/src/main/AndroidManifest.xml +++ b/OrangeSale/app/src/main/AndroidManifest.xml @@ -21,6 +21,7 @@ + \ No newline at end of file diff --git a/OrangeSale/app/src/main/java/com/example/orangesale_02/CategoryActivity.java b/OrangeSale/app/src/main/java/com/example/orangesale_02/CategoryActivity.java index 8849851..f8f7356 100644 --- a/OrangeSale/app/src/main/java/com/example/orangesale_02/CategoryActivity.java +++ b/OrangeSale/app/src/main/java/com/example/orangesale_02/CategoryActivity.java @@ -8,10 +8,7 @@ import android.widget.ListView; import androidx.annotation.Nullable; -import com.example.orangesale_02.R; -import com.example.orangesale_02.Adapter; -import com.example.orangesale_02.Product; -import com.example.orangesale_02.SetDetailFragment; +import com.example.orangesale_02.adapter.Adapter; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/OrangeSale/app/src/main/java/com/example/orangesale_02/IndexActivity.java b/OrangeSale/app/src/main/java/com/example/orangesale_02/IndexActivity.java index 6ec2bec..73c4ec4 100644 --- a/OrangeSale/app/src/main/java/com/example/orangesale_02/IndexActivity.java +++ b/OrangeSale/app/src/main/java/com/example/orangesale_02/IndexActivity.java @@ -1,4 +1,4 @@ -package com.example.orangesale_02.activity; +package com.example.orangesale_02; import android.app.Activity; import android.app.FragmentTransaction; @@ -9,7 +9,6 @@ import android.widget.LinearLayout; import androidx.annotation.Nullable; -import com.example.orangesale_02.R; import com.example.orangesale_02.fragment.IndexFragment; import com.example.orangesale_02.fragment.PearsonFragment; import com.example.orangesale_02.fragment.ProductFragment; diff --git a/OrangeSale/app/src/main/java/com/example/orangesale_02/MainActivity.java b/OrangeSale/app/src/main/java/com/example/orangesale_02/MainActivity.java index 9546c2f..39f6c07 100644 --- a/OrangeSale/app/src/main/java/com/example/orangesale_02/MainActivity.java +++ b/OrangeSale/app/src/main/java/com/example/orangesale_02/MainActivity.java @@ -45,7 +45,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe if(validateLogin()) { - Intent intent1=new Intent(MainActivity.this,UserActivity.class); + Intent intent1=new Intent(MainActivity.this,IndexActivity.class); Bundle bundle=new Bundle(); MyDatabaseHelper myDatabaseHelper=new MyDatabaseHelper(MainActivity.this); bundle.putString("username",usernameText.getText().toString()); diff --git a/OrangeSale/app/src/main/java/com/example/orangesale_02/adapter/Adapter.java b/OrangeSale/app/src/main/java/com/example/orangesale_02/adapter/Adapter.java index 38ffc00..44d4ab8 100644 --- a/OrangeSale/app/src/main/java/com/example/orangesale_02/adapter/Adapter.java +++ b/OrangeSale/app/src/main/java/com/example/orangesale_02/adapter/Adapter.java @@ -1,4 +1,4 @@ -package com.example.orangesale_02; +package com.example.orangesale_02.adapter; import android.content.Context; import android.graphics.Color; diff --git a/OrangeSale/app/src/main/java/com/example/orangesale_02/adapter/ProductAdapter.java b/OrangeSale/app/src/main/java/com/example/orangesale_02/adapter/ProductAdapter.java index af7a220..4361e57 100644 --- a/OrangeSale/app/src/main/java/com/example/orangesale_02/adapter/ProductAdapter.java +++ b/OrangeSale/app/src/main/java/com/example/orangesale_02/adapter/ProductAdapter.java @@ -1,4 +1,4 @@ -package com.example.orangesale_05.adapter; +package com.example.orangesale_02.adapter; import android.content.Context; import android.util.Log; @@ -9,8 +9,8 @@ import android.widget.BaseAdapter; import android.widget.ImageView; import android.widget.TextView; -import com.example.orangesale_05.R; -import com.example.orangesale_05.entity.Product; +import com.example.orangesale_02.R; +import com.example.orangesale_02.entity.Product; import java.util.List; diff --git a/OrangeSale/app/src/main/java/com/example/orangesale_02/entity/OrangeUser.java b/OrangeSale/app/src/main/java/com/example/orangesale_02/entity/OrangeUser.java index 5ad8fcd..e929ce8 100644 --- a/OrangeSale/app/src/main/java/com/example/orangesale_02/entity/OrangeUser.java +++ b/OrangeSale/app/src/main/java/com/example/orangesale_02/entity/OrangeUser.java @@ -1,4 +1,4 @@ -package com.example.orangesale_02; +package com.example.orangesale_02.entity; public class OrangeUser { private Integer id; diff --git a/OrangeSale/app/src/main/java/com/example/orangesale_02/entity/Product.java b/OrangeSale/app/src/main/java/com/example/orangesale_02/entity/Product.java index 69453a8..610124b 100644 --- a/OrangeSale/app/src/main/java/com/example/orangesale_02/entity/Product.java +++ b/OrangeSale/app/src/main/java/com/example/orangesale_02/entity/Product.java @@ -1,4 +1,4 @@ -package com.example.orangesale_05.entity; +package com.example.orangesale_02.entity; import java.math.BigDecimal; diff --git a/OrangeSale/app/src/main/java/com/example/orangesale_02/fragment/IndexFragment.java b/OrangeSale/app/src/main/java/com/example/orangesale_02/fragment/IndexFragment.java index 8c52473..0a8106a 100644 --- a/OrangeSale/app/src/main/java/com/example/orangesale_02/fragment/IndexFragment.java +++ b/OrangeSale/app/src/main/java/com/example/orangesale_02/fragment/IndexFragment.java @@ -1,4 +1,4 @@ -package com.example.orangesale_05.fragment; +package com.example.orangesale_02.fragment; import android.app.Fragment; import android.os.Bundle; @@ -12,9 +12,9 @@ import android.widget.SearchView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.example.orangesale_05.R; -import com.example.orangesale_05.adapter.ProductAdapter; -import com.example.orangesale_05.entity.Product; +import com.example.orangesale_02.R; +import com.example.orangesale_02.adapter.ProductAdapter; +import com.example.orangesale_02.entity.Product; import java.math.BigDecimal; import java.util.ArrayList; @@ -75,28 +75,28 @@ public class IndexFragment extends Fragment implements View.OnClickListener { private void initData() { productList = new ArrayList<>(); Product product = new Product(); - product.setImageUrlId(R.drawable.juzip); + product.setImageUrlId(R.drawable.orange); product.setProductName("橘子"); - product.setProductPrice(new BigDecimal("9.9")); + product.setProductPrice(new BigDecimal("29.9")); Product product1 = new Product(); - product1.setImageUrlId(R.drawable.orange); - product1.setProductName("橙子"); + product1.setImageUrlId(R.drawable.pingguo); + product1.setProductName("苹果"); product1.setProductPrice(new BigDecimal("29.9")); Product product2 = new Product(); - product2.setImageUrlId(R.drawable.youzip); - product2.setProductName("柚子"); + product2.setImageUrlId(R.drawable.chengzi); + product2.setProductName("橙子"); product2.setProductPrice(new BigDecimal("19.9")); Product product3 = new Product(); - product3.setImageUrlId(R.drawable.xiguap); - product3.setProductName("西瓜"); + product3.setImageUrlId(R.drawable.youzi); + product3.setProductName("柚子"); product3.setProductPrice(new BigDecimal("19.9")); Product product4 = new Product(); - product4.setImageUrlId(R.drawable.applep); - product4.setProductName("苹果"); + product4.setImageUrlId(R.drawable.taozi); + product4.setProductName("桃子"); product4.setProductPrice(new BigDecimal("49.9")); Product product5 = new Product(); - product5.setImageUrlId(R.drawable.lemonp); - product5.setProductName("柠檬"); + product5.setImageUrlId(R.drawable.shali); + product5.setProductName("西瓜"); product5.setProductPrice(new BigDecimal("9.9")); productList.add(product); productList.add(product1); diff --git a/OrangeSale/app/src/main/java/com/example/orangesale_02/fragment/PearsonFragment.java b/OrangeSale/app/src/main/java/com/example/orangesale_02/fragment/PearsonFragment.java index 687895d..f5019cb 100644 --- a/OrangeSale/app/src/main/java/com/example/orangesale_02/fragment/PearsonFragment.java +++ b/OrangeSale/app/src/main/java/com/example/orangesale_02/fragment/PearsonFragment.java @@ -1,4 +1,4 @@ -package com.example.orangesale_05.fragment; +package com.example.orangesale_02.fragment; import android.app.Fragment; import android.os.Bundle; @@ -12,7 +12,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.example.orangesale_05.R; +import com.example.orangesale_02.R; public class PearsonFragment extends Fragment implements View.OnClickListener { private ImageView userIconImage; diff --git a/OrangeSale/app/src/main/java/com/example/orangesale_02/fragment/ProductFragment.java b/OrangeSale/app/src/main/java/com/example/orangesale_02/fragment/ProductFragment.java index f8dab79..a45ad60 100644 --- a/OrangeSale/app/src/main/java/com/example/orangesale_02/fragment/ProductFragment.java +++ b/OrangeSale/app/src/main/java/com/example/orangesale_02/fragment/ProductFragment.java @@ -1,4 +1,4 @@ -package com.example.orangesale_05.fragment; +package com.example.orangesale_02.fragment; import android.app.Fragment; import android.os.Bundle; @@ -9,7 +9,7 @@ import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.example.orangesale_05.R; +import com.example.orangesale_02.R; public class ProductFragment extends Fragment { @Nullable diff --git a/OrangeSale/app/src/main/java/com/example/orangesale_02/fragment/ShoppingCartFragment.java b/OrangeSale/app/src/main/java/com/example/orangesale_02/fragment/ShoppingCartFragment.java index 46cc0e3..b65b206 100644 --- a/OrangeSale/app/src/main/java/com/example/orangesale_02/fragment/ShoppingCartFragment.java +++ b/OrangeSale/app/src/main/java/com/example/orangesale_02/fragment/ShoppingCartFragment.java @@ -1,4 +1,4 @@ -package com.example.orangesale_05.fragment; +package com.example.orangesale_02.fragment; import android.app.Fragment; import android.os.Bundle; @@ -9,7 +9,7 @@ import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.example.orangesale_05.R; +import com.example.orangesale_02.R; public class ShoppingCartFragment extends Fragment { @Nullable diff --git a/OrangeSale/app/src/main/res/drawable/pearson.png b/OrangeSale/app/src/main/res/drawable/pearson.png new file mode 100644 index 0000000000000000000000000000000000000000..90cf0eb1a7158704d47ce6b7012e46fd8afa2145 GIT binary patch literal 3302 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 Z?|&mRgtdm$lv4lz002ovPDHLkV1jf(W2yiE literal 0 HcmV?d00001 diff --git a/OrangeSale/app/src/main/res/drawable/shoppingcart.png b/OrangeSale/app/src/main/res/drawable/shoppingcart.png new file mode 100644 index 0000000000000000000000000000000000000000..76c06deb2ed9ec72af4b344e566c37590fb35144 GIT binary patch literal 1155 zcmV-}1bq96P)B7k%u8NqAP+9@^5%T!{O)<@ z-nsV?`|#pEWX1vXUcI&TOsC4_$5Q0{is#M4_nUhK5GPIx+5sES%&t2Su7aAU_+EXm zF@r}RUx?#8Db3BAzHs5rR5m+GV@9FqevqRSCS2gO)m=-a(qBnI^y_!qiI}aFCk6AN zfU}K4@l?Ogld|u+dZa6rR@pQP1wSc>e*JcZ&QvOM07B5dYGtaPwbeRML#gEIT>S>z z4g0Rp=}Pc7fx}w_YXYhQtO}@7sEVi(s!F_0vSxr<6h#XjP+PIKhRMmLor3oS?SdHL zSxI>Uc^Q)vkf)Rfkpqywr44t1vaJCERYBJY)Laux%?;98yI@Gy|8d3lf7{Gg&(MuR zair%AmCJ_)tj$G(sSz(SIVDK4T zK=(Yl4#P{AMzUep8l)k|MVx``8)0$c^z94XF@~*HuG=fqdj;*b0CB4!lg(aU9vk~} zD}5rFc1{V!hIX)Fp}6JSP6T=yIWh71o@P33S@fz)B-6bHk876*bS5aD7QOMf zP^1<^zxdRimdCz?j+^0Lb%~TmufgNm?F9N7r9)w{l#Lrat}ZroCJ3&8I0jxd6Rzc|&Y?_tBVdPelf7XciF z8lH?XXu^ZLlSXQKkTH-86Z*!*6xiO}940UzsRpvKOFRQ~$1>ms$bZ^Cspw+g zCl@D9S3Z5jzzmU)C-O*FgRX;NRHLZD*O;;2Z?E zSJ=2_Q_qEdX(kSMCJ3GZajrvK2T=+A;uEnZVq27*oxNAGKmX5(QHpl5@RAUx@+uv0J3KGYbW z_&zo?&YvI3+%a?ofcyS2w87CP$NXLg;C70jdA-Aa+0}Enw0t*CoN)b(Z=hG_&Mq4S zFN=74P2)bir(A!#b6!{fE*V2ZKeV8eF^wo#b;YAat|*XdXg35yP(6Hf5D`-4m$WO|zn{0H;p V6inAsQ~Ce^002ovPDHLkV1ht8FP8uS literal 0 HcmV?d00001 diff --git a/OrangeSale/app/src/main/res/drawable/shuiguo.png b/OrangeSale/app/src/main/res/drawable/shuiguo.png new file mode 100644 index 0000000000000000000000000000000000000000..d3161376511a914f0d6cd13ef5cd06cedd9d6a5a GIT binary patch literal 1212 zcmV;t1Vj6YP)1mm|F*YD-Knjz|=Cblp%;ExUVEkByCYZ3qY{ezYNalsv5-xOJfFEc~ zOuSH&!7hx{T|lCkIW9K08JGjzN}&}d0rj*~luQ^KFzClQk10@6DQ!>Np^M?%o%25b z|MPqQ?|X9IL%7Q?y36^n3K;JS{XY_Htu}IHljT2|jH;%s)y9d+CQDMh%N2`WE#OdP zlVx)(4dT_P0&J-^cI|7jJRWbeSo9GAKeH4c6dm%bvR>>b;)VkSoddBnid7R9u-Q^v zOGNMc&6)Y4$=F#OYqMB%VFArOCEo$qxd;gSZYtR{~y0w`0^tVxByM+r#P zk^CezHvAC|i0xShua`IaYP9*%x2h8incji}6Bhy=KsUO!3b#U^Vq97%!)aHQpY#(LNlAuVd?c`mEXy}9+rRLDd8*Vd zW${pUf->VhqA*YG_h`68Bd(P ze%X^aArFrw=TmZOF^_?f2%umo2od&+2FFRYfL{T4&Q~mghs%UNv4Py#k@jR<;{rdW z-R?ZA3eZ;+un(toP=2Yu90gQQk%uCyMDTS1;*+ZQPM#t4? zC#E{VaK=2Kf6(iq9M&k4T1A|MPM*a0nkgz8oQxJI=qnSi!Ak4zNP;T~xe6F>x~mDs ao8aFMAE`Ktk!Mu^0000 - + android:orientation="vertical" + tools:context=".IndexActivity"> - + + + + + + + + \ No newline at end of file diff --git a/OrangeSale/app/src/main/res/layout/categoty_detail_content.xml b/OrangeSale/app/src/main/res/layout/categoty_detail_content.xml index 5ba22d4..66f5363 100644 --- a/OrangeSale/app/src/main/res/layout/categoty_detail_content.xml +++ b/OrangeSale/app/src/main/res/layout/categoty_detail_content.xml @@ -41,7 +41,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:background="#FFEFA549"> + > + > @@ -20,12 +20,12 @@ android:layout_marginLeft="1dp" android:layout_marginTop="20dp" android:layout_marginRight="1dp" - android:background="@drawable/index_menu" + android:background="#EDBB64" android:orientation="vertical"> @@ -38,9 +38,9 @@ android:orientation="vertical"> + android:layout_width="79dp" + android:layout_height="89dp" + android:src="@drawable/xuecheng" /> + android:layout_width="76dp" + android:layout_height="87dp" + android:src="@drawable/wendanyou" /> + android:layout_width="77dp" + android:layout_height="89dp" + android:src="@drawable/orange" /> + android:layout_width="80dp" + android:layout_height="87dp" + android:src="@drawable/shali" /> + android:layout_width="77dp" + android:layout_height="82dp" + android:src="@drawable/shali" /> + android:layout_width="76dp" + android:layout_height="82dp" + android:src="@drawable/pingguo" /> + android:layout_width="102dp" + android:layout_height="78dp" + android:src="@drawable/putao" /> @@ -200,22 +200,22 @@ android:orientation="vertical"> + android:layout_width="74dp" + android:layout_height="82dp" + android:src="@drawable/taozi" /> - + \ No newline at end of file diff --git a/OrangeSale/app/src/main/res/layout/content_nav.xml b/OrangeSale/app/src/main/res/layout/content_nav.xml index 2b6b43b..6f2887e 100644 --- a/OrangeSale/app/src/main/res/layout/content_nav.xml +++ b/OrangeSale/app/src/main/res/layout/content_nav.xml @@ -2,7 +2,8 @@ + android:orientation="horizontal" + android:background="#EDBB64"> + android:textSize="12sp" /> + android:textSize="12sp" /> @@ -82,7 +83,7 @@ android:layout_gravity="center" android:text="购物车" android:textColor="#000" - android:textSize="18sp" /> + android:textSize="12sp" /> @@ -112,7 +113,7 @@ android:layout_gravity="center" android:text="我" android:textColor="#000" - android:textSize="18sp" /> + android:textSize="12sp" /> \ No newline at end of file diff --git a/OrangeSale/app/src/main/res/layout/index_famous.xml b/OrangeSale/app/src/main/res/layout/index_famous.xml index b884b44..8703202 100644 --- a/OrangeSale/app/src/main/res/layout/index_famous.xml +++ b/OrangeSale/app/src/main/res/layout/index_famous.xml @@ -2,6 +2,7 @@ @@ -11,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="15dp" - android:background="#FFF" + android:background="#EDBB64" android:orientation="horizontal">