diff --git a/OrangeSale_05/.idea/dbnavigator.xml b/OrangeSale_05/.idea/dbnavigator.xml index b1abb0f..09d6d53 100644 --- a/OrangeSale_05/.idea/dbnavigator.xml +++ b/OrangeSale_05/.idea/dbnavigator.xml @@ -2,143 +2,17 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/OrangeSale_05/.idea/deploymentTargetDropDown.xml b/OrangeSale_05/.idea/deploymentTargetDropDown.xml index 6899890..cd9b515 100644 --- a/OrangeSale_05/.idea/deploymentTargetDropDown.xml +++ b/OrangeSale_05/.idea/deploymentTargetDropDown.xml @@ -12,6 +12,6 @@ - + \ No newline at end of file diff --git a/OrangeSale_05/app/src/main/java/com/example/orangesale_05/activity/CategoryActivity.java b/OrangeSale_05/app/src/main/java/com/example/orangesale_05/activity/CategoryActivity.java index 9b82d77..0c0a2bb 100644 --- a/OrangeSale_05/app/src/main/java/com/example/orangesale_05/activity/CategoryActivity.java +++ b/OrangeSale_05/app/src/main/java/com/example/orangesale_05/activity/CategoryActivity.java @@ -63,15 +63,17 @@ public class CategoryActivity extends Activity { productCategory.add("橙子"); productCategory.add("柚子"); Product product = new Product(); - product.setImageUrlId(R.drawable.arrow_down); + product.setImageUrlId(R.drawable.jz1); product.setProductName("橘子"); product.setProductPrice(new BigDecimal("9.9")); + Product product1 = new Product(); - product1.setImageUrlId(R.drawable.orange); + product1.setImageUrlId(R.drawable.jz1); product1.setProductName("橙子"); product1.setProductPrice(new BigDecimal("29.9")); + Product product2 = new Product(); - product2.setImageUrlId(R.drawable.arrow_left); + product2.setImageUrlId(R.drawable.yz1); product2.setProductName("柚子"); product2.setProductPrice(new BigDecimal("19.9")); productList.add(product); diff --git a/OrangeSale_05/app/src/main/java/com/example/orangesale_05/activity/RegisterActivity.java b/OrangeSale_05/app/src/main/java/com/example/orangesale_05/activity/RegisterActivity.java index 9be3092..edf27e2 100644 --- a/OrangeSale_05/app/src/main/java/com/example/orangesale_05/activity/RegisterActivity.java +++ b/OrangeSale_05/app/src/main/java/com/example/orangesale_05/activity/RegisterActivity.java @@ -25,7 +25,7 @@ public class RegisterActivity extends AppCompatActivity implements View.OnClickL private CityPicker cityPicker; private Button regButton; private RadioGroup sexGroup; - private String sexStr = "男"; + private String sexStr = "女"; @Override diff --git a/OrangeSale_05/app/src/main/java/com/example/orangesale_05/adapter/ProductAdapter.java b/OrangeSale_05/app/src/main/java/com/example/orangesale_05/adapter/ProductAdapter.java index dec9822..003ead5 100644 --- a/OrangeSale_05/app/src/main/java/com/example/orangesale_05/adapter/ProductAdapter.java +++ b/OrangeSale_05/app/src/main/java/com/example/orangesale_05/adapter/ProductAdapter.java @@ -44,9 +44,9 @@ public class ProductAdapter extends BaseAdapter { 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); + viewHolder.productImage = convertView.findViewById(R.id.category_product_image1); + viewHolder.productName = convertView.findViewById(R.id.category_product_name1); + viewHolder.productPrice = convertView.findViewById(R.id.category_product_price1); convertView.setTag(viewHolder); } else { viewHolder = (ViewHolder) convertView.getTag(); diff --git a/OrangeSale_05/app/src/main/java/com/example/orangesale_05/entity/Product.java b/OrangeSale_05/app/src/main/java/com/example/orangesale_05/entity/Product.java index 411aac3..3fc5d60 100644 --- a/OrangeSale_05/app/src/main/java/com/example/orangesale_05/entity/Product.java +++ b/OrangeSale_05/app/src/main/java/com/example/orangesale_05/entity/Product.java @@ -27,8 +27,15 @@ public class Product { public void setImageUrlId(Integer imageUrlId) { this.imageUrlId = imageUrlId; } + public Integer getImageCar() { + return imageCar; + } + + public void setImageCar(Integer imageCar) { + this.imageCar = imageCar; + } - private Integer imageUrlId; + private Integer imageUrlId,imageCar; private String productName; private BigDecimal productPrice; diff --git a/OrangeSale_05/app/src/main/java/com/example/orangesale_05/fragment/IndexFragment.java b/OrangeSale_05/app/src/main/java/com/example/orangesale_05/fragment/IndexFragment.java index 975d9b1..e5f0d83 100644 --- a/OrangeSale_05/app/src/main/java/com/example/orangesale_05/fragment/IndexFragment.java +++ b/OrangeSale_05/app/src/main/java/com/example/orangesale_05/fragment/IndexFragment.java @@ -75,29 +75,35 @@ 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.jz1); product.setProductName("橘子"); product.setProductPrice(new BigDecimal("9.9")); + Product product1 = new Product(); - product1.setImageUrlId(R.drawable.orange); + product1.setImageUrlId(R.drawable.cz2); product1.setProductName("橙子"); product1.setProductPrice(new BigDecimal("29.9")); + Product product2 = new Product(); - product2.setImageUrlId(R.drawable.youzip); + product2.setImageUrlId(R.drawable.yz2); product2.setProductName("柚子"); product2.setProductPrice(new BigDecimal("19.9")); + Product product3 = new Product(); - product3.setImageUrlId(R.drawable.xiguap); + product3.setImageUrlId(R.drawable.xg2); product3.setProductName("西瓜"); product3.setProductPrice(new BigDecimal("19.9")); + Product product4 = new Product(); - product4.setImageUrlId(R.drawable.applep); + product4.setImageUrlId(R.drawable.pg1); product4.setProductName("苹果"); product4.setProductPrice(new BigDecimal("49.9")); + Product product5 = new Product(); - product5.setImageUrlId(R.drawable.lemonp); + product5.setImageUrlId(R.drawable.nm2); product5.setProductName("柠檬"); product5.setProductPrice(new BigDecimal("9.9")); + productList.add(product); productList.add(product1); productList.add(product2); diff --git a/OrangeSale_05/app/src/main/java/com/example/orangesale_05/fragment/SetDetailFragment.java b/OrangeSale_05/app/src/main/java/com/example/orangesale_05/fragment/SetDetailFragment.java index 7b9e60f..9fb60b6 100644 --- a/OrangeSale_05/app/src/main/java/com/example/orangesale_05/fragment/SetDetailFragment.java +++ b/OrangeSale_05/app/src/main/java/com/example/orangesale_05/fragment/SetDetailFragment.java @@ -20,7 +20,7 @@ import java.util.Objects; public class SetDetailFragment extends Fragment { private View view; - private ImageView imageView; + private ImageView imageView,imageCar; private TextView nameText, priceText; @SuppressLint("SetTextI18n") @@ -35,6 +35,7 @@ public class SetDetailFragment extends Fragment { Objects.requireNonNull(categoryActivity).setOnChangeListener(product -> { Log.i("sss", "onCreateView: " + product.getProductName()); imageView.setBackgroundResource(product.getImageUrlId()); + imageCar.setBackgroundResource(product.getImageCar()); nameText.setText(product.getProductName()); priceText.setText(product.getProductPrice().toString()); }); @@ -45,9 +46,10 @@ public class SetDetailFragment extends Fragment { * 内容组件初始化 */ 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); + imageView = view.findViewById(R.id.category_product_image1); + nameText = view.findViewById(R.id.category_product_name1); + priceText = view.findViewById(R.id.category_product_price1); + imageCar = view.findViewById(R.id.category_product_car); } } diff --git a/OrangeSale_05/app/src/main/res/drawable-v24/apple.png b/OrangeSale_05/app/src/main/res/drawable-v24/apple.png deleted file mode 100644 index 0810381..0000000 Binary files a/OrangeSale_05/app/src/main/res/drawable-v24/apple.png and /dev/null differ diff --git a/OrangeSale_05/app/src/main/res/drawable-v24/applep.png b/OrangeSale_05/app/src/main/res/drawable-v24/applep.png deleted file mode 100644 index e26da47..0000000 Binary files a/OrangeSale_05/app/src/main/res/drawable-v24/applep.png and /dev/null differ diff --git a/OrangeSale_05/app/src/main/res/drawable-v24/button_login.xml b/OrangeSale_05/app/src/main/res/drawable-v24/button_login.xml index 290aa07..c13621c 100644 --- a/OrangeSale_05/app/src/main/res/drawable-v24/button_login.xml +++ b/OrangeSale_05/app/src/main/res/drawable-v24/button_login.xml @@ -2,7 +2,7 @@ - + diff --git a/OrangeSale_05/app/src/main/res/drawable-v24/lemon.png b/OrangeSale_05/app/src/main/res/drawable-v24/lemon.png deleted file mode 100644 index 39f12cc..0000000 Binary files a/OrangeSale_05/app/src/main/res/drawable-v24/lemon.png and /dev/null differ diff --git a/OrangeSale_05/app/src/main/res/drawable-v24/lemonp.png b/OrangeSale_05/app/src/main/res/drawable-v24/lemonp.png deleted file mode 100644 index ca5eca8..0000000 Binary files a/OrangeSale_05/app/src/main/res/drawable-v24/lemonp.png and /dev/null differ diff --git a/OrangeSale_05/app/src/main/res/drawable-v24/li.png b/OrangeSale_05/app/src/main/res/drawable-v24/li.png deleted file mode 100644 index 0834592..0000000 Binary files a/OrangeSale_05/app/src/main/res/drawable-v24/li.png and /dev/null differ diff --git a/OrangeSale_05/app/src/main/res/drawable-v24/xigua.png b/OrangeSale_05/app/src/main/res/drawable-v24/xigua.png deleted file mode 100644 index 20275c1..0000000 Binary files a/OrangeSale_05/app/src/main/res/drawable-v24/xigua.png and /dev/null differ diff --git a/OrangeSale_05/app/src/main/res/drawable-v24/xiguap.png b/OrangeSale_05/app/src/main/res/drawable-v24/xiguap.png deleted file mode 100644 index b760712..0000000 Binary files a/OrangeSale_05/app/src/main/res/drawable-v24/xiguap.png and /dev/null differ diff --git a/OrangeSale_05/app/src/main/res/drawable/bl1.png b/OrangeSale_05/app/src/main/res/drawable/bl1.png new file mode 100644 index 0000000..0087f85 Binary files /dev/null and b/OrangeSale_05/app/src/main/res/drawable/bl1.png differ diff --git a/OrangeSale_05/app/src/main/res/drawable/cz1.png b/OrangeSale_05/app/src/main/res/drawable/cz1.png new file mode 100644 index 0000000..c73feb2 Binary files /dev/null and b/OrangeSale_05/app/src/main/res/drawable/cz1.png differ diff --git a/OrangeSale_05/app/src/main/res/drawable/cz2.png b/OrangeSale_05/app/src/main/res/drawable/cz2.png new file mode 100644 index 0000000..9d25b30 Binary files /dev/null and b/OrangeSale_05/app/src/main/res/drawable/cz2.png differ diff --git a/OrangeSale_05/app/src/main/res/drawable/gwc.png b/OrangeSale_05/app/src/main/res/drawable/gwc.png new file mode 100644 index 0000000..e98e37c Binary files /dev/null and b/OrangeSale_05/app/src/main/res/drawable/gwc.png differ diff --git a/OrangeSale_05/app/src/main/res/drawable/gwc1.png b/OrangeSale_05/app/src/main/res/drawable/gwc1.png new file mode 100644 index 0000000..b61140d Binary files /dev/null and b/OrangeSale_05/app/src/main/res/drawable/gwc1.png differ diff --git a/OrangeSale_05/app/src/main/res/drawable/hlg1.png b/OrangeSale_05/app/src/main/res/drawable/hlg1.png new file mode 100644 index 0000000..ec5934e Binary files /dev/null and b/OrangeSale_05/app/src/main/res/drawable/hlg1.png differ diff --git a/OrangeSale_05/app/src/main/res/drawable/huo.png b/OrangeSale_05/app/src/main/res/drawable/huo.png new file mode 100644 index 0000000..b3187c1 Binary files /dev/null and b/OrangeSale_05/app/src/main/res/drawable/huo.png differ diff --git a/OrangeSale_05/app/src/main/res/drawable/jz1.png b/OrangeSale_05/app/src/main/res/drawable/jz1.png new file mode 100644 index 0000000..16af8c7 Binary files /dev/null and b/OrangeSale_05/app/src/main/res/drawable/jz1.png differ diff --git a/OrangeSale_05/app/src/main/res/drawable/ll1.png b/OrangeSale_05/app/src/main/res/drawable/ll1.png new file mode 100644 index 0000000..bebf5d4 Binary files /dev/null and b/OrangeSale_05/app/src/main/res/drawable/ll1.png differ diff --git a/OrangeSale_05/app/src/main/res/drawable/mg1.png b/OrangeSale_05/app/src/main/res/drawable/mg1.png new file mode 100644 index 0000000..8404ad1 Binary files /dev/null and b/OrangeSale_05/app/src/main/res/drawable/mg1.png differ diff --git a/OrangeSale_05/app/src/main/res/drawable/momo.png b/OrangeSale_05/app/src/main/res/drawable/momo.png new file mode 100644 index 0000000..ed6a8ff Binary files /dev/null and b/OrangeSale_05/app/src/main/res/drawable/momo.png differ diff --git a/OrangeSale_05/app/src/main/res/drawable/nm1.png b/OrangeSale_05/app/src/main/res/drawable/nm1.png new file mode 100644 index 0000000..3d4cd21 Binary files /dev/null and b/OrangeSale_05/app/src/main/res/drawable/nm1.png differ diff --git a/OrangeSale_05/app/src/main/res/drawable/nm2.png b/OrangeSale_05/app/src/main/res/drawable/nm2.png new file mode 100644 index 0000000..24dae16 Binary files /dev/null and b/OrangeSale_05/app/src/main/res/drawable/nm2.png differ diff --git a/OrangeSale_05/app/src/main/res/drawable/pg1.png b/OrangeSale_05/app/src/main/res/drawable/pg1.png new file mode 100644 index 0000000..fdafa8f Binary files /dev/null and b/OrangeSale_05/app/src/main/res/drawable/pg1.png differ diff --git a/OrangeSale_05/app/src/main/res/drawable/pg2.png b/OrangeSale_05/app/src/main/res/drawable/pg2.png new file mode 100644 index 0000000..32f9efa Binary files /dev/null and b/OrangeSale_05/app/src/main/res/drawable/pg2.png differ diff --git a/OrangeSale_05/app/src/main/res/drawable/shouye.png b/OrangeSale_05/app/src/main/res/drawable/shouye.png new file mode 100644 index 0000000..4674237 Binary files /dev/null and b/OrangeSale_05/app/src/main/res/drawable/shouye.png differ diff --git a/OrangeSale_05/app/src/main/res/drawable/xg1.png b/OrangeSale_05/app/src/main/res/drawable/xg1.png new file mode 100644 index 0000000..31fd667 Binary files /dev/null and b/OrangeSale_05/app/src/main/res/drawable/xg1.png differ diff --git a/OrangeSale_05/app/src/main/res/drawable/xg2.png b/OrangeSale_05/app/src/main/res/drawable/xg2.png new file mode 100644 index 0000000..97bafd0 Binary files /dev/null and b/OrangeSale_05/app/src/main/res/drawable/xg2.png differ diff --git a/OrangeSale_05/app/src/main/res/drawable/xigua.png b/OrangeSale_05/app/src/main/res/drawable/xigua.png new file mode 100644 index 0000000..37b1b68 Binary files /dev/null and b/OrangeSale_05/app/src/main/res/drawable/xigua.png differ diff --git a/OrangeSale_05/app/src/main/res/drawable/xl1.png b/OrangeSale_05/app/src/main/res/drawable/xl1.png new file mode 100644 index 0000000..25e84f2 Binary files /dev/null and b/OrangeSale_05/app/src/main/res/drawable/xl1.png differ diff --git a/OrangeSale_05/app/src/main/res/drawable/yz1.png b/OrangeSale_05/app/src/main/res/drawable/yz1.png new file mode 100644 index 0000000..3506b1c Binary files /dev/null and b/OrangeSale_05/app/src/main/res/drawable/yz1.png differ diff --git a/OrangeSale_05/app/src/main/res/drawable/yz2.png b/OrangeSale_05/app/src/main/res/drawable/yz2.png new file mode 100644 index 0000000..7902c77 Binary files /dev/null and b/OrangeSale_05/app/src/main/res/drawable/yz2.png differ diff --git a/OrangeSale_05/app/src/main/res/drawable/zhuye.png b/OrangeSale_05/app/src/main/res/drawable/zhuye.png new file mode 100644 index 0000000..fec63ce Binary files /dev/null and b/OrangeSale_05/app/src/main/res/drawable/zhuye.png differ diff --git a/OrangeSale_05/app/src/main/res/layout/category_list_item.xml b/OrangeSale_05/app/src/main/res/layout/category_list_item.xml index 09e87d8..cc72069 100644 --- a/OrangeSale_05/app/src/main/res/layout/category_list_item.xml +++ b/OrangeSale_05/app/src/main/res/layout/category_list_item.xml @@ -6,9 +6,9 @@ \ No newline at end of file diff --git a/OrangeSale_05/app/src/main/res/layout/categoty_detail_content.xml b/OrangeSale_05/app/src/main/res/layout/categoty_detail_content.xml index b3972c2..428bac8 100644 --- a/OrangeSale_05/app/src/main/res/layout/categoty_detail_content.xml +++ b/OrangeSale_05/app/src/main/res/layout/categoty_detail_content.xml @@ -2,31 +2,50 @@ - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + diff --git a/OrangeSale_05/app/src/main/res/layout/content_category.xml b/OrangeSale_05/app/src/main/res/layout/content_category.xml index 7c73e75..9c65bdf 100644 --- a/OrangeSale_05/app/src/main/res/layout/content_category.xml +++ b/OrangeSale_05/app/src/main/res/layout/content_category.xml @@ -9,7 +9,7 @@ + android:layout_weight="4"/> \ No newline at end of file diff --git a/OrangeSale_05/app/src/main/res/layout/content_index.xml b/OrangeSale_05/app/src/main/res/layout/content_index.xml index d935945..e425e67 100644 --- a/OrangeSale_05/app/src/main/res/layout/content_index.xml +++ b/OrangeSale_05/app/src/main/res/layout/content_index.xml @@ -38,9 +38,9 @@ android:orientation="vertical"> + android:layout_width="80dp" + android:layout_height="80dp" + android:src="@drawable/cz1" /> + android:layout_width="80dp" + android:layout_height="80dp" + android:src="@drawable/yz1" /> + android:layout_width="80dp" + android:layout_height="80dp" + android:src="@drawable/jz1" /> + android:layout_width="80dp" + android:layout_height="80dp" + android:src="@drawable/xg1" /> + android:layout_width="80dp" + android:layout_height="80dp" + android:src="@drawable/xl1" /> + android:layout_width="80dp" + android:layout_height="80dp" + android:src="@drawable/pg2" /> + android:layout_width="80dp" + android:layout_height="80dp" + android:src="@drawable/nm1" /> + android:layout_width="80dp" + android:layout_height="80dp" + android:src="@drawable/mg1" /> + android:src="@drawable/shouye" /> + android:src="@drawable/xigua" /> + android:src="@drawable/gwc" /> + android:src="@drawable/zhuye" /> + android:src="@drawable/momo" /> + + android:textSize="18sp"/> + + + + + + + + + + + android:src="@drawable/xigua" /> + android:text="YaYa水果店" /> + android:src="@drawable/xigua" /> + android:text="YaYa水果店" /> + android:hint="用户名 10位" /> @@ -70,7 +70,7 @@ android:textAlignment="center" android:maxLength="16" android:maxLines="1" - android:hint="密码 6-16位" /> + android:hint="密码 6-16位" /> @@ -116,11 +116,11 @@ @@ -158,11 +158,11 @@ android:id="@+id/reg_register" android:layout_width="280dp" android:layout_height="50dp" - android:layout_marginTop="50dp" + android:layout_marginTop="30dp" android:textSize="18sp" android:layout_gravity="center_horizontal" android:background="@drawable/button_login" android:textColor="#FFFFFF" - android:text="注 册" /> + android:text="注 册" /> \ No newline at end of file diff --git a/OrangeSale_05/app/src/main/res/values/colors.xml b/OrangeSale_05/app/src/main/res/values/colors.xml index 6b3f6ab..a0acea2 100644 --- a/OrangeSale_05/app/src/main/res/values/colors.xml +++ b/OrangeSale_05/app/src/main/res/values/colors.xml @@ -3,4 +3,27 @@ #008577 #00574B #D81B60 + #00ff00 + #ffffff + #ff0000 + #0000ff + #ff00ff + #00ffff + #ffff00 + #000000 + #ff7f00 + #9932cd + #871f78 + #db7093 + #ff6ec7 + #4f2f4f + #990033 + #ff3399 + #ff6699 + #ff9999 + #ff3366 + #cc0033 + #ff0033 + #ff0066 + diff --git a/OrangeSale_05/app/src/main/res/values/strings.xml b/OrangeSale_05/app/src/main/res/values/strings.xml index 02daafe..303fe8e 100644 --- a/OrangeSale_05/app/src/main/res/values/strings.xml +++ b/OrangeSale_05/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - 橙一色 + Melon 用户名： 密    码： diff --git a/OrangeSale_05/app/src/main/res/values/styles.xml b/OrangeSale_05/app/src/main/res/values/styles.xml index 6f19b47..7a62090 100644 --- a/OrangeSale_05/app/src/main/res/values/styles.xml +++ b/OrangeSale_05/app/src/main/res/values/styles.xml @@ -4,8 +4,8 @@