Merge pull request #294 from 14YuQingBin/master

#3 #129 第三次作业
hzuapps · May 12, 2017 · c897d12 · c897d12
2 parents 357c64a + 32ca578
commit c897d12
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 38 deletions.
diff --git a/.../edu/hzuapps/androidlabs/homeworks/net1414080903130/Net1414080903130CustomerActivity.java b/.../edu/hzuapps/androidlabs/homeworks/net1414080903130/Net1414080903130CustomerActivity.java
@@ -1,14 +1,14 @@
 package edu.hzuapps.androidlabs.homeworks.net1414080903130;
 
-        import android.content.Intent;
-        import android.support.v7.app.AppCompatActivity;
-        import android.os.Bundle;
-        import android.view.View;
-        import android.widget.Button;
-        import android.widget.EditText;
-        import android.widget.Toast;
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
 
-        import edu.hzuapps.androidlabs.R;
+import edu.hzuapps.androidlabs.R;
 
 public class Net1414080903130CustomerActivity extends AppCompatActivity {
     EditText a,b,c,d,e;

diff --git a/...edu/hzuapps/androidlabs/homeworks/net1414080903130/Net1414080903130EmployeesActivity.java b/...edu/hzuapps/androidlabs/homeworks/net1414080903130/Net1414080903130EmployeesActivity.java
@@ -1,14 +1,14 @@
 package edu.hzuapps.androidlabs.homeworks.net1414080903130;
 
-        import android.content.Intent;
-        import android.support.v7.app.AppCompatActivity;
-        import android.os.Bundle;
-        import android.view.View;
-        import android.widget.Button;
-        import android.widget.EditText;
-        import android.widget.Toast;
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
 
-        import edu.hzuapps.androidlabs.R;
+import edu.hzuapps.androidlabs.R;
 
 public class Net1414080903130EmployeesActivity extends AppCompatActivity {
     EditText a,b,c,d;

diff --git a/...va/edu/hzuapps/androidlabs/homeworks/net1414080903130/Net1414080903130EnrollActivity.java b/...va/edu/hzuapps/androidlabs/homeworks/net1414080903130/Net1414080903130EnrollActivity.java
@@ -1,14 +1,14 @@
 package edu.hzuapps.androidlabs.homeworks.net1414080903130;
 
-        import android.content.Intent;
-        import android.support.v7.app.AppCompatActivity;
-        import android.os.Bundle;
-        import android.view.View;
-        import android.widget.Button;
-        import android.widget.EditText;
-        import android.widget.Toast;
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
 
-        import edu.hzuapps.androidlabs.R;
+import edu.hzuapps.androidlabs.R;
 
 public class Net1414080903130EnrollActivity extends AppCompatActivity {
     EditText a,b,c,d;

diff --git a/...ava/edu/hzuapps/androidlabs/homeworks/net1414080903130/Net1414080903130LoginActivity.java b/...ava/edu/hzuapps/androidlabs/homeworks/net1414080903130/Net1414080903130LoginActivity.java
@@ -1,14 +1,14 @@
 package edu.hzuapps.androidlabs.homeworks.net1414080903130;
 
-        import android.content.Intent;
-        import android.support.v7.app.AppCompatActivity;
-        import android.os.Bundle;
-        import android.util.Log;
-        import android.view.View;
-        import android.widget.Button;
-        import android.widget.EditText;
-
-        import edu.hzuapps.androidlabs.R;
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+
+import edu.hzuapps.androidlabs.R;
 
 public class Net1414080903130LoginActivity extends AppCompatActivity {
 

diff --git a/AndroidLabs/app/src/main/res/drawable/cusstomer.jpg b/AndroidLabs/app/src/main/res/drawable/cusstomer.jpg
diff --git a/AndroidLabs/app/src/main/res/drawable/enployee.png b/AndroidLabs/app/src/main/res/drawable/enployee.png
diff --git a/AndroidLabs/app/src/main/res/drawable/enroll.png b/AndroidLabs/app/src/main/res/drawable/enroll.png
diff --git a/AndroidLabs/app/src/main/res/drawable/main.jpg b/AndroidLabs/app/src/main/res/drawable/main.jpg
diff --git a/AndroidLabs/app/src/main/res/layout/activity_net1414080903130_customer.xml b/AndroidLabs/app/src/main/res/layout/activity_net1414080903130_customer.xml
@@ -2,7 +2,8 @@
 <RelativeLayout 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="@drawable/cusstomer">
 
     <LinearLayout
         android:layout_width="match_parent"

diff --git a/AndroidLabs/app/src/main/res/layout/activity_net1414080903130_employees.xml b/AndroidLabs/app/src/main/res/layout/activity_net1414080903130_employees.xml
@@ -2,7 +2,8 @@
 <RelativeLayout 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="@drawable/enployee">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -155,7 +156,7 @@
         android:text="员工信息"
         android:textSize="28dp"
         android:layout_marginStart="25dp"
-        android:layout_centerHorizontal="true" />
+        android:layout_centerHorizontal="true"/>
 
     <Button
         android:id="@+id/employees_input"

diff --git a/AndroidLabs/app/src/main/res/layout/activity_net1414080903130_enroll.xml b/AndroidLabs/app/src/main/res/layout/activity_net1414080903130_enroll.xml
@@ -2,7 +2,8 @@
 <RelativeLayout 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="@drawable/enroll">
 
     <LinearLayout
         android:layout_width="match_parent"

diff --git a/AndroidLabs/app/src/main/res/layout/activity_net1414080903130_login.xml b/AndroidLabs/app/src/main/res/layout/activity_net1414080903130_login.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@drawable/main">
     <View
         android:layout_width="match_parent"
         android:layout_height="50dp"