Merge pull request #35 from cooperkong/maoruibin/develop

maoruibin · Dec 13, 2016 · de693cd · de693cd
2 parents 02730d9 + a0bcbcc
commit de693cd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/src/main/java/name/gudong/translate/listener/view/TipView.java b/app/src/main/java/name/gudong/translate/listener/view/TipView.java
@@ -83,7 +83,6 @@ public void setContent(Result result, boolean isShowFavoriteButton) {
         if (result == null) return;
         mResult = result;
         initView(isShowFavoriteButton,result);
-        addListener(result);
 
         setQuery(result.getQuery());
         setPhonetic(result.getPhAm());
@@ -97,6 +96,7 @@ public void setContent(Result result, boolean isShowFavoriteButton) {
         }
 
         if (!temp.isEmpty()) {
+            addListener(result);
             Observable.from(temp).subscribe((s) -> addExplain(s));
         } else {
             error(getContext().getString(R.string.tip_explain_empty));

diff --git a/app/src/main/java/name/gudong/translate/mvp/presenters/MainPresenter.java b/app/src/main/java/name/gudong/translate/mvp/presenters/MainPresenter.java
@@ -287,7 +287,7 @@ public void call(Throwable throwable) {
 
     public static void jumpMainActivityFromClickTipView(Context context,Result result){
         Intent intent = new Intent(context, MainActivity.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP|Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.putExtra(KEY_RESULT,result);
         context.startActivity(intent);
     }