Skip to content

Commit

Permalink
Merge pull request #1054 from 779221136/master
Browse files Browse the repository at this point in the history
#2 #1039 加法计算器
  • Loading branch information
zengsn authored Apr 16, 2018
2 parents 2df7713 + aa5f851 commit 165810b
Show file tree
Hide file tree
Showing 5 changed files with 79 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package edu.hzuapps.androidlabs.soft1614080902416;

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

public class soft1614080902416Activity extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_soft1614080902416);
}
}
21 changes: 21 additions & 0 deletions soft1614080902416/manifests/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="edu.hzuapps.androidlabs.soft1614080902416">

<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=".soft1614080902416Activity">
<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 soft1614080902416/report2.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#第二次实验

## 1.实验目标

* (1)在Issues中创建自己的选题:https://github.com/hzuapps/android-labs-2018/issues
* (2)根据自选题目,编写一个或多个Activity(所有均带上学号前缀,放到自己的Java包下);
* (3)将标题设置为自己的学号+对应的功能或题目;
* (4)根据自己选择的题目实现Activity中导航、调用等功能(选做)

## 2.实验步骤
* (1)阅读实验要求:https://github.com/hzuapps/android-labs-2018/labels/Lab
* (2)在电脑上Android Studio编写代码// 代码要可以运行!
* (3)使用Git将代码提交到自己的库中:https://github.com/YOUR_NAME/android-labs-2018
* $ git pull
  * $ git add soft1614080902416/*
  * $ git commit "#2 #1039 "
* $ git push
* (4)在自己的GitHub库上创建和发送Pull Request(注意查看Changed files)
// 是否只修改了自己的文件?
* (5)在GitHub中使用Markdown文件编写实验报告(report1.md, report2.md)
// 保存在自己的文件夹下


* “加法计算器”中文出现了乱码,修改后解决了
18 changes: 18 additions & 0 deletions soft1614080902416/res/layout/activity_soft1614080902416.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?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="edu.hzuapps.androidlabs.soft1614080902416Activity">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Hello World!"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />

</android.support.constraint.ConstraintLayout>
3 changes: 3 additions & 0 deletions soft1614080902416/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<resources>
<string name="app_name">soft1614080902416加法计算器/string>
</resources>

0 comments on commit 165810b

Please sign in to comment.