diff --git a/.idea/dbnavigator.xml b/.idea/dbnavigator.xml index fe90152..9014864 100644 --- a/.idea/dbnavigator.xml +++ b/.idea/dbnavigator.xml @@ -1,404 +1,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
+ diff --git a/app/src/main/java/com/example/orangesale_05/fragment/IndexFragment.java b/app/src/main/java/com/example/orangesale_05/fragment/IndexFragment.java index 8c52473..bcd03e4 100644 --- a/app/src/main/java/com/example/orangesale_05/fragment/IndexFragment.java +++ b/app/src/main/java/com/example/orangesale_05/fragment/IndexFragment.java @@ -75,27 +75,27 @@ public class IndexFragment extends Fragment implements View.OnClickListener { private void initData() { productList = new ArrayList<>(); Product product = new Product(); - product.setImageUrlId(R.drawable.juzip); - product.setProductName("橘子"); + product.setImageUrlId(R.drawable.bl); + product.setProductName("菠萝"); product.setProductPrice(new BigDecimal("9.9")); Product product1 = new Product(); - product1.setImageUrlId(R.drawable.orange); + product1.setImageUrlId(R.drawable.cz); product1.setProductName("橙子"); product1.setProductPrice(new BigDecimal("29.9")); Product product2 = new Product(); - product2.setImageUrlId(R.drawable.youzip); + product2.setImageUrlId(R.drawable.yzz); product2.setProductName("柚子"); product2.setProductPrice(new BigDecimal("19.9")); Product product3 = new Product(); - product3.setImageUrlId(R.drawable.xiguap); + product3.setImageUrlId(R.drawable.xgg); product3.setProductName("西瓜"); product3.setProductPrice(new BigDecimal("19.9")); Product product4 = new Product(); - product4.setImageUrlId(R.drawable.applep); + product4.setImageUrlId(R.drawable.pgg); product4.setProductName("苹果"); product4.setProductPrice(new BigDecimal("49.9")); Product product5 = new Product(); - product5.setImageUrlId(R.drawable.lemonp); + product5.setImageUrlId(R.drawable.nmm); product5.setProductName("柠檬"); product5.setProductPrice(new BigDecimal("9.9")); productList.add(product); diff --git a/app/src/main/res/drawable-v24/bl.jpg b/app/src/main/res/drawable-v24/bl.jpg new file mode 100644 index 0000000..403c270 Binary files /dev/null and b/app/src/main/res/drawable-v24/bl.jpg differ diff --git a/app/src/main/res/drawable-v24/boluo.jpg b/app/src/main/res/drawable-v24/boluo.jpg new file mode 100644 index 0000000..fe7e63d Binary files /dev/null and b/app/src/main/res/drawable-v24/boluo.jpg differ diff --git a/app/src/main/res/drawable-v24/cz.jpg b/app/src/main/res/drawable-v24/cz.jpg new file mode 100644 index 0000000..294b2bc Binary files /dev/null and b/app/src/main/res/drawable-v24/cz.jpg differ diff --git a/app/src/main/res/drawable-v24/jz.jpg b/app/src/main/res/drawable-v24/jz.jpg new file mode 100644 index 0000000..558e6fd Binary files /dev/null and b/app/src/main/res/drawable-v24/jz.jpg differ diff --git a/app/src/main/res/drawable-v24/lz.jpg b/app/src/main/res/drawable-v24/lz.jpg new file mode 100644 index 0000000..c17b808 Binary files /dev/null and b/app/src/main/res/drawable-v24/lz.jpg differ diff --git a/app/src/main/res/drawable-v24/mg.jpg b/app/src/main/res/drawable-v24/mg.jpg new file mode 100644 index 0000000..a0bdd84 Binary files /dev/null and b/app/src/main/res/drawable-v24/mg.jpg differ diff --git a/app/src/main/res/drawable-v24/nm.jpg b/app/src/main/res/drawable-v24/nm.jpg new file mode 100644 index 0000000..61f38d5 Binary files /dev/null and b/app/src/main/res/drawable-v24/nm.jpg differ diff --git a/app/src/main/res/drawable-v24/nmm.jpg b/app/src/main/res/drawable-v24/nmm.jpg new file mode 100644 index 0000000..d4a847d Binary files /dev/null and b/app/src/main/res/drawable-v24/nmm.jpg differ diff --git a/app/src/main/res/drawable-v24/pg.jpg b/app/src/main/res/drawable-v24/pg.jpg new file mode 100644 index 0000000..6d18c6c Binary files /dev/null and b/app/src/main/res/drawable-v24/pg.jpg differ diff --git a/app/src/main/res/drawable-v24/pgg.jpg b/app/src/main/res/drawable-v24/pgg.jpg new file mode 100644 index 0000000..f01c6d5 Binary files /dev/null and b/app/src/main/res/drawable-v24/pgg.jpg differ diff --git a/app/src/main/res/drawable-v24/xg.jpg b/app/src/main/res/drawable-v24/xg.jpg new file mode 100644 index 0000000..eb79173 Binary files /dev/null and b/app/src/main/res/drawable-v24/xg.jpg differ diff --git a/app/src/main/res/drawable-v24/xgg.jpg b/app/src/main/res/drawable-v24/xgg.jpg new file mode 100644 index 0000000..4aed6d5 Binary files /dev/null and b/app/src/main/res/drawable-v24/xgg.jpg differ diff --git a/app/src/main/res/drawable-v24/yz.jpg b/app/src/main/res/drawable-v24/yz.jpg new file mode 100644 index 0000000..a6a0bf0 Binary files /dev/null and b/app/src/main/res/drawable-v24/yz.jpg differ diff --git a/app/src/main/res/drawable-v24/yzz.jpg b/app/src/main/res/drawable-v24/yzz.jpg new file mode 100644 index 0000000..9c80069 Binary files /dev/null and b/app/src/main/res/drawable-v24/yzz.jpg differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index dfe67c8..1daa411 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -17,7 +17,7 @@ + android:numColumns="3" + android:verticalSpacing="10dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/content_index.xml b/app/src/main/res/layout/content_index.xml index 7fa926d..b7b72b4 100644 --- a/app/src/main/res/layout/content_index.xml +++ b/app/src/main/res/layout/content_index.xml @@ -38,9 +38,9 @@ android:orientation="vertical"> + android:layout_width="80dp" + android:layout_height="86dp" + android:src="@drawable/cz" /> + android:layout_width="80dp" + android:layout_height="86dp" + android:src="@drawable/yz" /> + android:layout_width="80dp" + android:layout_height="86dp" + android:src="@drawable/jz" /> + android:layout_width="80dp" + android:layout_height="86dp" + android:src="@drawable/xg" /> + android:layout_width="80dp" + android:layout_height="86dp" + android:src="@drawable/lz" /> + android:layout_width="80dp" + android:layout_height="86dp" + android:src="@drawable/pg" /> + android:layout_width="80dp" + android:layout_height="86dp" + android:src="@drawable/nm" /> + android:layout_width="80dp" + android:layout_height="86dp" + android:src="@drawable/mg" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout/index_famous.xml b/app/src/main/res/layout/index_famous.xml index b884b44..45ae1ce 100644 --- a/app/src/main/res/layout/index_famous.xml +++ b/app/src/main/res/layout/index_famous.xml @@ -16,7 +16,7 @@ + android:numColumns="2" + android:verticalSpacing="10dp" />