bug fixed

app/src/main/AndroidManifest.xml

@@ -224,6 +224,7 @@
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.BindOrChangeWeixinAct"
+            android:theme="@style/AppActionTheme"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.TryMakeMoneyact"

app/src/main/java/com/sheep/gamegroup/event/BindWXResultEvent.java

@@ -0,0 +1,4 @@
+package com.sheep.gamegroup.event;
+
+public class BindWXResultEvent {
+}

app/src/main/java/com/sheep/gamegroup/view/activity/BindOrChangeWeixinAct.java

@@ -4,11 +4,13 @@ import android.app.Activity;
 import android.support.v7.widget.AppCompatEditText;
 import android.text.TextUtils;
 import android.view.View;
+import android.widget.EditText;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.di.components.DaggerBindOrChangeWeixinComponent;
 import com.sheep.gamegroup.di.modules.BindOrChangeWeixinModule;
+import com.sheep.gamegroup.event.BindWXResultEvent;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.presenter.BindOrChangeWeixinContract;
@@ -23,6 +25,8 @@ import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
+import org.greenrobot.eventbus.EventBus;
+
 import javax.inject.Inject;
 
 import butterknife.BindView;
@@ -34,12 +38,12 @@ import butterknife.OnClick;
  */
 
 public class BindOrChangeWeixinAct extends BaseActivity implements BindOrChangeWeixinContract.View {
+
     @BindView(R.id.weinxin_et_account)
-    AppCompatEditText weinxinEtAccount;
+    EditText weinxinEtAccount;
     @BindView(R.id.bindweixin_sure_text)
     TextView bindweixinSureText;
 
-    Activity activity;
     @Inject
     BindOrChangeWeixinPresenter presenter;
 
@@ -56,7 +60,6 @@ public class BindOrChangeWeixinAct extends BaseActivity implements BindOrChangeW
 
     @Override
     public void initView() {
-        activity = this;
         isBindOrChange = getIntent().getBooleanExtra("type", false);
         from = getIntent().getIntExtra("from", ChangeWxOrTelAct.TYPE_NORMAL);
         if(isBindOrChange){
@@ -66,8 +69,9 @@ public class BindOrChangeWeixinAct extends BaseActivity implements BindOrChangeW
         }
         TitleBarUtils
                 .getInstance()
-                .setTitle(activity, isBindOrChangeStr)
-                .setTitleFinish(activity);
+                .setShowOrHide(this, true)
+                .setTitle(this, isBindOrChangeStr)
+                .setTitleFinish(this);
         DaggerBindOrChangeWeixinComponent.builder()
                 .netComponent(SheepApp.getInstance().getNetComponent())
                 .bindOrChangeWeixinModule(new BindOrChangeWeixinModule(this))
@@ -127,6 +131,7 @@ public class BindOrChangeWeixinAct extends BaseActivity implements BindOrChangeW
         }
         finish();
         CommonUtil.getInstance().updateUserInfo(null);
+        EventBus.getDefault().post(new BindWXResultEvent());
     }
 
     @Override

app/src/main/java/com/sheep/gamegroup/view/activity/ChangeWxOrTelAct.java

@@ -1,15 +1,21 @@
 package com.sheep.gamegroup.view.activity;
 
+import android.content.Intent;
+import android.os.Bundle;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.event.BindWXResultEvent;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
 import butterknife.BindView;
 import butterknife.OnClick;
 
@@ -26,6 +32,12 @@ public class ChangeWxOrTelAct extends BaseActivity {
     ImageView no_bind_img;
 
     @Override
+    public void onCreate(Bundle savedIntent){
+        super.onCreate(savedIntent);
+        EventBus.getDefault().register(this);
+    }
+
+    @Override
     protected int getLayoutId() {
         return R.layout.change_wx_tel_layout;
     }
@@ -53,6 +65,16 @@ public class ChangeWxOrTelAct extends BaseActivity {
     public void onViewClicked() {
         Jump2View.getInstance().goBindOrChangeWeixinView(ChangeWxOrTelAct.this, true, from);
         UMConfigUtils.onEvent(UMConfigUtils.Event.USER_BIND_WEIXIN);
+    }
+
+    @Subscribe
+    public void busBindWxResult(BindWXResultEvent ev){
         finish();
     }
+
+    @Override
+    public void onDestroy(){
+        EventBus.getDefault().unregister(this);
+        super.onDestroy();
+    }
 }

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

@@ -30,7 +30,7 @@
             android:layout_weight="1"
             android:gravity="center"
             android:maxLength="20"
-            android:hint="输入用户名(如邮箱地址、常用英文等唯一标识)" />
+            android:hint="(如邮箱地址、常用英文等唯一标识)" />
 
     </LinearLayout>
 

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

@@ -3,11 +3,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:fitsSystemWindows="true"
     android:background="@color/bg_gray">
 
-    <include
-        layout="@layout/title"/>
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -22,7 +20,7 @@
             style="@style/nomal_txt_style_12"
             android:layout_marginBottom="@dimen/content_padding_15"
             android:layout_marginLeft="@dimen/content_padding_small"/>
-        <android.support.v7.widget.AppCompatEditText
+        <EditText
             android:id="@+id/weinxin_et_account"
             style="@style/edt_style"
             android:layout_width="match_parent"