Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

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

@@ -259,7 +259,8 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
             MyDbManager.getInstance().saveOrUpdateUser(loginEty.getUser());
             UserEntity userEntity = MyDbManager.getInstance().dbFindUser();
             Log.e("------userEntity", userEntity.getNickname() + "|" + userEntity.getMobile() + "");
-            G.showToast(userEntity.getNickname() + "|" + userEntity.getMobile());
+            showToast("登录成功");
+//            G.showToast(userEntity.getNickname() + "|" + userEntity.getMobile());
         } catch (DbException e) {
             e.printStackTrace();
         }