bug fixed

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

@@ -272,11 +272,15 @@ public class SignInFgt extends AbsLoginFgt {
 
     @OnClick(R.id.login_type_toggle)
     public void doToggleLoginType(View v) {
-        loginTypeToggle.setSelected(!loginTypeToggle.isSelected());
-        loginTypeToggleText.setText(loginTypeToggle.isSelected() ? "账号登录" : "一键登录");
-        loginTypeToggleIcon.setImageResource(loginTypeToggle.isSelected() ? R.mipmap.login_account : R.mipmap.login_phone);
-        forPhoneContainer.setVisibility(v.isSelected() ? View.VISIBLE : View.GONE);
-        forAccountPwdContainer.setVisibility(!v.isSelected() ? View.VISIBLE : View.GONE);
+        doToggleLoginType(!loginTypeToggle.isSelected());
+    }
+
+    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);
     }
 
     @OnClick(R.id.register_btn)
@@ -329,11 +333,14 @@ public class SignInFgt extends AbsLoginFgt {
                     DDProviderHelper.getInstance().deleteAccount(account);
                 });
                 viewHolder.itemView.setOnClickListener(v -> {
-                    if (loginTypeToggle.isSelected()) {
+                    String pwd = SpUtils.getUp(getContext(), account.getAid());
+                    if (TextUtils.isEmpty(pwd)) {
                         phoneNumberBox.setText(account.getLoginname());
+                        doToggleLoginType(false);
                     } else {
                         userNameBox.setText(account.getLoginname());
                         passwordBox.setText(SpUtils.getUp(getContext(), account.getAid()));
+                        doToggleLoginType(true);
                     }
                     popupWindow.dismiss();
                 });

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

@@ -175,13 +175,13 @@ public class GameCertificationActivity extends BaseActivity {
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.sdk_arrow:
-                if (isUserListOpen) {//展开
-                    sdk_arrow.setRotation(0);
-                } else {
-                    sdk_arrow.setRotation(180);
-                }
-                isUserListOpen = !isUserListOpen;
-                ViewUtil.setVisibility(sdk_change_user_list, isUserListOpen);
+//                if (isUserListOpen) {//展开
+//                    sdk_arrow.setRotation(0);
+//                } else {
+//                    sdk_arrow.setRotation(180);
+//                }
+//                isUserListOpen = !isUserListOpen;
+//                ViewUtil.setVisibility(sdk_change_user_list, isUserListOpen);
                 break;
             case R.id.icon_iv:
                 textProgressBar.setVisibility(View.GONE);

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

@@ -204,9 +204,10 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
                 break;
             case R.id.personal_info_loginname_container:
                 if (userEntity.getSet_password() == 0) {
-                    Intent intent = new Intent(PersonalInfoAct.this, ReLoginNameAct.class);
-                    intent.putExtra("name", userEntity.getUser_name());
-                    startActivity(intent);
+//                    Intent intent = new Intent(PersonalInfoAct.this, ReLoginNameAct.class);
+//                    intent.putExtra("name", userEntity.getUser_name());
+//                    startActivity(intent);
+                    Jump2View.getInstance().goChangePassword(this);
                     USER_INFO_LOGINNAME.onEvent();
                 } else {
                     G.shortToast("设置登录密码后不可修改登录名");

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

@@ -71,7 +71,7 @@
                 android:paddingTop="22dp"
                 android:paddingEnd="35dp"
                 android:paddingBottom="22dp"
-                android:text="添加账号"
+                android:text="切换账号"
                 android:textColor="#36A5ED"
                 android:textSize="14sp"
                 app:layout_constraintStart_toStartOf="parent"

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

@@ -10,6 +10,7 @@
         android:layout_height="match_parent"
         android:layout_alignParentEnd="true"
         android:layout_marginEnd="17dp"
+        android:rotation="-90"
         android:paddingStart="10dp"
         android:paddingEnd="10dp"
         android:scaleType="fitCenter"