init

OrangeSale_05/.idea/dbnavigator.xml

@@ -2,143 +2,17 @@
 <project version="4">
   <component name="DBNavigator.Project.DataEditorManager">
     <record-view-column-sorting-type value="BY_INDEX" />
-    <value-preview-text-wrapping value="false" />
+    <value-preview-text-wrapping value="true" />
     <value-preview-pinned value="false" />
   </component>
-  <component name="DBNavigator.Project.DatabaseBrowserManager">
-    <autoscroll-to-editor value="false" />
-    <autoscroll-from-editor value="true" />
-    <show-object-properties value="true" />
-    <loaded-nodes />
-  </component>
-  <component name="DBNavigator.Project.DatabaseConsoleManager">
-    <connection id="8a1d967a-5af9-45f7-bdf5-80713a7a4082">
-      <console name="Connection" type="STANDARD" schema="" session="Main" />
-    </connection>
-  </component>
   <component name="DBNavigator.Project.DatabaseEditorStateManager">
     <last-used-providers />
   </component>
   <component name="DBNavigator.Project.DatabaseFileManager">
-    <open-files>
+    <open-files />
-      <object connection-id="8a1d967a-5af9-45f7-bdf5-80713a7a4082" object-ref="schemas/main/tables/orange_user" />
-      <object connection-id="8a1d967a-5af9-45f7-bdf5-80713a7a4082" object-ref="schemas/main/tables/android_metadata" />
-    </open-files>
-  </component>
-  <component name="DBNavigator.Project.DatasetFilterManager">
-    <filter-actions connection-id="8a1d967a-5af9-45f7-bdf5-80713a7a4082" dataset="main.sqlite_sequence" active-filter-id="e4327f92-5d4e-4d88-bc24-7e22bf7370f8">
-      <filter id="e4327f92-5d4e-4d88-bc24-7e22bf7370f8" name="1" temporary="false" custom-name="false" type="basic" join-type="AND">
-        <condition column="name" operator="=" value="1" active="true" />
-      </filter>
-    </filter-actions>
-    <filter-actions connection-id="8a1d967a-5af9-45f7-bdf5-80713a7a4082" dataset="main.android_metadata" active-filter-id="59bd37ee-f7b1-4914-897a-8980cf03eac2">
-      <filter id="59bd37ee-f7b1-4914-897a-8980cf03eac2" name="1" temporary="false" custom-name="false" type="basic" join-type="AND">
-        <condition column="locale" operator="=" value="1" active="true" />
-      </filter>
-    </filter-actions>
-    <filter-actions connection-id="8a1d967a-5af9-45f7-bdf5-80713a7a4082" dataset="main.orange_user" active-filter-id="5bd39f6e-7ba0-4c9a-b2b7-415e578149d2">
-      <filter id="6f3a706d-8b5f-4487-b01c-9a6c79c5dcc4" name="2" temporary="false" custom-name="false" type="basic" join-type="AND">
-        <condition column="id" operator="=" value="2" active="true" />
-      </filter>
-      <filter id="5bd39f6e-7ba0-4c9a-b2b7-415e578149d2" name="1" temporary="false" custom-name="false" type="basic" join-type="AND">
-        <condition column="id" operator="=" value="1" active="true" />
-      </filter>
-    </filter-actions>
-  </component>
-  <component name="DBNavigator.Project.ObjectQuickFilterManager">
-    <last-used-operator value="EQUAL" />
-    <filters />
   </component>
   <component name="DBNavigator.Project.Settings">
-    <connections>
+    <connections />
-      <connection id="8a1d967a-5af9-45f7-bdf5-80713a7a4082" active="true" signed="true">
-        <database>
-          <name value="Connection" />
-          <description value="" />
-          <database-type value="SQLITE" />
-          <config-type value="BASIC" />
-          <database-version value="3.39" />
-          <driver-source value="BUILTIN" />
-          <driver-library value="" />
-          <driver value="" />
-          <url-type value="FILE" />
-          <host value="" />
-          <port value="" />
-          <database value="" />
-          <files>
-            <file path="D:\aAndroid_code\chapter6\orange.db3" schema="main" />
-          </files>
-          <type value="NONE" />
-          <user value="" />
-          <deprecated-pwd value="" />
-        </database>
-        <properties>
-          <auto-commit value="false" />
-        </properties>
-        <ssh-settings>
-          <active value="false" />
-          <proxy-host value="" />
-          <proxy-port value="22" />
-          <proxy-user value="" />
-          <deprecated-proxy-pwd value="" />
-          <auth-type value="PASSWORD" />
-          <key-file value="" />
-          <key-passphrase value="" />
-        </ssh-settings>
-        <ssl-settings>
-          <active value="false" />
-          <certificate-authority-file value="" />
-          <client-certificate-file value="" />
-          <client-key-file value="" />
-        </ssl-settings>
-        <details>
-          <charset value="UTF-8" />
-          <session-management value="true" />
-          <ddl-file-binding value="true" />
-          <database-logging value="true" />
-          <connect-automatically value="true" />
-          <restore-workspace value="true" />
-          <restore-workspace-deep value="false" />
-          <environment-type value="default" />
-          <connectivity-timeout value="10" />
-          <idle-time-to-disconnect value="30" />
-          <idle-time-to-disconnect-pool value="5" />
-          <credential-expiry-time value="10" />
-          <max-connection-pool-size value="7" />
-          <alternative-statement-delimiter value="" />
-        </details>
-        <object-filters hide-empty-schemas="false" hide-pseudo-columns="false">
-          <object-type-filter>
-            <object-type name="SCHEMA" enabled="true" />
-            <object-type name="USER" enabled="true" />
-            <object-type name="ROLE" enabled="true" />
-            <object-type name="PRIVILEGE" enabled="true" />
-            <object-type name="CHARSET" enabled="true" />
-            <object-type name="TABLE" enabled="true" />
-            <object-type name="VIEW" enabled="true" />
-            <object-type name="MATERIALIZED_VIEW" enabled="true" />
-            <object-type name="NESTED_TABLE" enabled="true" />
-            <object-type name="COLUMN" enabled="true" />
-            <object-type name="INDEX" enabled="true" />
-            <object-type name="CONSTRAINT" enabled="true" />
-            <object-type name="DATASET_TRIGGER" enabled="true" />
-            <object-type name="DATABASE_TRIGGER" enabled="true" />
-            <object-type name="SYNONYM" enabled="true" />
-            <object-type name="SEQUENCE" enabled="true" />
-            <object-type name="PROCEDURE" enabled="true" />
-            <object-type name="FUNCTION" enabled="true" />
-            <object-type name="PACKAGE" enabled="true" />
-            <object-type name="TYPE" enabled="true" />
-            <object-type name="TYPE_ATTRIBUTE" enabled="true" />
-            <object-type name="ARGUMENT" enabled="true" />
-            <object-type name="DIMENSION" enabled="true" />
-            <object-type name="CLUSTER" enabled="true" />
-            <object-type name="DBLINK" enabled="true" />
-          </object-type-filter>
-          <object-name-filters />
-        </object-filters>
-      </connection>
-    </connections>
     <browser-settings>
       <general>
         <display-mode value="TABBED" />

OrangeSale_05/.idea/deploymentTargetDropDown.xml

@@ -12,6 +12,6 @@
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-04-12T08:47:39.533804100Z" />
+    <timeTargetWasSelectedWithDropDown value="2023-04-24T12:42:06.815400300Z" />
   </component>
 </project>

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);

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

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.productImage = convertView.findViewById(R.id.category_product_image1);
-            viewHolder.productName = convertView.findViewById(R.id.category_product_name);
+            viewHolder.productName = convertView.findViewById(R.id.category_product_name1);
-            viewHolder.productPrice = convertView.findViewById(R.id.category_product_price);
+            viewHolder.productPrice = convertView.findViewById(R.id.category_product_price1);
             convertView.setTag(viewHolder);
         } else {
             viewHolder = (ViewHolder) convertView.getTag();

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;
 

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);

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);
+        imageView = view.findViewById(R.id.category_product_image1);
-        nameText = view.findViewById(R.id.category_product_name);
+        nameText = view.findViewById(R.id.category_product_name1);
-        priceText = view.findViewById(R.id.category_product_price);
+        priceText = view.findViewById(R.id.category_product_price1);
+        imageCar = view.findViewById(R.id.category_product_car);
     }
 
 }

OrangeSale_05/app/src/main/res/drawable-v24/button_login.xml

@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="false">
         <shape>
-            <solid android:color="#EFB81C" />
+            <solid android:color="@color/h4" />
             <corners android:radius="5dp" />
         </shape>
     </item>

OrangeSale_05/app/src/main/res/layout/category_list_item.xml

@@ -6,9 +6,9 @@
 
     <TextView
         android:id="@+id/categor_titles"
-        android:layout_width="match_parent"
+        android:layout_width="100dp"
         android:gravity="center"
-        android:layout_height="wrap_content"
+        android:layout_height="60dp"
         android:textSize="18sp"
         android:text="标题" />
 </LinearLayout>

OrangeSale_05/app/src/main/res/layout/categoty_detail_content.xml

@@ -2,31 +2,50 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#fff"
     android:orientation="vertical">
-    <ImageView
+
-        android:id="@+id/category_product_image"
+    <LinearLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
-        android:layout_marginTop="5dp"
+        android:layout_height="match_parent"
-        android:layout_height="wrap_content"
+        android:orientation="horizontal">
-        android:layout_gravity="center" />
+        <ImageView
-
+            android:id="@+id/category_product_image1"
-    <TextView
+            android:layout_width="100dp"
-        android:id="@+id/category_product_name"
+            android:layout_height="100dp"
-        android:layout_width="wrap_content"
+            android:layout_gravity="left"
-        android:layout_height="30dp"
+            android:layout_marginLeft="10dp"
-        android:layout_gravity="center"
+            android:layout_marginTop="20dp"/>
-        android:layout_marginTop="2dp"
+
-        android:textColor="#050505"
+        <LinearLayout
-        android:textSize="16sp" />
+            android:layout_width="match_parent"
-
+            android:layout_height="wrap_content"
-    <TextView
+            android:orientation="vertical">
-        android:id="@+id/category_product_price"
+            <TextView
-        android:layout_width="wrap_content"
+                android:id="@+id/category_product_name1"
-        android:layout_height="30dp"
+                android:layout_width="wrap_content"
-        android:layout_gravity="center"
+                android:layout_height="30dp"
-        android:layout_marginTop="2dp"
+                android:layout_marginTop="50dp"
-        android:gravity="center"
+                android:textColor="#050505"
-        android:textColor="#050505"
+                android:textSize="23sp"
-        android:textSize="16sp" />
+                android:textStyle="bold"/>
-</LinearLayout>
+
+            <TextView
+                android:id="@+id/category_product_price1"
+                android:layout_width="wrap_content"
+                android:layout_height="30dp"
+                android:textColor="#050505"
+                android:textSize="23sp"
+                android:textStyle="bold"/>
+            <ImageView
+                android:id="@+id/category_product_car"
+                android:layout_width="35dp"
+                android:layout_height="35dp"
+                android:layout_gravity="right"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
+</LinearLayout>
+
+
+

OrangeSale_05/app/src/main/res/layout/content_category.xml

@@ -9,7 +9,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="50dp"
-        android:background="#EFB81C"
+        android:background="@color/h5"
         android:orientation="horizontal">
 
         <ImageView
@@ -46,7 +46,7 @@
             android:id="@+id/category_detail"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="3" />
+            android:layout_weight="4"/>
     </LinearLayout>
 
 </LinearLayout>

OrangeSale_05/app/src/main/res/layout/content_index.xml

@@ -38,9 +38,9 @@
                 android:orientation="vertical">
 
                 <ImageView
-                    android:layout_width="wrap_content"
+                    android:layout_width="80dp"
-                    android:layout_height="wrap_content"
+                    android:layout_height="80dp"
-                    android:src="@drawable/chengzi" />
+                    android:src="@drawable/cz1" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -60,9 +60,9 @@
                 android:orientation="vertical">
 
                 <ImageView
-                    android:layout_width="wrap_content"
+                    android:layout_width="80dp"
-                    android:layout_height="wrap_content"
+                    android:layout_height="80dp"
-                    android:src="@drawable/youzi" />
+                    android:src="@drawable/yz1" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -82,9 +82,9 @@
                 android:orientation="vertical">
 
                 <ImageView
-                    android:layout_width="wrap_content"
+                    android:layout_width="80dp"
-                    android:layout_height="wrap_content"
+                    android:layout_height="80dp"
-                    android:src="@drawable/juzi" />
+                    android:src="@drawable/jz1" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -104,9 +104,9 @@
                 android:orientation="vertical">
 
                 <ImageView
-                    android:layout_width="wrap_content"
+                    android:layout_width="80dp"
-                    android:layout_height="wrap_content"
+                    android:layout_height="80dp"
-                    android:src="@drawable/xigua" />
+                    android:src="@drawable/xg1" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -134,9 +134,9 @@
                 android:orientation="vertical">
 
                 <ImageView
-                    android:layout_width="wrap_content"
+                    android:layout_width="80dp"
-                    android:layout_height="wrap_content"
+                    android:layout_height="80dp"
-                    android:src="@drawable/li" />
+                    android:src="@drawable/xl1" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -156,9 +156,9 @@
                 android:orientation="vertical">
 
                 <ImageView
-                    android:layout_width="wrap_content"
+                    android:layout_width="80dp"
-                    android:layout_height="wrap_content"
+                    android:layout_height="80dp"
-                    android:src="@drawable/apple" />
+                    android:src="@drawable/pg2" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -178,9 +178,9 @@
                 android:orientation="vertical">
 
                 <ImageView
-                    android:layout_width="wrap_content"
+                    android:layout_width="80dp"
-                    android:layout_height="wrap_content"
+                    android:layout_height="80dp"
-                    android:src="@drawable/lemon" />
+                    android:src="@drawable/nm1" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -200,9 +200,9 @@
                 android:orientation="vertical">
 
                 <ImageView
-                    android:layout_width="wrap_content"
+                    android:layout_width="80dp"
-                    android:layout_height="wrap_content"
+                    android:layout_height="80dp"
-                    android:src="@drawable/mangguo" />
+                    android:src="@drawable/mg1" />
 
                 <TextView
                     android:layout_width="wrap_content"

OrangeSale_05/app/src/main/res/layout/content_nav.xml

@@ -13,11 +13,11 @@
         android:orientation="vertical">
 
         <ImageView
-            android:layout_width="wrap_content"
+            android:layout_width="45dp"
-            android:layout_height="wrap_content"
+            android:layout_height="45dp"
             android:layout_gravity="center"
             android:layout_marginTop="2dp"
-            android:src="@drawable/index" />
+            android:src="@drawable/shouye" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -41,11 +41,11 @@
         android:orientation="vertical">
 
         <ImageView
-            android:layout_width="wrap_content"
+            android:layout_width="45dp"
-            android:layout_height="wrap_content"
+            android:layout_height="45dp"
             android:layout_gravity="center"
             android:layout_marginTop="2dp"
-            android:src="@drawable/product" />
+            android:src="@drawable/xigua" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -71,10 +71,10 @@
         android:orientation="vertical">
 
         <ImageView
-            android:layout_width="wrap_content"
+            android:layout_width="45dp"
-            android:layout_height="wrap_content"
+            android:layout_height="45dp"
             android:layout_gravity="center"
-            android:src="@drawable/shoppingcart" />
+            android:src="@drawable/gwc" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -101,10 +101,10 @@
         android:orientation="vertical">
 
         <ImageView
-            android:layout_width="wrap_content"
+            android:layout_width="45dp"
-            android:layout_height="wrap_content"
+            android:layout_height="45dp"
             android:layout_gravity="center"
-            android:src="@drawable/pearson" />
+            android:src="@drawable/zhuye" />
 
         <TextView
             android:layout_width="wrap_content"

OrangeSale_05/app/src/main/res/layout/content_user.xml

@@ -7,11 +7,11 @@
 
     <ImageView
         android:id="@+id/user_icon"
-        android:layout_width="wrap_content"
+        android:layout_width="80dp"
-        android:layout_height="wrap_content"
+        android:layout_height="80dp"
         android:layout_marginTop="20dp"
         android:layout_gravity="center_horizontal"
-        android:src="@drawable/user_icon" />
+        android:src="@drawable/momo" />
 
     <!--卡券-->
     <LinearLayout
@@ -224,7 +224,7 @@
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:textSize="18sp"
-        android:layout_marginTop="90dp"
+        android:layout_marginTop="60dp"
         android:text="退出登录"
         android:textColor="#FFFFFF"
         android:layout_gravity="center"

OrangeSale_05/app/src/main/res/layout/index_famous.xml

@@ -13,18 +13,29 @@
         android:layout_marginTop="15dp"
         android:background="#FFF"
         android:orientation="horizontal">
+        <ImageView
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            android:src="@drawable/huo"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="50dp"
-            android:layout_marginLeft="5dp"
             android:layout_weight="1"
-            android:drawableLeft="@drawable/shuiguo"
-            android:drawablePadding="8dp"
-            android:gravity="center_vertical"
             android:text="热门商品"
+            android:gravity="center_vertical"
             android:textColor="#000"
-            android:textSize="18sp" />
+            android:textSize="18sp"/>
+
+<!--        <TextView-->
+<!--            android:layout_width="0dp"-->
+<!--            android:layout_height="50dp"-->
+<!--            android:layout_marginLeft="5dp"-->
+<!--            android:layout_weight="1”-->
+<!--            android:text="热门商品"-->
+<!--            android:gravity="center_vertical"-->
+<!--            android:textColor="#000"-->
+<!--            android:textSize="18sp" />-->
 
         <ImageView
             android:layout_width="25dp"

OrangeSale_05/app/src/main/res/layout/user_login.xml

@@ -14,17 +14,17 @@
         android:orientation="vertical">
 
         <ImageView
-            android:layout_width="wrap_content"
+            android:layout_width="150dp"
-            android:layout_height="wrap_content"
+            android:layout_height="150dp"
             android:layout_gravity="center_horizontal"
-            android:src="@drawable/orange" />
+            android:src="@drawable/xigua" />
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="22sp"
+            android:textSize="23sp"
-            android:textColor="#000000"
+            android:textColor="@color/h3"
             android:textStyle="italic"
-            android:text="Orange" />
+            android:text="YaYa水果店" />
     </LinearLayout>
 
     <LinearLayout

OrangeSale_05/app/src/main/res/layout/user_register.xml

@@ -14,24 +14,24 @@
         android:orientation="vertical">
 
         <ImageView
-            android:layout_width="wrap_content"
+            android:layout_width="150dp"
-            android:layout_height="wrap_content"
+            android:layout_height="150dp"
             android:layout_gravity="center_horizontal"
-            android:src="@drawable/orange" />
+            android:src="@drawable/xigua" />
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="22sp"
+            android:textSize="23sp"
-            android:textColor="#000000"
+            android:textColor="@color/h5"
             android:textStyle="italic"
-            android:text="Orange" />
+            android:text="YaYa水果店" />
     </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
-        android:layout_marginTop="30dp"
+        android:layout_marginTop="20dp"
         android:orientation="horizontal">
 
         <ImageView
@@ -47,7 +47,7 @@
             android:textAlignment="center"
             android:maxLength="10"
             android:maxLines="1"
-            android:hint="用户名&#160;10位" />
+            android:hint="用户名 10位" />
 
     </LinearLayout>
 
@@ -70,7 +70,7 @@
             android:textAlignment="center"
             android:maxLength="16"
             android:maxLines="1"
-            android:hint="密码&#160;6-16位" />
+            android:hint="密码 6-16位" />
 
     </LinearLayout>
 
@@ -116,11 +116,11 @@
             <RadioButton
                 android:id="@+id/reg_man"
                 android:layout_width="wrap_content"
-                android:checked="true"
                 android:layout_height="wrap_content"
                 android:text="男"/>
             <RadioButton
                 android:id="@+id/reg_woman"
+                android:checked="true"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="女"/>
@@ -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="注   册" />
 
 </LinearLayout>

OrangeSale_05/app/src/main/res/values/colors.xml

@@ -3,4 +3,27 @@
     <color name="colorPrimary">#008577</color>
     <color name="colorPrimaryDark">#00574B</color>
     <color name="colorAccent">#D81B60</color>
+    <color name="green">#00ff00</color>
+    <color name="white">#ffffff</color>
+    <color name="red">#ff0000</color>
+    <color name="blue">#0000ff</color>
+    <color name="mdh">#ff00ff</color>
+    <color name="qs">#00ffff</color>
+    <color name="yellow">#ffff00</color>
+    <color name="black">#000000</color>
+    <color name="shh">#ff7f00</color>
+    <color name="slhs">#9932cd</color>
+    <color name="szs">#871f78</color>
+    <color name="zzhs">#db7093</color>
+    <color name="nhfh">#ff6ec7</color>
+    <color name="zlls">#4f2f4f</color>
+    <color name="h1">#990033</color>
+    <color name="h2">#ff3399</color>
+    <color name="h3">#ff6699</color>
+    <color name="h4">#ff9999</color>
+    <color name="h5">#ff3366</color>
+    <color name="h6">#cc0033</color>
+    <color name="h7">#ff0033</color>
+    <color name="h8">#ff0066</color>
 </resources>
+

OrangeSale_05/app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">橙一色</string>
+    <string name="app_name">Melon</string>
     <string name="Username">用户名：</string>
     <string name="Password">密&#160;&#160;&#160;&#160;码：</string>
 </resources>

OrangeSale_05/app/src/main/res/values/styles.xml

@@ -4,8 +4,8 @@
     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorPrimaryDark">#FF9800</item>
-        <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorAccent">#00BCD4</item>
     </style>
 
 </resources>