diff --git a/README.md b/README.md
index c599907..e735837 100644
--- a/README.md
+++ b/README.md
@@ -1,31 +1,14 @@
#深入Activity,Activity启动模式LaunchMode完全解析
#1.Standard:标准启动模式
-Activity默认模式,所有的Activity遵循元素进栈出栈的特性,例如进栈序列为A->B->C->D,D呈现在页面上,按返回键出栈顺序久违D->C->B->A.
-
-```flow
-st=>start: Start
-i=>inputoutput: 输入年份n
-cond1=>condition: n能否被4整除?
-cond2=>condition: n能否被100整除?
-cond3=>condition: n能否被400整除?
-o1=>inputoutput: 输出非闰年
-o2=>inputoutput: 输出非闰年
-o3=>inputoutput: 输出闰年
-o4=>inputoutput: 输出闰年
-e=>end
-st->i->cond1
-cond1(no)->o1->e
-cond1(yes)->cond2
-cond2(no)->o3->e
-cond2(yes)->cond3
-cond3(yes)->o2->e
-cond3(no)->o4->e
-```
+Activity的默认模式,所有的Activity元素遵循先进后出的进栈出栈的特性,例如进栈序列为A->B->C,CActivity展示给用户在页面上,按返回键出栈顺序为C->B->A.。这种的比较简单
#2.SingleTop:栈顶复用模式
-栈顶复用模式,如果要开启的activity在任务栈的顶部已经存在,就不会创建新的实例,而是调用 onNewIntent() 方法。避免栈顶的activity被重复的创建。
+栈顶复用模式,如果想要打开的activity在任务栈的栈顶已经存在,就不会创重新建新的实例,而是调用该Activity的 onNewIntent() 方法。避免栈顶的activity被重复的创建。
#3.SingleTask:栈内复用模式
-如果要启动的Activity在当前栈内启动,activity只会在任务栈里面存在一个实例。如果要激活的activity,在任务栈里面已经存在,就不会创建新的activity,而是复用这个已经存在的activity,调用 onNewIntent() 方法,并且清空这个activity任务栈上面所有的activity。
+如果想要启动的Activity在当前栈内启动之后,该activity只会在任务栈里面存在一个实例。如果要再次打开这个activity,在任务栈里面如果已经存在,就不会创建新的activity,
+而是复用栈内的这个已经存在的activity,调用改Activity的 onNewIntent() 方法,并且清空这个activity任务栈上面所有的activity。
#4.SingleInstance:单一实例模式
-整个手机操作系统里面只有一个实例存在。不同的应用去打开这个activity 共享公用的同一个activity。他会运行在自己单独,独立的任务栈里面,并且任务栈里面只有他一个实例存在。应用场景:呼叫来电界面。这种模式的使用情况比较罕见,在Launcher中可能使用。或者你确定你需要使Activity只有一个实例。
\ No newline at end of file
+在整个Android系统中(可能会有很多任务栈)里面只有一个实例存在。不同的应用程序app去启动这个activity,就会共享公用同一个activity。
+他会运行在自己单独的的任务栈里面,并且这个单独的任务栈里面只会存在着一个实例。
+应用场景:系统的发短信,打电话,来电,浏览器等。这种模式在平时很少去使用,一般在Launcher中可能会用到。
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d9a04d8..d3aa357 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,6 +19,9 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/cn/bluemobi/dylan/activitylaunchmode/MainActivity.java b/app/src/main/java/cn/bluemobi/dylan/activitylaunchmode/MainActivity.java
index 33397b3..56c973b 100644
--- a/app/src/main/java/cn/bluemobi/dylan/activitylaunchmode/MainActivity.java
+++ b/app/src/main/java/cn/bluemobi/dylan/activitylaunchmode/MainActivity.java
@@ -5,6 +5,7 @@ import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.view.View;
+import cn.bluemobi.dylan.activitylaunchmode.singleinstance.SingleInstanceActivity;
import cn.bluemobi.dylan.activitylaunchmode.singletask.SingleTaskActivity;
import cn.bluemobi.dylan.activitylaunchmode.singletop.SingleTopActivity;
@@ -24,4 +25,8 @@ public class MainActivity extends AppCompatActivity {
public void onClick2(View view) {
startActivity(new Intent(this, SingleTaskActivity.class));
}
+
+ public void onClick3(View view) {
+ startActivity(new Intent(this, SingleInstanceActivity.class));
+ }
}
diff --git a/app/src/main/java/cn/bluemobi/dylan/activitylaunchmode/singleinstance/SecondActivity.java b/app/src/main/java/cn/bluemobi/dylan/activitylaunchmode/singleinstance/SecondActivity.java
new file mode 100644
index 0000000..4c57823
--- /dev/null
+++ b/app/src/main/java/cn/bluemobi/dylan/activitylaunchmode/singleinstance/SecondActivity.java
@@ -0,0 +1,35 @@
+package cn.bluemobi.dylan.activitylaunchmode.singleinstance;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+
+import cn.bluemobi.dylan.activitylaunchmode.singletask.LoginActivity;
+import cn.bluemobi.dylan.activitylaunchmode.singletask.RegisterActivity;
+
+/**
+ * Created by yuandl on 2016-11-18.
+ */
+
+public class SecondActivity extends AppCompatActivity {
+ @Override
+ protected void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ Button button = new Button(this);
+ button.setGravity(Gravity.CENTER);
+ button.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+ button.setText("这是二个界面,SingleInstance的启动模式,点击跳转到第三个Activity(标准的启动模式)");
+ setContentView(button);
+ button.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ startActivity(new Intent(SecondActivity.this, ThirdActivity.class));
+ }
+ });
+ }
+}
diff --git a/app/src/main/java/cn/bluemobi/dylan/activitylaunchmode/singleinstance/SingleInstanceActivity.java b/app/src/main/java/cn/bluemobi/dylan/activitylaunchmode/singleinstance/SingleInstanceActivity.java
new file mode 100644
index 0000000..c959411
--- /dev/null
+++ b/app/src/main/java/cn/bluemobi/dylan/activitylaunchmode/singleinstance/SingleInstanceActivity.java
@@ -0,0 +1,36 @@
+package cn.bluemobi.dylan.activitylaunchmode.singleinstance;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+
+import cn.bluemobi.dylan.activitylaunchmode.singletask.LoginActivity;
+import cn.bluemobi.dylan.activitylaunchmode.singletask.RegisterActivity;
+
+/**
+ * Created by yuandl on 2016-11-18.
+ */
+
+public class SingleInstanceActivity extends AppCompatActivity {
+ @Override
+ protected void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ Button button = new Button(this);
+ button.setGravity(Gravity.CENTER);
+ button.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+ button.setText("这是第一界面,标准的启动模式,点击跳转到SecondActivity(SecondActivity启动模式是SingleInstance)");
+ setContentView(button);
+ button.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ startActivity(new Intent(SingleInstanceActivity.this, SecondActivity.class));
+ }
+ });
+ }
+}
diff --git a/app/src/main/java/cn/bluemobi/dylan/activitylaunchmode/singleinstance/ThirdActivity.java b/app/src/main/java/cn/bluemobi/dylan/activitylaunchmode/singleinstance/ThirdActivity.java
new file mode 100644
index 0000000..9da04b0
--- /dev/null
+++ b/app/src/main/java/cn/bluemobi/dylan/activitylaunchmode/singleinstance/ThirdActivity.java
@@ -0,0 +1,34 @@
+package cn.bluemobi.dylan.activitylaunchmode.singleinstance;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+
+import cn.bluemobi.dylan.activitylaunchmode.singletask.RegisterActivity;
+
+/**
+ * Created by yuandl on 2016-11-18.
+ */
+
+public class ThirdActivity extends AppCompatActivity {
+ @Override
+ protected void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ Button button = new Button(this);
+ button.setGravity(Gravity.CENTER);
+ button.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+ button.setText("这是三个界面,标准的启动模式,点击回退");
+ setContentView(button);
+ button.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ finish();
+ }
+ });
+ }
+}
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 2407dbc..fc37e91 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -19,7 +19,8 @@
android:layout_marginStart="27dp"
android:layout_marginTop="64dp"
android:onClick="onClick"
- android:text="@string/singleTop" />
+ android:text="@string/singleTop"
+ android:textAllCaps="false" />
+ android:text="@string/singleTask"
+ android:textAllCaps="false" />
+
+
+
diff --git a/app/src/main/res/values-v14/styles.xml b/app/src/main/res/values-v14/styles.xml
new file mode 100644
index 0000000..ff3c6bb
--- /dev/null
+++ b/app/src/main/res/values-v14/styles.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3884d12..268a015 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,4 +3,5 @@
Settings
singleTop-->栈顶复用模式>
singleTask-->栈内复用模式>
+ singleInstance-->单一实例模式>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index dfd9e89..5150918 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -8,6 +8,7 @@
- @color/colorAccent
+