Merge remote-tracking branch 'origin/master'

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

@@ -356,7 +356,7 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        action1.call(null);
+                        G.showToast(baseMessage);
                     }
 
                     @Override