hzuapps#3 提交实验3代码

yinghaocai · Apr 12, 2019 · d7ba9a1 · d7ba9a1
1 parent be263eb
commit d7ba9a1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 22 deletions.
diff --git a/...main/java/edu/hzuapps/androidlabs/com1714080901141/Com1714080901141ActivityCollector.java b/...main/java/edu/hzuapps/androidlabs/com1714080901141/Com1714080901141ActivityCollector.java
@@ -20,6 +20,6 @@ public static void finishAll(){
             }
         }
         activities.clear();
-        android.os.Process.killProcess(android.os.Process.myPid());//kill all processes
+        //android.os.Process.killProcess(android.os.Process.myPid());//kill all processes,exit without heritage
     }
 }
diff --git a/...rc/main/java/edu/hzuapps/androidlabs/com1714080901141/Com1714080901141DialogActivity.java b/...rc/main/java/edu/hzuapps/androidlabs/com1714080901141/Com1714080901141DialogActivity.java
@@ -24,8 +24,8 @@ public void onClick(View v) {
         select_yes.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                Com1714080901141MainActivity.exit=true;
                 Com1714080901141ActivityCollector.finishAll();//exit all activity
-
             }
         });
 

diff --git a/.../src/main/java/edu/hzuapps/androidlabs/com1714080901141/Com1714080901141MainActivity.java b/.../src/main/java/edu/hzuapps/androidlabs/com1714080901141/Com1714080901141MainActivity.java
@@ -13,6 +13,7 @@
 public class Com1714080901141MainActivity extends Com1714080901141BaseActivity {
 
     private TextView mTextMessage;
+    public static boolean exit;
 
     private BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener
             = new BottomNavigationView.OnNavigationItemSelectedListener() {
@@ -37,23 +38,18 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
         }
     };
 
+    @Override
+    public void onBackPressed() {
+        Intent intent=new Intent(Com1714080901141MainActivity.this,Com1714080901141DialogActivity.class);
+        startActivity(intent);
+    }
+
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        exit=false;
         setContentView(R.layout.activity_main);
-
         mTextMessage = (TextView) findViewById(R.id.message);
-        BottomNavigationView navigation = (BottomNavigationView) findViewById(R.id.navigation);
-        navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener);
-
-        Button startDialogActivity=(Button) findViewById(R.id.start_dialog_activity);
-        startDialogActivity.setOnClickListener(new View.OnClickListener(){
-            @Override
-            public void onClick(View v){
-                Intent intent=new Intent(Com1714080901141MainActivity.this,Com1714080901141DialogActivity.class);
-                startActivity(intent);
-            }
-        });
     }
-
 }
diff --git a/students/com171408901141/app/src/main/res/layout/activity_main.xml b/students/com171408901141/app/src/main/res/layout/activity_main.xml
@@ -31,11 +31,4 @@
         app:layout_constraintRight_toRightOf="parent"
         app:menu="@menu/navigation" />
 
-    <Button
-        android:id="@+id/start_dialog_activity"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="exit"
-        tools:layout_editor_absoluteX="323dp"
-        tools:layout_editor_absoluteY="627dp" />
 </android.support.constraint.ConstraintLayout>