Add method exit the program

viclee888 · Nov 9, 2016 · 308c675 · 308c675
1 parent 5b210ff
commit 308c675
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/app/src/main/java/com/hitomi/activityswitcher/MainActivity.java b/app/src/main/java/com/hitomi/activityswitcher/MainActivity.java
@@ -50,13 +50,16 @@ protected void onCreate(Bundle savedInstanceState) {
         tvPage.setText("当前第" + (tag + 1) + "页" );
 
         if (index == totalCount - 1) {
-            btnNext.setVisibility(View.GONE);
+            btnNext.setText("退出程序");
         }
         btnNext.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if (++index > totalCount - 1) return;
-                startActivity(new Intent(MainActivity.this, MainActivity.class));
+                if (++index > totalCount - 1) {
+                    activitySwitcher.exit();
+                } else {
+                    startActivity(new Intent(MainActivity.this, MainActivity.class));
+                }
             }
         });
 

diff --git a/aslibrary/src/main/java/com/hitomi/aslibrary/ActivitySwitcher.java b/aslibrary/src/main/java/com/hitomi/aslibrary/ActivitySwitcher.java
@@ -57,6 +57,10 @@ public void processTouchEvent(MotionEvent event) {
         }
     }
 
+    public void exit() {
+        switcherHelper.exit();
+    }
+
     /**
      * 关闭 ActivitySwitcher 切换视图
      * @param activity

diff --git a/aslibrary/src/main/java/com/hitomi/aslibrary/ActivitySwitcherHelper.java b/aslibrary/src/main/java/com/hitomi/aslibrary/ActivitySwitcherHelper.java
@@ -148,6 +148,18 @@ public boolean isActivityControllerDisplayed() {
         return actControllerLayout.getFlag() == ActivityControllerLayout.FLAG_DISPLAYED;
     }
 
+    public void exit() {
+        if (preActivities == null) {
+            preActivities = actManager.getPreActivies();
+        } else {
+            preActivities.addAll(flingActivities);
+        }
+        for (Activity activity : preActivities) {
+            finishActivityByNoAnimation(activity);
+        }
+        android.os.Process.killProcess(android.os.Process.myPid());
+    }
+
     /**
      * End of the Activity switch
      * @param selectedIndex