ui feedback bug

app/src/main/java/com/sheep/gamegroup/module/login/fragments/SignInFgt.java

@@ -277,10 +277,10 @@ public class SignInFgt extends AbsLoginFgt {
 
     public void doToggleLoginType(boolean flag) {
         loginTypeToggle.setSelected(flag);
-        loginTypeToggleText.setText(!loginTypeToggle.isSelected() ? "账号登录" : "一键登录");
-        loginTypeToggleIcon.setImageResource(!loginTypeToggle.isSelected() ? R.mipmap.login_account : R.mipmap.login_phone);
-        forPhoneContainer.setVisibility(!loginTypeToggle.isSelected() ? View.VISIBLE : View.GONE);
-        forAccountPwdContainer.setVisibility(loginTypeToggle.isSelected() ? View.VISIBLE : View.GONE);
+        loginTypeToggleText.setText(flag ? "账号登录" : "一键登录");
+        loginTypeToggleIcon.setImageResource(flag ? R.mipmap.login_account : R.mipmap.login_phone);
+        forPhoneContainer.setVisibility(flag ? View.VISIBLE : View.GONE);
+        forAccountPwdContainer.setVisibility(!flag ? View.VISIBLE : View.GONE);
     }
 
     @OnClick(R.id.register_btn)
@@ -336,11 +336,11 @@ public class SignInFgt extends AbsLoginFgt {
                     String pwd = SpUtils.getUp(getContext(), account.getAid());
                     if (TextUtils.isEmpty(pwd)) {
                         phoneNumberBox.setText(account.getLoginname());
-                        doToggleLoginType(false);
+                        doToggleLoginType(true);
                     } else {
                         userNameBox.setText(account.getLoginname());
                         passwordBox.setText(SpUtils.getUp(getContext(), account.getAid()));
-                        doToggleLoginType(true);
+                        doToggleLoginType(false);
                     }
                     popupWindow.dismiss();
                 });

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtSmallSheep.java

@@ -891,7 +891,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
     //fullHomeList有数据时，要让fullHomeList上下遮盖相邻组件
     private void checkFullHomeList() {
         if (/*SkinUtil.curPlugin == Plugin.skin_new_year && */!fullHomeList.isEmpty()) {
-            LayoutParamsUtil.resetLayoutParams(full_home_list_rv, new Lp(G.DENSITY).setTopMargin(-8).setBottomMargin(0));
+            LayoutParamsUtil.resetLayoutParams(full_home_list_rv, new Lp(G.DENSITY).setTopMargin(-3).setBottomMargin(0));
             LayoutParamsUtil.resetLayoutParams(home_notice_ll, new Lp().setTopMargin(0));
         } else {
             LayoutParamsUtil.resetLayoutParams(full_home_list_rv, new Lp().setTopMargin(0).setBottomMargin(0));