Merge pull request #975 from Firethecode/master

#4 #284 第4次实验
hzuapps · Mar 26, 2019 · ddb74ba · ddb74ba
2 parents 169a298 + 27b6fc0
commit ddb74ba
Show file tree

Hide file tree

Showing 5 changed files with 77 additions and 35 deletions.
diff --git a/...80902407/app/src/main/java/edu/hzuapps/androidlabs/soft1714080902407/Detail_Activity.java b/...80902407/app/src/main/java/edu/hzuapps/androidlabs/soft1714080902407/Detail_Activity.java
@@ -1,13 +1,20 @@
 package edu.hzuapps.androidlabs.soft1714080902407;
 
+import android.content.Intent;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.view.View;
 
-public class Detail_Activity extends AppCompatActivity {
+public class Detail_Activity extends AppCompatActivity  implements View.OnClickListener {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.detail_activity);
     }
+
+    public void onClick(View view){
+        Intent intent = new Intent(Detail_Activity.this,Soft1714080902407Activity.class);
+        startActivity(intent);
+    }
 }
diff --git a/...pp/src/main/java/edu/hzuapps/androidlabs/soft1714080902407/Soft1714080902407Activity.java b/...pp/src/main/java/edu/hzuapps/androidlabs/soft1714080902407/Soft1714080902407Activity.java
@@ -5,17 +5,17 @@
 import android.os.Bundle;
 import android.view.View;
 
-public class Soft1714080902407Activity extends AppCompatActivity {
+public class Soft1714080902407Activity extends AppCompatActivity implements View.OnClickListener {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.soft_1714080902407_activity);
     }
 
-
-    public void gotoSecondActivity(View view){
+    public void onClick(View view){
         Intent intent = new Intent(Soft1714080902407Activity.this,Detail_Activity.class);
         startActivity(intent);
     }
+
 }
diff --git a/students/soft1714080902407/app/src/main/res/drawable/zjq.jpg b/students/soft1714080902407/app/src/main/res/drawable/zjq.jpg
diff --git a/students/soft1714080902407/app/src/main/res/layout/detail_activity.xml b/students/soft1714080902407/app/src/main/res/layout/detail_activity.xml
@@ -9,12 +9,12 @@
 
 
     <TextView
-        android:id="@+id/textView"
+        android:id="@+id/textView1"
         android:layout_width="73dp"
-        android:layout_height="0dp"
+        android:layout_height="88dp"
         android:layout_marginBottom="63dp"
         android:layout_marginTop="92dp"
-        android:drawableLeft="@mipmap/ic_launcher"
+        android:drawableLeft="@drawable/zjq"
         app:layout_constraintBottom_toTopOf="@+id/linearLayout1"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -24,49 +24,70 @@
         android:id="@+id/linearLayout1"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginBottom="15dp"
+        android:layout_marginBottom="30dp"
         app:layout_constraintBottom_toTopOf="@+id/linearLayout2"
         app:layout_constraintEnd_toEndOf="@+id/linearLayout2"
         app:layout_constraintStart_toStartOf="@+id/linearLayout2"
-        app:layout_constraintTop_toBottomOf="@+id/textView">
+        app:layout_constraintTop_toBottomOf="@+id/textView1">
 
         <TextView
-            android:id="@+id/textView1"
+            android:id="@+id/textView2"
             android:layout_width="125dp"
             android:layout_height="wrap_content"
             android:text="昵称:"
             android:textSize="30dp" />
 
         <TextView
             android:id="@+id/textView3"
-            android:layout_width="wrap_content"
+            android:layout_width="125dp"
             android:layout_height="wrap_content"
-            android:text="测试对象"
+            android:text="pinky"
             android:textSize="30dp" />
     </LinearLayout>
 
     <LinearLayout
         android:id="@+id/linearLayout2"
-        android:layout_width="360dp"
+        android:layout_width="250dp"
         android:layout_height="0dp"
-        android:layout_marginBottom="202dp"
+        android:layout_marginBottom="49dp"
         android:layout_marginStart="40dp"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/linearLayout3"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/linearLayout1">
 
         <TextView
-            android:id="@+id/textView2"
+            android:id="@+id/textView4"
             android:layout_width="125dp"
             android:layout_height="wrap_content"
             android:text="性别:"
             android:textSize="30dp" />
 
         <TextView
-            android:id="@+id/textView4"
+            android:id="@+id/textView5"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="未知"
+            android:text="女"
             android:textSize="30dp" />
     </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/linearLayout3"
+        android:layout_width="100dp"
+        android:layout_height="0dp"
+        android:layout_marginBottom="118dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/linearLayout2">
+
+
+        <Button
+            android:id="@+id/button2"
+            android:layout_width="181dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:onClick="onClick"
+            android:text="返回"
+            android:textSize="20dp" />
+    </LinearLayout>
 </android.support.constraint.ConstraintLayout>
diff --git a/students/soft1714080902407/app/src/main/res/layout/soft_1714080902407_activity.xml b/students/soft1714080902407/app/src/main/res/layout/soft_1714080902407_activity.xml
@@ -7,33 +7,47 @@
     tools:context=".Soft1714080902407Activity"
     tools:layout_editor_absoluteY="25dp">
 
-
-    <TextView
-        android:id="@+id/textView1"
+    <LinearLayout
+        android:id="@+id/linearLayout1"
         android:layout_width="0dp"
-        android:layout_height="60dp"
-        android:layout_marginBottom="460dp"
-        android:background="#00BFFF"
-        android:drawableLeft="@mipmap/ic_launcher"
-        android:drawablePadding="10dp"
-        android:onClick="gotoSecondActivity"
-        android:text="测试对象"
-        android:textColor="	#272727"
-        android:textSize="30dp"
-        app:layout_constraintBottom_toTopOf="@+id/linearLayout"
+        android:layout_height="74dp"
+        android:layout_marginBottom="448dp"
+        android:background="#3d9bff"
+        app:layout_constraintBottom_toTopOf="@+id/linearLayout2"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent">
+
+
+        <TextView
+            android:id="@+id/textView1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableLeft="@drawable/zjq"
+            android:drawablePadding="10dp"
+            android:onClick="onClick"
+            android:textSize="30dp" />
+
+        <TextView
+            android:id="@+id/textView2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="Pinky"
+            android:textColor="	#111111"
+            android:textSize="25dp" />
+
+
+    </LinearLayout>
 
     <LinearLayout
-        android:id="@+id/linearLayout"
+        android:id="@+id/linearLayout2"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView1">
+        app:layout_constraintTop_toBottomOf="@+id/linearLayout1">
 
         <EditText
             android:id="@+id/input_text"