From f3bcdbbc31045e8df14008d814acab7786fe403e Mon Sep 17 00:00:00 2001 From: 1614080902117 <1045704637@qq.com> Date: Sun, 15 Apr 2018 10:32:02 +0800 Subject: [PATCH 1/5] =?UTF-8?q?#2=20#881=20=E7=AC=AC1=E6=AC=A1=E5=AE=9E?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- soft1614080902117/AndroidManifest.xml | 21 ++++++++++++ .../Soft1614080902117Activity.java | 32 +++++++++++++++++-- .../activity_soft1614080902117.xml | 18 +++++++++++ soft1614080902117/strings.xml | 3 ++ 4 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 soft1614080902117/AndroidManifest.xml create mode 100644 soft1614080902117/activity_soft1614080902117.xml create mode 100644 soft1614080902117/strings.xml diff --git a/soft1614080902117/AndroidManifest.xml b/soft1614080902117/AndroidManifest.xml new file mode 100644 index 000000000..bde9b3a68 --- /dev/null +++ b/soft1614080902117/AndroidManifest.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/soft1614080902117/Soft1614080902117Activity.java b/soft1614080902117/Soft1614080902117Activity.java index 523304b03..85b3cb282 100644 --- a/soft1614080902117/Soft1614080902117Activity.java +++ b/soft1614080902117/Soft1614080902117Activity.java @@ -1,5 +1,31 @@ package edu.hzuapps.androidlabs.soft1614080902117; -public class Soft1614080902117Activity { - -} \ No newline at end of file +import android.os.Bundle; +import android.support.design.widget.FloatingActionButton; +import android.support.design.widget.Snackbar; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; +import android.view.View; + +import edu.hzuapps.androidlabs.soft1614080902117.myapplication.R; + +public class Soft1614080902117Activity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_soft1614080902117); + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + + FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); + fab.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) + .setAction("Action", null).show(); + } + }); + } + +} diff --git a/soft1614080902117/activity_soft1614080902117.xml b/soft1614080902117/activity_soft1614080902117.xml new file mode 100644 index 000000000..8ef362435 --- /dev/null +++ b/soft1614080902117/activity_soft1614080902117.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/soft1614080902117/strings.xml b/soft1614080902117/strings.xml new file mode 100644 index 000000000..f5b531d0e --- /dev/null +++ b/soft1614080902117/strings.xml @@ -0,0 +1,3 @@ + + Soft1614080902117备忘录 + From 19b43e8b8c2acac22b1f8736858eca97fc8a0e46 Mon Sep 17 00:00:00 2001 From: 1614080902117 <1045704637@qq.com> Date: Sun, 15 Apr 2018 11:05:02 +0800 Subject: [PATCH 2/5] =?UTF-8?q?#2=20#881=20=E7=AC=AC2=E6=AC=A1=E5=AE=9E?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/src/main}/AndroidManifest.xml | 0 .../Soft1614080902117Activity.java | 13 ++++++++ .../layout}/activity_soft1614080902117.xml | 0 .../app/src/main/res/values}/strings.xml | 0 .../Soft1614080902117Activity.java | 31 ------------------- 5 files changed, 13 insertions(+), 31 deletions(-) rename soft1614080902117/{ => MyApplication8/app/src/main}/AndroidManifest.xml (100%) create mode 100644 soft1614080902117/MyApplication8/app/src/main/java/edu/hzuapps/androidlabs/soft1614080902117/myapplication/Soft1614080902117Activity.java rename soft1614080902117/{ => MyApplication8/app/src/main/res/layout}/activity_soft1614080902117.xml (100%) rename soft1614080902117/{ => MyApplication8/app/src/main/res/values}/strings.xml (100%) delete mode 100644 soft1614080902117/Soft1614080902117Activity.java diff --git a/soft1614080902117/AndroidManifest.xml b/soft1614080902117/MyApplication8/app/src/main/AndroidManifest.xml similarity index 100% rename from soft1614080902117/AndroidManifest.xml rename to soft1614080902117/MyApplication8/app/src/main/AndroidManifest.xml diff --git a/soft1614080902117/MyApplication8/app/src/main/java/edu/hzuapps/androidlabs/soft1614080902117/myapplication/Soft1614080902117Activity.java b/soft1614080902117/MyApplication8/app/src/main/java/edu/hzuapps/androidlabs/soft1614080902117/myapplication/Soft1614080902117Activity.java new file mode 100644 index 000000000..8468b196a --- /dev/null +++ b/soft1614080902117/MyApplication8/app/src/main/java/edu/hzuapps/androidlabs/soft1614080902117/myapplication/Soft1614080902117Activity.java @@ -0,0 +1,13 @@ +package edu.hzuapps.androidlabs.soft1614080902117.myapplication; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; + +public class Soft1614080902117Activity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_soft1614080902117); + } +} diff --git a/soft1614080902117/activity_soft1614080902117.xml b/soft1614080902117/MyApplication8/app/src/main/res/layout/activity_soft1614080902117.xml similarity index 100% rename from soft1614080902117/activity_soft1614080902117.xml rename to soft1614080902117/MyApplication8/app/src/main/res/layout/activity_soft1614080902117.xml diff --git a/soft1614080902117/strings.xml b/soft1614080902117/MyApplication8/app/src/main/res/values/strings.xml similarity index 100% rename from soft1614080902117/strings.xml rename to soft1614080902117/MyApplication8/app/src/main/res/values/strings.xml diff --git a/soft1614080902117/Soft1614080902117Activity.java b/soft1614080902117/Soft1614080902117Activity.java deleted file mode 100644 index 85b3cb282..000000000 --- a/soft1614080902117/Soft1614080902117Activity.java +++ /dev/null @@ -1,31 +0,0 @@ -package edu.hzuapps.androidlabs.soft1614080902117; - -import android.os.Bundle; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; -import android.view.View; - -import edu.hzuapps.androidlabs.soft1614080902117.myapplication.R; - -public class Soft1614080902117Activity extends AppCompatActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_soft1614080902117); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); - setSupportActionBar(toolbar); - - FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); - fab.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) - .setAction("Action", null).show(); - } - }); - } - -} From 85006a5e0995ea0048abab61f6f2124d8d9c6502 Mon Sep 17 00:00:00 2001 From: 1614080902117 <37757676+1614080902117@users.noreply.github.com> Date: Sun, 15 Apr 2018 11:30:40 +0800 Subject: [PATCH 3/5] Create report2.md --- report2.md | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 report2.md diff --git a/report2.md b/report2.md new file mode 100644 index 000000000..d2f7ce501 --- /dev/null +++ b/report2.md @@ -0,0 +1,102 @@ +# 第二次实验 + +## 1.实验目标 +Android组件编程 + +## 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 学号目录/* +$ git commit "#12345678 " +$ git push +``` + +4. 在自己的GitHub库上创建和发送Pull Request（注意查看Changed files） +``` +// 是否只修改了自己的文件？ +``` + +5. 在GitHub中使用Markdown文件编写实验报告（report1.md, report2.md） +``` +// 保存在自己的文件夹下 +## 3.实验结果 +1.Soft1614080902117Activity.java + +package edu.hzuapps.androidlabs.soft1614080902117.myapplication; ++ ++import android.support.v7.app.AppCompatActivity; ++import android.os.Bundle; ++ ++public class Soft1614080902117Activity extends AppCompatActivity { ++ ++ @Override ++ protected void onCreate(Bundle savedInstanceState) { ++ super.onCreate(savedInstanceState); ++ setContentView(R.layout.activity_soft1614080902117); ++ } ++} + +2.AndroidManifest.xml + + + + + + + + + + + + + + + + +3.activity_soft1614080902117.xml + ++ ++ ++ ++ ++ ++ + +4.strings.xml + + ++ Soft1614080902117备忘录 ++ + +## 4.实验体会 + 本次实验使用Android Studio编写代码，通过此次实验学会了在Android中Activity的 + 创建、标题的修改，同时也选择了一个相对简单的选题进行接下来的实验。 From 00eb59a6437208f2362f172636dabf0396925c6a Mon Sep 17 00:00:00 2001 From: 1614080902117 <37757676+1614080902117@users.noreply.github.com> Date: Sun, 15 Apr 2018 11:31:16 +0800 Subject: [PATCH 4/5] Delete report2.md --- report2.md | 102 ----------------------------------------------------- 1 file changed, 102 deletions(-) delete mode 100644 report2.md diff --git a/report2.md b/report2.md deleted file mode 100644 index d2f7ce501..000000000 --- a/report2.md +++ /dev/null @@ -1,102 +0,0 @@ -# 第二次实验 - -## 1.实验目标 -Android组件编程 - -## 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 学号目录/* -$ git commit "#12345678 " -$ git push -``` - -4. 在自己的GitHub库上创建和发送Pull Request（注意查看Changed files） -``` -// 是否只修改了自己的文件？ -``` - -5. 在GitHub中使用Markdown文件编写实验报告（report1.md, report2.md） -``` -// 保存在自己的文件夹下 -## 3.实验结果 -1.Soft1614080902117Activity.java - -package edu.hzuapps.androidlabs.soft1614080902117.myapplication; -+ -+import android.support.v7.app.AppCompatActivity; -+import android.os.Bundle; -+ -+public class Soft1614080902117Activity extends AppCompatActivity { -+ -+ @Override -+ protected void onCreate(Bundle savedInstanceState) { -+ super.onCreate(savedInstanceState); -+ setContentView(R.layout.activity_soft1614080902117); -+ } -+} - -2.AndroidManifest.xml - - - - - - - - - - - - - - - - -3.activity_soft1614080902117.xml - -+ -+ -+ -+ -+ -+ - -4.strings.xml - - -+ Soft1614080902117备忘录 -+ - -## 4.实验体会 - 本次实验使用Android Studio编写代码，通过此次实验学会了在Android中Activity的 - 创建、标题的修改，同时也选择了一个相对简单的选题进行接下来的实验。 From 05808535e0fcccda2c9bddb247af3bceb7d5163e Mon Sep 17 00:00:00 2001 From: 1614080902117 <37757676+1614080902117@users.noreply.github.com> Date: Sun, 15 Apr 2018 11:31:54 +0800 Subject: [PATCH 5/5] Create report2.md --- soft1614080902117/report2.md | 102 +++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 soft1614080902117/report2.md diff --git a/soft1614080902117/report2.md b/soft1614080902117/report2.md new file mode 100644 index 000000000..d2f7ce501 --- /dev/null +++ b/soft1614080902117/report2.md @@ -0,0 +1,102 @@ +# 第二次实验 + +## 1.实验目标 +Android组件编程 + +## 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 学号目录/* +$ git commit "#12345678 " +$ git push +``` + +4. 在自己的GitHub库上创建和发送Pull Request（注意查看Changed files） +``` +// 是否只修改了自己的文件？ +``` + +5. 在GitHub中使用Markdown文件编写实验报告（report1.md, report2.md） +``` +// 保存在自己的文件夹下 +## 3.实验结果 +1.Soft1614080902117Activity.java + +package edu.hzuapps.androidlabs.soft1614080902117.myapplication; ++ ++import android.support.v7.app.AppCompatActivity; ++import android.os.Bundle; ++ ++public class Soft1614080902117Activity extends AppCompatActivity { ++ ++ @Override ++ protected void onCreate(Bundle savedInstanceState) { ++ super.onCreate(savedInstanceState); ++ setContentView(R.layout.activity_soft1614080902117); ++ } ++} + +2.AndroidManifest.xml + + + + + + + + + + + + + + + + +3.activity_soft1614080902117.xml + ++ ++ ++ ++ ++ ++ + +4.strings.xml + + ++ Soft1614080902117备忘录 ++ + +## 4.实验体会 + 本次实验使用Android Studio编写代码，通过此次实验学会了在Android中Activity的 + 创建、标题的修改，同时也选择了一个相对简单的选题进行接下来的实验。