Skip to content

Commit

Permalink
Merge pull request #1903 from Yemingrui/master
Browse files Browse the repository at this point in the history
#3 #1898 提交实验三代码
  • Loading branch information
zengsn authored May 15, 2019
2 parents 925cc7d + 3f33bfd commit 864728b
Show file tree
Hide file tree
Showing 9 changed files with 112 additions and 56 deletions.
21 changes: 0 additions & 21 deletions students/soft1714080902338/app/src/main/AndroidManifest.xml

This file was deleted.

This file was deleted.

This file was deleted.

23 changes: 23 additions & 0 deletions students/soft1714080902338/实验三/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="java.soft1714080902338activity.soft1714080902338.androidlabs.hzuapps.myapplication">

<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".MainActivity3">
</activity>
<activity android:name=".MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>

<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>

</manifest>
24 changes: 24 additions & 0 deletions students/soft1714080902338/实验三/MainActivity.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package java.soft1714080902338activity.soft1714080902338.androidlabs.hzuapps.myapplication;

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;


public class MainActivity extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
}

public void click(View view){
Intent intent=new Intent(this,MainActivity3.class);
startActivity(intent);
}

}
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package edu.hzuapps.androidlabs.soft1714080902338.soft1714080902338;

import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;

public class MainActivity extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
}
}
package java.soft1714080902338activity.soft1714080902338.androidlabs.hzuapps.myapplication;

import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;

public class MainActivity3 extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main3);
}
}
29 changes: 29 additions & 0 deletions students/soft1714080902338/实验三/activity_main.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout 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"
tools:context=".MainActivity">


<TextView
android:id="@+id/text2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/a"
tools:ignore="MissingConstraints"/>

<Button
android:id="@+id/button1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="开启2"
android:onClick="click"
tools:ignore="MissingConstraints,OnClick"
tools:layout_editor_absoluteY="303dp"
tools:layout_editor_absoluteX="280dp"/>



</android.support.constraint.ConstraintLayout>
20 changes: 20 additions & 0 deletions students/soft1714080902338/实验三/activity_main3.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
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"
tools:context=".MainActivity">

<TextView
android:id="@+id/textview_01"
android:layout_width="411dp"
android:layout_height="731dp"
android:drawableTop="@drawable/b"
tools:layout_editor_absoluteY="0dp"
tools:layout_editor_absoluteX="-3dp"
tools:ignore="MissingConstraints"/>


</android.support.constraint.ConstraintLayout>
3 changes: 3 additions & 0 deletions students/soft1714080902338/实验三/strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<resources>
<string name="app_name">My Application</string>
</resources>

0 comments on commit 864728b

Please sign in to comment.