浏览代码

登录成功后,结束login 类

liujiangyao 8 年之前
父节点
当前提交
907df5edf7

+ 0 - 12
app/src/main/java/com/sheep/gamegroup/presenter/PhonePresenter.java

@@ -2,26 +2,14 @@ package com.sheep.gamegroup.presenter;
 
 import android.util.Log;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.annotation.JSONField;
 import com.orhanobut.logger.Logger;
 import com.sheep.gamegroup.model.api.ApiService;
-import com.sheep.gamegroup.model.entity.BaseEntity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.util.XXTEA;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.HashMap;
-import java.util.Map;
-
 import javax.inject.Inject;
 
-import rx.Observable;
 import rx.Observer;
-import rx.functions.Func0;
-import rx.functions.Func1;
 import rx.schedulers.Schedulers;
 
 /**

+ 10 - 0
app/src/main/java/com/sheep/gamegroup/util/ActivityManager.java

@@ -39,6 +39,16 @@ public class ActivityManager {
         }
     }
     /**
+     * 结束制定activity
+     */
+    public void endActivity(Class<? extends Activity> cls){
+        for(Activity activity: activityStack){
+            if(activity.getClass().equals(cls)){
+                endActivity(activity);
+            }
+        }
+    }
+    /**
      * 活的当前的activity(即最上层)
      */
     public Activity currentActivity(){

+ 2 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/LoginAct.java

@@ -14,9 +14,11 @@ import com.sheep.gamegroup.di.modules.LoginModule;
 import com.sheep.gamegroup.presenter.LoginContract;
 import com.sheep.gamegroup.presenter.LoginPresenter;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 import com.umeng.socialize.UMAuthListener;
 import com.umeng.socialize.UMShareAPI;
 import com.umeng.socialize.bean.SHARE_MEDIA;
@@ -51,7 +53,6 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
 
     @Override
     public void initView() {
-
         DaggerLoginComponent.builder()
                 .netComponent(SheepApp.get(this).getNetComponent())
                 .loginModule(new LoginModule(this))

+ 6 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/PhoneAct.java

@@ -32,6 +32,7 @@ import com.sheep.jiuyan.samllsheep.page.MainActivity;
 import com.sheep.jiuyan.samllsheep.page.SplashActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import org.xutils.ex.DbException;
 
@@ -73,6 +74,10 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
     @Override
     public void initView() {
         activity = this;
+        TitleBarUtils
+                .getInstance()
+                .setTitle(this,"手机号登录")
+                .setTitleFinish(this);
         DaggerPhoneComponent.builder()
                 .netComponent(SheepApp.get(this).getNetComponent())
                 .phoneModule(new PhoneModule(this))
@@ -223,7 +228,7 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
         }
 
         Jump2View.getInstance().goHomePageView(activity, null);
-//        ActivityManager.getInstance().endActivity(null);
+        ActivityManager.getInstance().endActivity(LoginAct.class);
         finish();
         Log.e("---login_-", o.toString());
     }