退出登录

app/src/main/java/com/itant/shibei/ui/TabActivity.java

@@ -19,7 +19,6 @@ import com.itant.shibei.base.BaseBeiActivity;
 import com.itant.shibei.base.ITopActionListener;
 import com.itant.shibei.bean.UpgradeBean;
 import com.itant.shibei.common.ICommonView;
-import com.itant.shibei.manager.UserInfoManager;
 import com.itant.shibei.tool.SystemTool;
 import com.itant.shibei.ui.function.FunctionFragment;
 import com.itant.shibei.ui.home.about.AboutFragment;
@@ -39,6 +38,8 @@ import com.miekir.mvp.presenter.InjectPresenter;
 import java.util.ArrayList;
 import java.util.List;
 
+import rx_activity_result2.RxActivityResult;
+
 public class TabActivity extends BaseBeiActivity implements View.OnClickListener, ICommonView<UpgradeBean> {
 
     @InjectPresenter
@@ -120,13 +121,14 @@ public class TabActivity extends BaseBeiActivity implements View.OnClickListener
         switch (v.getId()) {
             case R.id.fl_more:
                 // 点击更多
-                if (UserInfoManager.getInstance().isLogin()) {
-                    startActivity(new Intent(this, MineActivity.class));
-                } else {
-                    // 登录
-                    Intent intent = new Intent(this, LoginActivity.class);
-                    startActivity(intent);
-                }
+                Intent mineIntent = new Intent(this, MineActivity.class);
+                RxActivityResult.on(this).startIntent(mineIntent)
+                        .filter(result -> result.resultCode() == RESULT_OK)
+                        .doOnNext(result -> {
+                            startActivity(new Intent(TabActivity.this, LoginActivity.class));
+                            finish();
+                        })
+                        .subscribe();
                 break;
             case R.id.fl_search_top:
             case R.id.fl_search:

app/src/main/java/com/itant/shibei/ui/mine/MineActivity.java

@@ -106,6 +106,7 @@ public class MineActivity extends BaseBeiActivity implements View.OnClickListene
                .setPositiveButton("确定", (DialogInterface dialog, int which) -> {
             dialog.dismiss();
             UserInfoManager.getInstance().setBeiUser(null);
+            setResult(RESULT_OK);
             finish();
         }).create();
         alertDialog.show();

app/src/main/res/layout/activity_mine.xml

@@ -51,9 +51,10 @@
             android:paddingStart="@dimen/activity_horizontal_margin"
             android:paddingEnd="@dimen/activity_horizontal_margin"
             android:text="增加图片"
-            android:textColor="@color/black_text" />
+            android:textColor="@color/black_text"
+            android:visibility="gone"/>
 
-        <include layout="@layout/view_divider_common"/>
+        <!--<include layout="@layout/view_divider_common"/>-->
 
 
         <Switch
@@ -63,8 +64,7 @@
             android:gravity="center_vertical"
             android:layout_marginStart="@dimen/margin_default"
             android:layout_marginEnd="@dimen/margin_default"
-            android:text="接口是否收费"
-            android:visibility="gone"/>
+            android:text="是否限制访问伊甸园"/>
 
         <!--<include layout="@layout/view_divider_common" />-->
     </LinearLayout>