yoyiyi

dcn01 · Sep 14, 2017 · 615fcbc · 615fcbc
1 parent 394b67c
commit 615fcbc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/app/src/main/java/com/yoyiyi/soleil/base/BaseActivity.java b/app/src/main/java/com/yoyiyi/soleil/base/BaseActivity.java
@@ -24,7 +24,6 @@
 
 import butterknife.ButterKnife;
 import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Consumer;
 
 
 /**
@@ -270,10 +269,7 @@ protected void visible(final @IdRes int... id) {
 
     private View $(@IdRes int id) {
         View view;
-        if (this != null) {
-            view = this.findViewById(id);
-            return view;
-        }
-        return null;
+        view = this.findViewById(id);
+        return view;
     }
 }
diff --git a/app/src/main/java/com/yoyiyi/soleil/module/home/MainActivity.java b/app/src/main/java/com/yoyiyi/soleil/module/home/MainActivity.java
@@ -11,7 +11,6 @@
 import android.view.KeyEvent;
 import android.view.MenuItem;
 
-import com.yoyiyi.soleil.BiliSoleilApplication;
 import com.yoyiyi.soleil.R;
 import com.yoyiyi.soleil.base.BaseActivity;
 import com.yoyiyi.soleil.constant.Constants;
@@ -116,7 +115,10 @@ private void exitApp() {
             ToastUtils.showToast("再按一次退出");
             exitTime = System.currentTimeMillis();
         } else {
-            BiliSoleilApplication.getInstance().exitApp();
+            // BiliSoleilApplication.getInstance().exitApp();
+            Event.ExitEvent event = new Event.ExitEvent();
+            event.exit = -1;
+            RxBus.INSTANCE.post(event);
         }
     }