소스 검색

修复登录后进入绑定手机号界面并点击返回键没有进入主页的bug

zengjiebin 7 년 전
부모
커밋
56c1646ccc
2개의 변경된 파일42개의 추가작업 그리고 17개의 파일을 삭제
  1. 1 1
      app/src/main/java/com/sheep/gamegroup/util/Jump2View.java
  2. 41 16
      app/src/main/java/com/sheep/gamegroup/view/activity/ChangeTelAct.java

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -277,7 +277,7 @@ public class Jump2View {
             ACache.get(SheepApp.getInstance()).put(userEntity.getOpen_id(), userEntity.getNickname());
             return false;
         }
-        return !BuildConfig.DEBUG;
+        return true;
     }
 
     /**

+ 41 - 16
app/src/main/java/com/sheep/gamegroup/view/activity/ChangeTelAct.java

@@ -1,6 +1,7 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
+import android.content.Intent;
 import android.support.v7.widget.AppCompatEditText;
 import android.text.TextUtils;
 import android.util.Log;
@@ -10,6 +11,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONObject;
+import com.kfzs.duanduan.ActMain;
 import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.event.EventTypes;
 import com.sheep.gamegroup.absBase.BaseActivity;
@@ -38,6 +40,7 @@ import javax.inject.Inject;
 
 import butterknife.BindView;
 import butterknife.OnClick;
+import rx.functions.Action1;
 
 /**
  * Created by ljy on 2018/3/27.
@@ -118,15 +121,7 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
                 .setTitleFinish(this, new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        switch (where_from){
-                            case 1:
-                                Jump2View.getInstance().goHomePageView(ChangeTelAct.this, null);
-                                break;
-                            case 30001:
-                                Jump2View.getInstance().gotoLoginAgain();
-                                break;
-                        }
-                        finish();
+                        toFinish();
                     }
                 });
         switch (where_from){
@@ -134,8 +129,14 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
                 titleBarUtils.setRightBotton(this, "跳过", 0, new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
-                        Jump2View.getInstance().goHomePageView(ChangeTelAct.this, null);
-                        finish();
+                        Jump2View.getInstance().checkLabel(activity, new Action1<BaseMessage>() {
+                            @Override
+                            public void call(BaseMessage baseMessage) {
+                                final Intent intent = new Intent(activity, ActMain.class);
+                                activity.startActivity(intent);
+                                activity.finish();
+                            }
+                        });
                     }
                 });
                 break;
@@ -159,6 +160,25 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
         refreshData();
     }
 
+    private void toFinish() {
+        switch (where_from){
+            case 1:
+                Jump2View.getInstance().checkLabel(activity, new Action1<BaseMessage>() {
+                    @Override
+                    public void call(BaseMessage baseMessage) {
+                        final Intent intent = new Intent(activity, ActMain.class);
+                        activity.startActivity(intent);
+                        activity.finish();
+                    }
+                });
+                return;
+            case 30001:
+                Jump2View.getInstance().gotoLoginAgain();
+                break;
+        }
+        finish();
+    }
+
     @Override
     public void initListener() {
         selfCountDownTimer = new SelfCountDownTimer(60 * 1000, 1000, SelfCountDownTimer.FULL_SECOND) {
@@ -207,9 +227,7 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
             hitStr = "请输入手机号码";
             noticeStr = "绑定手机号";
             phoneEtAccount.setHint(hitStr+"");
-            TitleBarUtils.getInstance()
-                    .setTitle(this, noticeStr)
-                    .setTitleFinish(this);
+            TitleBarUtils.getInstance().setTitle(this, noticeStr);
         }
     }
 
@@ -383,8 +401,15 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
         G.showToast(o.getMsg()+"");
         switch (where_from){
             case 1:
-                Jump2View.getInstance().goHomePageView(this, null);
-                break;
+                Jump2View.getInstance().checkLabel(activity, new Action1<BaseMessage>() {
+                    @Override
+                    public void call(BaseMessage baseMessage) {
+                        final Intent intent = new Intent(activity, ActMain.class);
+                        activity.startActivity(intent);
+                        activity.finish();
+                    }
+                });
+                return;
             case 30001:
                 Jump2View.getInstance().goLoginView(activity, o);
                 break;