2.1

.idea/gradle.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

app/src/main/java/com/orangesale/cn/MainActivity.java

@@ -5,6 +5,7 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Toast;
@@ -21,6 +22,11 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        //隐藏标题栏
+        getSupportActionBar().hide();
+        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+
+
         super.onCreate(savedInstanceState);
         setContentView(R.layout.user_login);
         init();

app/src/main/java/com/orangesale/cn/activity/IndexActivity.java

@@ -24,6 +24,8 @@ public class IndexActivity extends Activity implements View.OnClickListener {
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
+
+
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         init();

app/src/main/java/com/orangesale/cn/activity/RegisterActivity.java

@@ -6,6 +6,7 @@ import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.RadioGroup;
@@ -30,6 +31,10 @@ public class RegisterActivity extends AppCompatActivity implements View.OnClickL
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+        //隐藏标题栏
+        getSupportActionBar().hide();
+        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+
         super.onCreate(savedInstanceState);
         setContentView(R.layout.user_register);
         init();

app/src/main/java/com/orangesale/cn/activity/UserActivity.java

@@ -19,6 +19,7 @@ public class UserActivity extends Activity implements View.OnClickListener {
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+
         super.onCreate(savedInstanceState);
         setContentView(R.layout.content_user);
         init();
@@ -35,7 +36,6 @@ public class UserActivity extends Activity implements View.OnClickListener {
         usernameLine = findViewById(R.id.user_username_line);
         userSexline = findViewById(R.id.user_sex_line);
         userCityLine = findViewById(R.id.user_city_line);
-        userPayLine = findViewById(R.id.user_pay);
         userSettingLine = findViewById(R.id.user_setting);
         userGeneralLine = findViewById(R.id.user_general);
         userSearchProductLine = findViewById(R.id.user_searchProduct);

app/src/main/java/com/orangesale/cn/fragment/PearsonFragment.java

@@ -39,7 +39,6 @@ public class PearsonFragment extends Fragment implements View.OnClickListener {
         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();

app/src/main/res/drawable/button_1.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape>
+            <gradient android:startColor="#F41478db" android:endColor="#0d76e1"
+                android:angle="270" />
+            <corners android:radius="2dp" />
+            <padding android:left="10dp" android:top="10dp"
+                android:right="10dp" android:bottom="10dp" />
+        </shape>
+    </item>
+
+    <item android:state_focused="true">
+        <shape>
+            <gradient android:startColor="#F41478db" android:endColor="#ffc2b7"
+                android:angle="270" />
+            <corners android:radius="2dp" />
+            <padding android:left="10dp" android:top="10dp"
+                android:right="10dp" android:bottom="10dp" />
+        </shape>
+    </item>
+
+    <item>
+        <shape>
+            <gradient android:startColor="#F41478db" android:endColor="#ffffff"
+                android:angle="180" />
+            <corners android:radius="5dip" />
+            <padding android:left="10dp" android:top="10dp"
+                android:right="10dp" android:bottom="10dp" />
+        </shape>
+    </item>
+</selector>

app/src/main/res/layout/activity_main.xml

@@ -22,7 +22,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="70dp">
+        android:layout_height="50dp">
         <!--底部导航-->
         <include layout="@layout/content_nav" />
     </LinearLayout>

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

@@ -19,18 +19,18 @@
             android:layout_marginTop="2dp"
             android:src="@drawable/proface" />
 
-        <TextView
+<!--        <TextView-->
-            android:layout_width="wrap_content"
+<!--            android:layout_width="wrap_content"-->
-            android:layout_height="wrap_content"
+<!--            android:layout_height="wrap_content"-->
-            android:layout_gravity="center"
+<!--            android:layout_gravity="center"-->
-            android:text="首页"
+<!--            android:text="首页"-->
-            android:textColor="#000"
+<!--            android:textColor="#000"-->
-            android:textSize="18sp" />
+<!--            android:textSize="18sp" />-->
     </LinearLayout>
     <!--间隔线-->
     <ImageView
         android:layout_width="1dp"
-        android:layout_height="70dp"
+        android:layout_height="45dp"
         android:background="#CFCFCF" />
     <!--商品-->
     <LinearLayout
@@ -47,19 +47,19 @@
             android:layout_marginTop="2dp"
             android:src="@drawable/products" />
 
-        <TextView
+<!--        <TextView-->
-            android:layout_width="wrap_content"
+<!--            android:layout_width="wrap_content"-->
-            android:layout_height="wrap_content"
+<!--            android:layout_height="wrap_content"-->
-            android:layout_gravity="center"
+<!--            android:layout_gravity="center"-->
-            android:text="商品"
+<!--            android:text="商品"-->
-            android:textColor="#000"
+<!--            android:textColor="#000"-->
-            android:textSize="18sp" />
+<!--            android:textSize="18sp" />-->
     </LinearLayout>
 
     <!--间隔线-->
     <ImageView
         android:layout_width="1dp"
-        android:layout_height="70dp"
+        android:layout_height="45dp"
         android:background="#CFCFCF" />
     <!--购物车-->
     <LinearLayout
@@ -76,19 +76,19 @@
             android:layout_gravity="center"
             android:src="@drawable/shoppingcar" />
 
-        <TextView
+<!--        <TextView-->
-            android:layout_width="wrap_content"
+<!--            android:layout_width="wrap_content"-->
-            android:layout_height="wrap_content"
+<!--            android:layout_height="wrap_content"-->
-            android:layout_gravity="center"
+<!--            android:layout_gravity="center"-->
-            android:text="购物车"
+<!--            android:text="购物车"-->
-            android:textColor="#000"
+<!--            android:textColor="#000"-->
-            android:textSize="18sp" />
+<!--            android:textSize="18sp" />-->
     </LinearLayout>
 
     <!--间隔线-->
     <ImageView
         android:layout_width="1dp"
-        android:layout_height="70dp"
+        android:layout_height="45dp"
         android:background="#CFCFCF" />
 
     <!--个人-->
@@ -106,13 +106,13 @@
             android:layout_gravity="center"
             android:src="@drawable/mine" />
 
-        <TextView
+<!--        <TextView-->
-            android:layout_width="wrap_content"
+<!--            android:layout_width="wrap_content"-->
-            android:layout_height="wrap_content"
+<!--            android:layout_height="wrap_content"-->
-            android:layout_gravity="center"
+<!--            android:layout_gravity="center"-->
-            android:text="我"
+<!--            android:text="我"-->
-            android:textColor="#000"
+<!--            android:textColor="#000"-->
-            android:textSize="18sp" />
+<!--            android:textSize="18sp" />-->
     </LinearLayout>
 
 </LinearLayout>

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

@@ -7,39 +7,12 @@
 
     <ImageView
         android:id="@+id/user_icon"
-        android:layout_width="wrap_content"
+        android:layout_width="150dp"
-        android:layout_height="wrap_content"
+        android:layout_height="150dp"
         android:layout_marginTop="20dp"
         android:layout_gravity="center_horizontal"
-        android:src="@drawable/user_icon" />
+        android:src="@drawable/user_icon2" />
 
-    <!--卡券-->
-    <LinearLayout
-        android:id="@+id/user_pay"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#FFF"
-        android:layout_marginTop="40dp"
-        android:orientation="horizontal">
-
-        <TextView
-            android:layout_height="35dp"
-            android:layout_weight="1"
-            android:drawableLeft="@drawable/user_pay"
-            android:textColor="#000"
-            android:text="卡券"
-            android:gravity="center_vertical"
-            android:drawablePadding="8dp"
-            android:textSize="14sp"
-            android:layout_marginLeft="5dp"
-            android:layout_width="0dp" />
-
-        <ImageView
-            android:layout_width="25dp"
-            android:layout_height="25dp"
-            android:layout_gravity="center"
-            android:src="@drawable/arrow_right" />
-    </LinearLayout>
 
     <!--账号-->
     <LinearLayout
@@ -52,7 +25,7 @@
 
         <TextView
             android:id="@+id/user_username"
-            android:layout_height="35dp"
+            android:layout_height="50dp"
             android:layout_weight="1"
             android:drawableLeft="@drawable/user_account"
             android:textColor="#000"
@@ -82,7 +55,7 @@
 
         <TextView
             android:id="@+id/user_sex"
-            android:layout_height="35dp"
+            android:layout_height="50dp"
             android:layout_weight="1"
             android:layout_marginLeft="5dp"
             android:drawableLeft="@drawable/user_sex"
@@ -112,7 +85,7 @@
 
         <TextView
             android:id="@+id/user_city"
-            android:layout_height="35dp"
+            android:layout_height="50dp"
             android:layout_weight="1"
             android:drawableLeft="@drawable/city"
             android:textColor="#000"
@@ -141,7 +114,7 @@
         android:orientation="horizontal">
 
         <TextView
-            android:layout_height="35dp"
+            android:layout_height="50dp"
             android:layout_weight="1"
             android:drawableLeft="@drawable/user_general"
             android:textColor="#000"
@@ -170,7 +143,7 @@
         android:orientation="horizontal">
 
         <TextView
-            android:layout_height="35dp"
+            android:layout_height="50dp"
             android:layout_weight="1"
             android:drawableLeft="@drawable/search"
             android:textColor="#000"
@@ -199,7 +172,7 @@
         android:orientation="horizontal">
 
         <TextView
-            android:layout_height="35dp"
+            android:layout_height="50dp"
             android:layout_weight="1"
             android:drawableLeft="@drawable/setting"
             android:textColor="#000"
@@ -219,16 +192,14 @@
     </LinearLayout>
 
     <Button
-        android:layout_width="fill_parent"
+        android:id="@+id/login"
-        android:layout_height="40dp"
+        android:layout_width="250dp"
-        android:layout_marginLeft="10dp"
+        android:layout_height="50dp"
-        android:layout_marginRight="10dp"
+        android:layout_marginTop="60dp"
-        android:textSize="18sp"
+        android:text="退&#160;&#160;&#160;&#160;出&#160;&#160;&#160;&#160;登&#160;&#160;&#160;&#160;&#160;&#160;录"
-        android:layout_marginTop="90dp"
+        android:background="@drawable/button_1"
-        android:text="退出登录"
+        android:layout_gravity="center_horizontal"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/white"
-        android:layout_gravity="center"
+        android:textSize="18sp" />
-        android:background="@drawable/button_login"/>
-
 
 </LinearLayout>

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

@@ -2,30 +2,29 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
+    android:orientation="vertical">
-    android:background="#E8E8E8">
 
     <!--APPLogo及名字-->
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
-        android:layout_marginTop="40dp"
+        android:layout_marginTop="80dp"
         android:orientation="vertical">
 
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:src="@drawable/orange" />
+            android:src="@drawable/logo2" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="22sp"
+            android:text="IKUN"
-            android:textColor="#000000"
+            android:textColor="@color/deepGrey"
-            android:textStyle="italic"
+            android:textSize="25sp"
-            android:text="Orange" />
+            android:textStyle="bold" />
     </LinearLayout>
 
     <LinearLayout
@@ -79,22 +78,23 @@
         android:id="@+id/login"
         android:layout_width="250dp"
         android:layout_height="50dp"
-        android:textSize="18sp"
-        android:layout_gravity="center_horizontal"
         android:layout_marginTop="60dp"
-        android:background="@drawable/button_login"
+        android:text="登&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;录"
-        android:textColor="#FFFFFF"
+        android:background="@drawable/button_1"
-        android:text="登&#160;&#160;&#160;&#160;&#160;录" />
+        android:layout_gravity="center_horizontal"
+        android:textColor="@color/white"
+        android:textSize="18sp" />
 
     <Button
         android:id = "@+id/register"
         android:layout_width="250dp"
         android:layout_height="50dp"
-        android:layout_marginTop="10dp"
+        android:layout_marginTop="20dp"
         android:textSize="18sp"
         android:layout_gravity="center_horizontal"
-        android:background="@drawable/button_register"
+        android:textColor="@color/white"
-        android:textColor="#FFFFFF"
+        android:background="@drawable/button_1"
-        android:text="注&#160;&#160;&#160;&#160;&#160;册" />
+        android:text="注&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;册"/>
+
 
 </LinearLayout>

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

@@ -2,22 +2,21 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
+    android:orientation="vertical">
-    android:background="#E8E8E8">
 
     <!--APPLogo及名字-->
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="80dp"
         android:orientation="vertical">
 
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:src="@drawable/orange" />
+            android:src="@drawable/logo2" />
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -153,16 +152,15 @@
 
     </LinearLayout>
 
-
     <Button
         android:id="@+id/reg_register"
-        android:layout_width="280dp"
+        android:layout_width="250dp"
         android:layout_height="50dp"
-        android:layout_marginTop="80dp"
+        android:layout_marginTop="20dp"
         android:textSize="18sp"
         android:layout_gravity="center_horizontal"
-        android:background="@drawable/button_login"
+        android:textColor="@color/white"
-        android:textColor="#FFFFFF"
+        android:background="@drawable/button_1"
-        android:text="注&#160;&#160;&#160;&#160;&#160;册" />
+        android:text="注&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;册"/>
 
 </LinearLayout>

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

@@ -3,4 +3,17 @@
     <color name="colorPrimary">#008577</color>
     <color name="colorPrimaryDark">#00574B</color>
     <color name="colorAccent">#D81B60</color>
+    <color name="purple_200">#FFBB86FC</color>
+    <color name="purple_500">#FF6200EE</color>
+    <color name="purple_700">#FF3700B3</color>
+    <color name="teal_200">#FF03DAC5</color>
+    <color name="teal_700">#FF018786</color>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
+    <color name ="green">#00FF00</color>
+    <color name ="red">#F40002</color>
+    <color name ="blue">#F41478db</color>
+    <color name ="deepGrey">#7c858d</color>
+    <color name ="lightGrey">#EBEBE9</color>
+    <color name="grey">#808080</color>
 </resources>