Merge pull request #519 from ZYL618/master

#3 #16 第3次实验
hzuapps · Oct 12, 2020 · b50dd78 · b50dd78
2 parents 7143f8d + 28e4864
commit b50dd78
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 1 deletion.
diff --git a/students/net1814080903225/Net1814080903225_Clock.xml b/students/net1814080903225/Net1814080903225_Clock.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_centerHorizontal="true"
+    android:background="#ff0000"
+    android:visibility="visible"
+    tools:context=".MainActivity">
+
+    <Button
+        android:id="@+id/but3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="钟表模式"
+        android:textSize="30dp"
+        android:layout_below="@id/but1"
+        android:layout_centerHorizontal="true"
+        android:onClick="send"
+
+        />
+
+    <TextView
+        android:id="@+id/t1"
+        android:layout_width="wrap_content"
+        android:layout_height="239dp"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="200dp"
+        android:gravity="center"
+        android:text="Hello World!"
+
+        android:textSize="50dp"
+        tools:layout_editor_absoluteX="211dp"
+        tools:layout_editor_absoluteY="689dp" />
+
+    <Button
+        android:id="@+id/but1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="70dp"
+        android:onClick="record"
+        android:text="北京时间"
+        android:textSize="30dp"
+        tools:layout_editor_absoluteX="16dp"
+        tools:layout_editor_absoluteY="85dp" />
+
+    <Button
+        android:id="@+id/but2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@id/but1"
+        android:onClick="recordN"
+        android:text="纽约时间"
+        android:textSize="30dp" />
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/clock"
+        android:layout_below="@id/t1"
+        />
+
+</RelativeLayout>
diff --git a/students/net1814080903225/res/drawable/clock.jpg b/students/net1814080903225/res/drawable/clock.jpg
diff --git a/...14080903325/Net1814080903325Activity.java → ...14080903325/Net1814080903225Activity.java b/...14080903325/Net1814080903325Activity.java → ...14080903325/Net1814080903225Activity.java
@@ -89,4 +89,4 @@ public void run() {
             }
         }
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -89,4 +89,4 @@ public void run() { @@
                 }
             }
         }
-    }
+    }