Merge pull request #1336 from hcwcc/master

#4 #633 第四次实验
hzuapps · Apr 9, 2019 · b78b665 · b78b665
2 parents f391edc + bcecb3e
commit b78b665
Show file tree

Hide file tree

Showing 8 changed files with 145 additions and 20 deletions.
diff --git a/students/soft1714080902419/app/src/main/AndroidManifest.xml b/students/soft1714080902419/app/src/main/AndroidManifest.xml
@@ -9,7 +9,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".Soft1714080902419pikaActivity"></activity>
+        <activity android:name=".Soft1714080902419huaActivity"></activity>
+        <activity android:name=".Soft1714080902419pikaActivity" />
         <activity android:name=".aa" />
         <activity android:name=".mald" />
         <activity

diff --git a/...pp/src/main/java/edu/hzuapps/androidlabs/soft1714080902419/Soft1714080902419Activity.java b/...pp/src/main/java/edu/hzuapps/androidlabs/soft1714080902419/Soft1714080902419Activity.java
@@ -13,13 +13,26 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_soft1714080902419);
 
-        Button GoButton = (Button) findViewById(R.id.button);
+        Button GoButton = (Button) findViewById(R.id.button11);
         GoButton.setOnClickListener(new View.OnClickListener(){
             @Override
             public void onClick(View v) {
 
                 Intent intent = new Intent(Soft1714080902419Activity.this,Soft1714080902419pikaActivity.class);
                 startActivity(intent);
+
+
+            }
+        });
+        Button GoButton1 = (Button) findViewById(R.id.button22);
+        GoButton1.setOnClickListener(new View.OnClickListener(){
+            @Override
+            public void onClick(View v) {
+
+                Intent intent = new Intent(Soft1714080902419Activity.this,Soft1714080902419huaActivity.class);
+                startActivity(intent);
+
+
             }
         });
     }

diff --git a/...src/main/java/edu/hzuapps/androidlabs/soft1714080902419/Soft1714080902419huaActivity.java b/...src/main/java/edu/hzuapps/androidlabs/soft1714080902419/Soft1714080902419huaActivity.java
@@ -0,0 +1,13 @@
+package edu.hzuapps.androidlabs.soft1714080902419;
+
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+
+public class Soft1714080902419huaActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_soft1714080902419hua);
+    }
+}
diff --git a/students/soft1714080902419/app/src/main/res/layout/activity_soft1714080902419.xml b/students/soft1714080902419/app/src/main/res/layout/activity_soft1714080902419.xml
@@ -1,26 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:background="@drawable/pica"
+    android:orientation="vertical"
     tools:context=".Soft1714080902419Activity">
 
 
-    <Button
-        android:id="@+id/button"
-        android:layout_width="146dp"
-        android:layout_height="83dp"
-        android:text="开始测距"
-        android:textSize="20sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.498"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.873"
-        tools:ignore="MissingConstraints" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:orientation="horizontal">
 
+        <Button
+            android:id="@+id/button11"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="开始测距"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.011"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.993"
+            tools:ignore="MissingConstraints" />
 
-</android.support.constraint.ConstraintLayout>
+        <Button
+            android:id="@+id/button22"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="查看历史" />
+
+    </LinearLayout>
+
+
+</RelativeLayout>
diff --git a/students/soft1714080902419/app/src/main/res/layout/activity_soft1714080902419hua.xml b/students/soft1714080902419/app/src/main/res/layout/activity_soft1714080902419hua.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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:orientation="vertical"
+    tools:context=".Soft1714080902419huaActivity">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="@drawable/pipi"
+            android:orientation="horizontal"></LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/pipi"
+            android:layout_weight="1"
+            android:orientation="horizontal"></LinearLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="@drawable/pipi"
+            android:orientation="horizontal"></LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/pipi"
+            android:layout_weight="1"
+            android:orientation="horizontal"></LinearLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/students/soft1714080902419/app/src/main/res/layout/activity_soft1714080902419pika.xml b/students/soft1714080902419/app/src/main/res/layout/activity_soft1714080902419pika.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
@@ -11,11 +11,24 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:drawableTop="@drawable/pipi"
-        android:text="hello_world"
+
         tools:layout_editor_absoluteX="2dp"
         tools:layout_editor_absoluteY="0dp"
         tools:ignore="MissingConstraints" />
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/button33"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="保存" />
+    </LinearLayout>
 
 
-</android.support.constraint.ConstraintLayout>
+</RelativeLayout>
diff --git a/students/soft1714080902419/app/src/main/res/values/colors.xml b/students/soft1714080902419/app/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#008577</color>
+    <color name="colorPrimaryDark">#00574B</color>
+    <color name="colorAccent">#D81B60</color>
+</resources>
diff --git a/students/soft1714080902419/app/src/main/res/values/styles.xml b/students/soft1714080902419/app/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <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="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>