diff --git a/soft1614080902117/MyApplication8/app/src/main/java/edu/hzuapps/androidlabs/soft1614080902117/myapplication/Soft1614080902117Activity_1.java b/soft1614080902117/MyApplication8/app/src/main/java/edu/hzuapps/androidlabs/soft1614080902117/myapplication/Soft1614080902117Activity_1.java
deleted file mode 100644
index 1743291b0..000000000
--- a/soft1614080902117/MyApplication8/app/src/main/java/edu/hzuapps/androidlabs/soft1614080902117/myapplication/Soft1614080902117Activity_1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package edu.hzuapps.androidlabs.soft1614080902117activity;
-
-import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-
-public class Soft1614080902117Activity_1 extends AppCompatActivity {
-
- Button button = null;
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_soft1614080902117_1);
-
- button = (Button)findViewById(R.id.button2);
- button.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- Intent intent = new Intent();
- intent.setClass(Soft1614080902117Activity_1.this,Soft1614080902117Activity.class);
- startActivity(intent);
- }
- });
- }
-}
diff --git a/soft1614080902117/MyApplication8/app/src/main/res/drawable/tu.jpg b/soft1614080902117/MyApplication8/app/src/main/res/drawable/tu.jpg
deleted file mode 100644
index bf23fd1f5..000000000
Binary files a/soft1614080902117/MyApplication8/app/src/main/res/drawable/tu.jpg and /dev/null differ
diff --git a/soft1614080902117/MyApplication8/app/src/main/res/layout/activity_soft1614080902117.xml b/soft1614080902117/MyApplication8/app/src/main/res/layout/activity_soft1614080902117.xml
deleted file mode 100644
index 2d7eafe03..000000000
--- a/soft1614080902117/MyApplication8/app/src/main/res/layout/activity_soft1614080902117.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/soft1614080902117/MyApplication8/app/src/main/res/layout/activity_soft1614080902117_1.xml b/soft1614080902117/MyApplication8/app/src/main/res/layout/activity_soft1614080902117_1.xml
deleted file mode 100644
index 9e90e024c..000000000
--- a/soft1614080902117/MyApplication8/app/src/main/res/layout/activity_soft1614080902117_1.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/soft1614080902117/MyApplication8/app/src/main/res/values/strings.xml b/soft1614080902117/MyApplication8/app/src/main/res/values/strings.xml
deleted file mode 100644
index a81fabf3e..000000000
--- a/soft1614080902117/MyApplication8/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
- Soft1614080902117Activity
-
diff --git a/soft1614080902117/MyApplication8/app/src/main/AndroidManifest.xml b/soft1614080902117/app/src/main/AndroidManifest.xml
similarity index 66%
rename from soft1614080902117/MyApplication8/app/src/main/AndroidManifest.xml
rename to soft1614080902117/app/src/main/AndroidManifest.xml
index 004ecf947..bc62d3619 100644
--- a/soft1614080902117/MyApplication8/app/src/main/AndroidManifest.xml
+++ b/soft1614080902117/app/src/main/AndroidManifest.xml
@@ -1,11 +1,11 @@
-
+
+ package="edu.hzuapps.androidlabs.soft1614080902117">
@@ -16,12 +16,7 @@
-
-
-
+
\ No newline at end of file
diff --git a/soft1614080902117/MyApplication8/app/src/main/java/edu/hzuapps/androidlabs/soft1614080902117/myapplication/Soft1614080902117Activity.java b/soft1614080902117/app/src/main/java/edu/hzuapps/androidlabs/soft1614080902117/Soft1614080902117Activity.java
similarity index 71%
rename from soft1614080902117/MyApplication8/app/src/main/java/edu/hzuapps/androidlabs/soft1614080902117/myapplication/Soft1614080902117Activity.java
rename to soft1614080902117/app/src/main/java/edu/hzuapps/androidlabs/soft1614080902117/Soft1614080902117Activity.java
index 085a77e7b..a6d0b9132 100644
--- a/soft1614080902117/MyApplication8/app/src/main/java/edu/hzuapps/androidlabs/soft1614080902117/myapplication/Soft1614080902117Activity.java
+++ b/soft1614080902117/app/src/main/java/edu/hzuapps/androidlabs/soft1614080902117/Soft1614080902117Activity.java
@@ -1,13 +1,14 @@
-package edu.hzuapps.androidlabs.soft1614080902117activity;
-
+package edu.hzuapps.androidlabs.soft1614080902117;
import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+
import android.os.Bundle;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
+import android.app.Activity;
+
-public class Soft1614080902117Activity extends AppCompatActivity {
+public class Soft1614080902117Activity extends Activity {
Button button = null;
@@ -16,12 +17,12 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_soft1614080902117);
- button = (Button)findViewById(R.id.button1);
+ button = (Button)findViewById(R.id.button);
button.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent();
- intent.setClass(Soft1614080902117Activity.this,Soft1614080902117Activity_1.class);
+ intent.setClass(Soft1614080902117Activity.this,Soft1614080902117Activity1.class);
startActivity(intent);
}
});
diff --git a/soft1614080902117/app/src/main/java/edu/hzuapps/androidlabs/soft1614080902117/Soft1614080902117Activity1.java b/soft1614080902117/app/src/main/java/edu/hzuapps/androidlabs/soft1614080902117/Soft1614080902117Activity1.java
new file mode 100644
index 000000000..58ffd5e34
--- /dev/null
+++ b/soft1614080902117/app/src/main/java/edu/hzuapps/androidlabs/soft1614080902117/Soft1614080902117Activity1.java
@@ -0,0 +1,26 @@
+package edu.hzuapps.androidlabs.soft1614080902117;
+import android.content.Intent;
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.view.View.OnClickListener;
+public class Soft1614080902117Activity1 extends Activity {
+
+ Button button = null;
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_soft16140809021171);
+
+ button = (Button)findViewById(R.id.button4);
+ button.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent = new Intent();
+ intent.setClass(Soft1614080902117Activity1.this,Soft1614080902117Activity.class);
+ startActivity(intent);
+ }
+ });
+ }
+}
diff --git a/soft1614080902117/app/src/main/layout/activity_soft1614080902117.xml b/soft1614080902117/app/src/main/layout/activity_soft1614080902117.xml
new file mode 100644
index 000000000..181ce8099
--- /dev/null
+++ b/soft1614080902117/app/src/main/layout/activity_soft1614080902117.xml
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/soft1614080902117/app/src/main/layout/activity_soft16140809021171.xml b/soft1614080902117/app/src/main/layout/activity_soft16140809021171.xml
new file mode 100644
index 000000000..b50828e71
--- /dev/null
+++ b/soft1614080902117/app/src/main/layout/activity_soft16140809021171.xml
@@ -0,0 +1,162 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/soft1614080902117/app/src/main/res/drawable/background.png b/soft1614080902117/app/src/main/res/drawable/background.png
new file mode 100644
index 000000000..7f71cb473
Binary files /dev/null and b/soft1614080902117/app/src/main/res/drawable/background.png differ
diff --git a/soft1614080902117/app/src/main/res/drawable/background1.png b/soft1614080902117/app/src/main/res/drawable/background1.png
new file mode 100644
index 000000000..40e224417
Binary files /dev/null and b/soft1614080902117/app/src/main/res/drawable/background1.png differ
diff --git a/soft1614080902117/app/src/main/res/drawable/cha.png b/soft1614080902117/app/src/main/res/drawable/cha.png
new file mode 100644
index 000000000..379a519fb
Binary files /dev/null and b/soft1614080902117/app/src/main/res/drawable/cha.png differ
diff --git a/soft1614080902117/app/src/main/res/drawable/gou.png b/soft1614080902117/app/src/main/res/drawable/gou.png
new file mode 100644
index 000000000..acfcc1210
Binary files /dev/null and b/soft1614080902117/app/src/main/res/drawable/gou.png differ
diff --git a/soft1614080902117/app/src/main/res/drawable/guangbiao.png b/soft1614080902117/app/src/main/res/drawable/guangbiao.png
new file mode 100644
index 000000000..9cff06de8
Binary files /dev/null and b/soft1614080902117/app/src/main/res/drawable/guangbiao.png differ
diff --git a/soft1614080902117/app/src/main/res/drawable/paizhao.png b/soft1614080902117/app/src/main/res/drawable/paizhao.png
new file mode 100644
index 000000000..d2c0b6da1
Binary files /dev/null and b/soft1614080902117/app/src/main/res/drawable/paizhao.png differ
diff --git a/soft1614080902117/app/src/main/res/drawable/shezhi.png b/soft1614080902117/app/src/main/res/drawable/shezhi.png
new file mode 100644
index 000000000..eae9de401
Binary files /dev/null and b/soft1614080902117/app/src/main/res/drawable/shezhi.png differ
diff --git a/soft1614080902117/app/src/main/res/drawable/xinjian.png b/soft1614080902117/app/src/main/res/drawable/xinjian.png
new file mode 100644
index 000000000..3511dd28b
Binary files /dev/null and b/soft1614080902117/app/src/main/res/drawable/xinjian.png differ
diff --git a/soft1614080902117/app/src/main/res/drawable/zhaopian.png b/soft1614080902117/app/src/main/res/drawable/zhaopian.png
new file mode 100644
index 000000000..682892b21
Binary files /dev/null and b/soft1614080902117/app/src/main/res/drawable/zhaopian.png differ
diff --git a/soft1614080902117/app/src/main/res/values/strings.xml b/soft1614080902117/app/src/main/res/values/strings.xml
new file mode 100644
index 000000000..f5b531d0e
--- /dev/null
+++ b/soft1614080902117/app/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+
+ Soft1614080902117备忘录
+
diff --git a/soft1614080902117/report1.md b/soft1614080902117/report1.md
index 93e5d5e45..adafe0035 100644
--- a/soft1614080902117/report1.md
+++ b/soft1614080902117/report1.md
@@ -38,4 +38,4 @@ $ git push
## 4.实验体会
本次实验初次使用GitHub平台提交实验,在实验过后对这个平台的一些功能有了一定的了解,
同时对git程序的部分指令的使用时经过百度查询有了初步的了解,在提交过程因为忽略了实
- 验步骤中的创建个人实验目录,导致前两次提交失败,改正错误后提交成功。谢谢老师!
+ 验步骤中的创建个人实验目录,导致前两次提交失败,改正错误后提交成功。
diff --git a/soft1614080902117/report2.md b/soft1614080902117/report2.md
index d2f7ce501..a20b396c5 100644
--- a/soft1614080902117/report2.md
+++ b/soft1614080902117/report2.md
@@ -99,4 +99,4 @@ package edu.hzuapps.androidlabs.soft1614080902117.myapplication;
## 4.实验体会
本次实验使用Android Studio编写代码,通过此次实验学会了在Android中Activity的
- 创建、标题的修改,同时也选择了一个相对简单的选题进行接下来的实验。
+ 创建、标题的修改,同时也选择了相对简单的选题进行接下来的实验。
diff --git a/soft1614080902117/report3.md b/soft1614080902117/report3.md
index 02709e311..381f965ae 100644
--- a/soft1614080902117/report3.md
+++ b/soft1614080902117/report3.md
@@ -26,5 +26,5 @@ Android资源使用编程

## 4.实验体会
本次实验使用Android Studio编写代码,通过此次实验学会了在一个Activity中创建按钮,
- 点击按钮可以进入另一个Activity,同时添加图片到app当中最后在运行截图。
+ 点击按钮可以进入另一个Activity,同时添加图片到app当中最后在运行并截图。
diff --git a/soft1614080902117/report4.md b/soft1614080902117/report4.md
new file mode 100644
index 000000000..c91809055
--- /dev/null
+++ b/soft1614080902117/report4.md
@@ -0,0 +1,43 @@
+# 第四次实验
+
+Android界面设计编程
+
+## 1.实验目标
+
+1.根据选题要求设计界面布局及控件使用;
+
+2.布局xml及界面控制操作代码提交并截图;
+
+3.将应用运行结果截图。
+
+## 2.实验内容
+
+1.使用一种布局方式,设计所选题目的界面:
+
+2.通过控件ID获取界面对象,执行相关操作:
+
+3.实现界面控件的事件处理,例如点击按钮:
+
+## 3.实验步骤
+1.在activity_soft1614080902117.xml中使用RelativeLayout对备忘录的主界面进行布局,在顶部添加搜索备忘录
+ 的控件Search view,同时给予默认搜索提示,在界面底部添加新建和设置按钮用于跳转至对应界面;
+
+2.在activity_soft16140809021171xml中也进行RelativeLayout布局,该界面是用于编辑备忘录,添加了×(取消)、
+ √(保存)以及照片和拍照按钮,同时也添加了EditText控件来满足编辑;
+
+3.在Soft1614080902117Activity.java中对新建按钮添加监听和事件处理,通过点击新建按钮可以跳转至编辑界面;
+
+4.在Soft1614080902117Activity1java中对√(保存)添加监听和事件处理,通过点击保存按钮可以跳转至主界面;
+
+3.在主界面点击新建按钮可以跳转至编辑界面,在编辑界面点击√(保存)可跳转回主界面,其他控件事件还在添加当中。
+
+## 4.实验结果
+
+
+
+
+## 4.实验体会
+ 根据课题需求在2个xml中采用RelativeLayout进行布局,将两个界面进行初步设计,
+ 目前只对新建按钮和√按钮添加监听和事件处理,点击新建按钮可以跳转到备忘录编辑界
+ 面,点击√跳转至原界面,同时也添加了部分按钮图标、Search view、ListView、和
+ EditText控件,进一步的事件处理还未实现。
diff --git a/soft1614080902117/shiyan401 .png b/soft1614080902117/shiyan401 .png
new file mode 100644
index 000000000..a357958e1
Binary files /dev/null and b/soft1614080902117/shiyan401 .png differ
diff --git a/soft1614080902117/shiyan402.png b/soft1614080902117/shiyan402.png
new file mode 100644
index 000000000..99f15a040
Binary files /dev/null and b/soft1614080902117/shiyan402.png differ