moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[BugFix]登录功能bug修复

Browse Source
This commit is contained in:
wushaocheng
2023-08-16 16:57:57 +08:00
parent f5d3f45001
commit a9405eb8f8
18 changed files with 357 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/src/main/java/com/yizhuan/erban/ui/login/LoginActivity.java
View File

@@ -46,6 +46,8 @@ import com.yizhuan.xchat_android_core.UriProvider;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.auth.event.LoginEvent;
import com.yizhuan.xchat_android_core.auth.event.LoginReportEvent;
import com.yizhuan.xchat_android_library.common.SpConstants;
import com.yizhuan.xchat_android_library.common.util.SPUtils;
import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
@@ -144,19 +146,28 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
tvProtocol = findViewById(R.id.tv_protocol);
tvProtocolHint = findViewById(R.id.tv_protocol_hint);
if (AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) {
findViewById(R.id.space_google).setVisibility(View.VISIBLE);
findViewById(R.id.tv_google).setVisibility(View.VISIBLE);
findViewById(R.id.cs_google).setVisibility(View.VISIBLE);
} else {
findViewById(R.id.space_google).setVisibility(View.GONE);
findViewById(R.id.tv_google).setVisibility(View.GONE);
findViewById(R.id.cs_google).setVisibility(View.GONE);
}
String loginType = SPUtils.getString(SpConstants.LOGIN_TYPE, "");
switch (loginType) {
case SpConstants.GOOGLE:
findViewById(R.id.tv_google_last_login).setVisibility(View.VISIBLE);
break;
case SpConstants.FACEBOOK:
findViewById(R.id.tv_facebook_last_login).setVisibility(View.VISIBLE);
break;
case SpConstants.LINE:
findViewById(R.id.tv_line_last_login).setVisibility(View.VISIBLE);
break;
}
}
private void onSetListener() {
findViewById(R.id.tv_facebook).setOnClickListener(this);
findViewById(R.id.tv_line).setOnClickListener(this);
findViewById(R.id.tv_google).setOnClickListener(this);
findViewById(R.id.tv_phone).setOnClickListener(this);
findViewById(R.id.cs_facebook).setOnClickListener(this);
findViewById(R.id.cs_line).setOnClickListener(this);
findViewById(R.id.cs_google).setOnClickListener(this);
findViewById(R.id.tv_others).setOnClickListener(this);
}
@@ -234,7 +245,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
}
switch (v.getId()) {
case R.id.tv_facebook:
case R.id.cs_facebook:
//判断当前token，如果不为空，则已经获取过权限，否则读取权限走registerCallback回调
AccessToken accessToken = AccessToken.getCurrentAccessToken();
Profile profile = Profile.getCurrentProfile();
@@ -272,7 +283,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
// }
// });
break;
case R.id.tv_line:
case R.id.cs_line:
reportLoginType(IReportConstants.TWO);
getDialogManager().showProgressDialog(this);
AuthModel.get().lineLogin()
@@ -291,6 +302,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
ReportManager.get().reportEvent(FirebaseAnalytics.Event.LOGIN, map);
ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_LOGIN);
getDialogManager().dismissDialog();
SPUtils.putString(SpConstants.LOGIN_TYPE, SpConstants.LINE);
}
@Override
@@ -302,7 +314,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
});
break;
case R.id.tv_google:
case R.id.cs_google:
reportLoginType(IReportConstants.THREE);
getDialogManager().showProgressDialog(this);
AuthModel.get().googleLogin()
@@ -321,6 +333,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
ReportManager.get().reportEvent(FirebaseAnalytics.Event.LOGIN, map);
ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_LOGIN);
getDialogManager().dismissDialog();
SPUtils.putString(SpConstants.LOGIN_TYPE, SpConstants.GOOGLE);
}
@Override
@@ -332,10 +345,6 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
}
});
break;
case R.id.tv_phone:
reportLoginType(IReportConstants.FOUR);
LoginPhoneActivity.start(this);
break;
case R.id.tv_others:
reportLoginType(IReportConstants.FIVE);

23
app/src/main/java/com/yizhuan/erban/ui/login/LoginBoundAuthCodeActivity.kt
View File

@@ -2,6 +2,8 @@ package com.yizhuan.erban.ui.login
import android.content.Context
import android.content.Intent
import android.text.Editable
import android.text.TextWatcher
import android.view.KeyEvent
import android.view.MotionEvent
import android.view.View
@@ -20,7 +22,8 @@ import org.greenrobot.eventbus.EventBus
/**
* 绑定授权码
*/
class LoginBoundAuthCodeActivity : BaseViewBindingActivity<ActivityLoginBoundAuthCodeBinding>() ,View.OnClickListener{
class LoginBoundAuthCodeActivity : BaseViewBindingActivity<ActivityLoginBoundAuthCodeBinding>(),
View.OnClickListener {
companion object {
@@ -33,11 +36,27 @@ class LoginBoundAuthCodeActivity : BaseViewBindingActivity<ActivityLoginBoundAut
override fun init() {
binding.btnNext.setOnClickListener(this)
binding.btnNext.addTextChangedListener(object : TextWatcher {
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
}
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
}
override fun afterTextChanged(s: Editable?) {
val enabled = !TextUtils.isEmptyText(binding.etAccount.text.toString())
&& binding.etAccount.text.toString().trim { it <= ' ' }.isNotEmpty()
binding.btnNext.isEnabled = enabled
}
})
}
override fun onClick(view: View?) {
when (view?.id) {
R.id.btnNext ->{
R.id.btnNext -> {
if (TextUtils.isEmptyText(binding.etAccount.text.toString())) {
toast(getString(R.string.bound_auth_code_is_empty))
return

16
app/src/main/java/com/yizhuan/erban/ui/login/LoginPasswordActivity.java
View File

@@ -32,6 +32,8 @@ import com.yizhuan.xchat_android_core.DemoCache;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.auth.event.LoginEvent;
import com.yizhuan.xchat_android_core.code.CodeType;
import com.yizhuan.xchat_android_library.common.SpConstants;
import com.yizhuan.xchat_android_library.common.util.SPUtils;
import com.yizhuan.xchat_android_library.utils.TextWatcherWrapper;
import org.greenrobot.eventbus.EventBus;
@@ -163,7 +165,7 @@ public class LoginPasswordActivity extends BaseActivity {
.subscribe(new SingleObserver<String>() {
@Override
public void onSubscribe(Disposable d) {
mCompositeDisposable.add(d);
}
@Override
@@ -175,6 +177,7 @@ public class LoginPasswordActivity extends BaseActivity {
@Override
public void onError(Throwable e) {
getDialogManager().dismissDialog();
if (e.getMessage() != null) {
toast(e.getMessage());
}
@@ -192,9 +195,12 @@ public class LoginPasswordActivity extends BaseActivity {
this,
getString(R.string.ui_login_logincodeactivity_02)
);
String areaCode = tvAreaCode.getText().toString().substring(1);
String phone = tvAreaCode.getText().toString()
.substring(1) + etAccount.getText().toString();
AuthModel.get().login(
tvAreaCode.getText().toString(),
etAccount.getText().toString(),
areaCode,
phone,
"",
smsCode,
"",
@@ -216,6 +222,7 @@ public class LoginPasswordActivity extends BaseActivity {
ReportManager.get().reportEvent(FirebaseAnalytics.Event.LOGIN, map);
ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_LOGIN);
stopCounter();
SPUtils.putString(SpConstants.LOGIN_TYPE, "");
}
@Override
@@ -293,6 +300,8 @@ public class LoginPasswordActivity extends BaseActivity {
@Override
protected void onDestroy() {
super.onDestroy();
getDialogManager().dismissDialog();
stopCounter();
EventBus.getDefault().unregister(this);
}
@@ -325,6 +334,7 @@ public class LoginPasswordActivity extends BaseActivity {
ReportManager.get().reportEvent(FirebaseAnalytics.Event.LOGIN, map);
ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_LOGIN);
getDialogManager().dismissDialog();
SPUtils.putString(SpConstants.LOGIN_TYPE, "");
}
@Override

5
app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java
View File

@@ -10,6 +10,8 @@ import android.widget.ImageView;
import android.widget.RadioButton;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.AppCompatImageView;
import androidx.appcompat.widget.AppCompatTextView;
import com.adjust.sdk.Adjust;
import com.google.android.material.textfield.TextInputEditText;
@@ -50,7 +52,7 @@ public class AddUserInfoFragment extends BaseFragment
private static final String TAG = "AddUserInfoFragment";
private TextInputEditText tvNick, tvCode;
private Button okBtn;
private ImageView tvRandomNick;
private AppCompatTextView tvRandomNick;
private int gender = -1;
private XRadioGroup rgGender;
private RadioButton rbMale;
@@ -72,7 +74,6 @@ public class AddUserInfoFragment extends BaseFragment
tvRandomNick = view.findViewById(R.id.tv_random_nick);
rgGender = view.findViewById(R.id.rg_gender);
rbMale = view.findViewById(R.id.rb_male);
}
@Override

21
app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.kt
View File

@@ -25,7 +25,9 @@ import com.yizhuan.xchat_android_core.auth.event.LogoutEvent
import com.yizhuan.xchat_android_core.user.UserModel
import com.yizhuan.xchat_android_core.user.bean.UserInfo
import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils
import com.yizhuan.xchat_android_library.common.SpConstants
import com.yizhuan.xchat_android_library.common.file.FileHelper
import com.yizhuan.xchat_android_library.common.util.SPUtils
import com.yizhuan.xchat_android_library.utils.ResUtil
import com.yizhuan.xchat_android_library.utils.config.BasicConfig
import com.yizhuan.xchat_android_library.utils.file.JXFileUtils
@@ -114,8 +116,23 @@ class SettingActivity : BaseViewBindingActivity<ActivitySettingBinding>(), View.
ModifyPwdActivity.start(this, ModifyPwdActivity.PAY_PWD)
}
R.id.btn_login_out -> {
dialogManager.showProgressDialog(this)
LogoutHelper.logout()
val cacheLoginUserInfo = UserModel.get().cacheLoginUserInfo ?: return
if (!cacheLoginUserInfo.isBindPasswd && !SPUtils.getBoolean(SpConstants.SET_PASSWORD, false)) {
dialogManager.showOkCancelWithTitleDialog(ResUtil.getString(R.string.set_login_password),
SpannableString(ResUtil.getString(R.string.set_login_password_tip)),
ResUtil.getString(R.string.login_fragment_adduserinfofragment_04),
ResUtil.getString(R.string.ui_setting_settingactivity_010),
object : OkCancelDialogListener {
override fun onCancel() {}
override fun onOk() {
SPUtils.putBoolean(SpConstants.SET_PASSWORD, true)
ModifyPwdActivity.start(this@SettingActivity, ModifyPwdActivity.LOGIN_PWD)
}
})
} else {
dialogManager.showProgressDialog(this)
LogoutHelper.logout()
}
}
R.id.tv_community_norms -> CommonWebViewActivity.start(
this,

2
app/src/main/java/com/yizhuan/erban/ui/user/activity/UserInfoActivity.java
View File

@@ -356,7 +356,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
* @param labels
*/
private void initLabel(List<String> labels) {
if (labels.isEmpty()) {
if (labels == null || labels.isEmpty()) {
if (AuthModel.get().getCurrentUid() != userId) {
mBinding.groupLabel.setVisibility(View.GONE);
mBinding.tvEditLabel.setVisibility(View.GONE);

BIN
app/src/main/res/drawable-xhdpi/bg_last_login.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 950 B

0
app/src/main/res/drawable-xhdpi/bg_login_password_code.png → app/src/main/res/drawable-xhdpi/bg_login_new.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 154 KiB

After

Width:  |  Height:  |  Size: 154 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_login_facebook.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_login_google.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_login_line.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_random_nick.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

256
app/src/main/res/layout/activity_login.xml
View File

@@ -11,7 +11,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@drawable/bg_login_activity"
app:layout_constraintDimensionRatio="750:666"
app:layout_constraintDimensionRatio="375:355"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -20,114 +20,171 @@
android:src="@drawable/ic_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintVertical_bias="0.7"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/view_bg_bottom"/>
app:layout_constraintBottom_toBottomOf="@+id/view_bg_top"/>
<LinearLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/view_bg_bottom"
android:layout_width="0dp"
android:layout_height="0dp"
android:gravity="center_horizontal"
android:orientation="vertical"
android:layout_marginTop="-80dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/view_bg_top"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<androidx.legacy.widget.Space
android:id="@+id/space_google"
android:layout_weight="1.4"
android:layout_width="wrap_content"
android:layout_height="0dp"/>
<TextView
android:id="@+id/tv_google"
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cs_google"
android:layout_width="match_parent"
android:layout_height="63dp"
android:layout_marginStart="34dp"
android:layout_marginEnd="34dp"
android:layout_height="46dp"
android:layout_marginStart="40dp"
android:layout_marginEnd="40dp"
android:layout_marginTop="@dimen/dp_16"
android:background="@drawable/shape_login_btn_bg"
android:drawablePadding="35dp"
android:gravity="center_vertical"
android:paddingStart="25dp"
android:paddingEnd="0dp"
android:text="@string/login_google"
android:textColor="@color/text_title_color"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_login_google" />
app:layout_constraintTop_toTopOf="parent">
<androidx.legacy.widget.Space
android:layout_weight="1"
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_google"
android:layout_width="match_parent"
android:layout_height="46dp"
android:gravity="center"
android:text="@string/login_google"
android:textColor="@color/color_6D6B89"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
<androidx.appcompat.widget.AppCompatImageView
android:src="@drawable/ic_login_google"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_28"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_google_last_login"
android:text="@string/last_login"
android:textSize="@dimen/sp_12"
android:textColor="@color/color_F5F6FA"
android:gravity="center"
android:background="@drawable/bg_last_login"
android:layout_width="wrap_content"
android:layout_height="0dp"/>
android:layout_height="wrap_content"
android:layout_marginEnd="-10dp"
android:layout_marginTop="-10dp"
android:visibility="gone"
tools:visibility="visible"
app:layout_constraintEnd_toEndOf="@+id/cs_google"
app:layout_constraintTop_toTopOf="@+id/cs_google"/>
<TextView
android:id="@+id/tv_facebook"
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cs_facebook"
android:layout_width="match_parent"
android:layout_height="63dp"
android:layout_marginStart="34dp"
android:layout_marginEnd="34dp"
android:layout_height="46dp"
android:layout_marginStart="40dp"
android:layout_marginEnd="40dp"
android:layout_marginTop="@dimen/dp_16"
android:background="@drawable/shape_login_btn_bg"
android:drawablePadding="35dp"
android:gravity="center_vertical"
android:paddingStart="25dp"
android:paddingEnd="0dp"
android:text="@string/login_facebook"
android:textColor="@color/text_title_color"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_login_facebook" />
app:layout_constraintTop_toBottomOf="@+id/cs_google">
<androidx.legacy.widget.Space
android:layout_weight="1"
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_facebook"
android:layout_width="match_parent"
android:layout_height="46dp"
android:gravity="center"
android:text="@string/login_facebook"
android:textColor="@color/color_6D6B89"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
<androidx.appcompat.widget.AppCompatImageView
android:src="@drawable/ic_login_facebook"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_28"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_facebook_last_login"
android:text="@string/last_login"
android:textSize="@dimen/sp_12"
android:textColor="@color/color_F5F6FA"
android:gravity="center"
android:background="@drawable/bg_last_login"
android:layout_width="wrap_content"
android:layout_height="0dp"/>
android:layout_height="wrap_content"
android:layout_marginEnd="-10dp"
android:layout_marginTop="-10dp"
android:visibility="gone"
tools:visibility="visible"
app:layout_constraintEnd_toEndOf="@+id/cs_facebook"
app:layout_constraintTop_toTopOf="@+id/cs_facebook"/>
<TextView
android:id="@+id/tv_line"
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cs_line"
android:layout_width="match_parent"
android:layout_height="63dp"
android:layout_marginStart="34dp"
android:layout_marginEnd="34dp"
android:layout_height="46dp"
android:layout_marginStart="40dp"
android:layout_marginEnd="40dp"
android:layout_marginTop="@dimen/dp_16"
android:background="@drawable/shape_login_btn_bg"
android:drawablePadding="35dp"
android:gravity="center_vertical"
android:paddingStart="25dp"
android:paddingEnd="0dp"
android:text="@string/login_line"
android:textColor="@color/text_title_color"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_login_line" />
app:layout_constraintTop_toBottomOf="@+id/cs_facebook">
<androidx.legacy.widget.Space
android:layout_weight="1"
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_line"
android:layout_width="match_parent"
android:layout_height="46dp"
android:background="@drawable/shape_login_btn_bg"
android:gravity="center"
android:text="@string/login_line"
android:textColor="@color/color_6D6B89"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
<androidx.appcompat.widget.AppCompatImageView
android:src="@drawable/ic_login_line"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_28"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_line_last_login"
android:text="@string/last_login"
android:textSize="@dimen/sp_12"
android:textColor="@color/color_F5F6FA"
android:gravity="center"
android:background="@drawable/bg_last_login"
android:layout_width="wrap_content"
android:layout_height="0dp"/>
android:layout_height="wrap_content"
android:layout_marginEnd="-10dp"
android:layout_marginTop="-10dp"
android:visibility="gone"
tools:visibility="visible"
app:layout_constraintEnd_toEndOf="@+id/cs_line"
app:layout_constraintTop_toTopOf="@+id/cs_line"/>
<TextView
android:id="@+id/tv_phone"
android:layout_width="match_parent"
android:layout_height="63dp"
android:layout_marginStart="34dp"
android:layout_marginEnd="34dp"
android:background="@drawable/shape_login_btn_bg"
android:drawablePadding="42dp"
android:gravity="center_vertical"
android:paddingStart="32dp"
android:paddingEnd="0dp"
android:text="@string/login_phone"
android:textColor="@color/text_title_color"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_login_phone" />
<androidx.legacy.widget.Space
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="0dp"/>
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_others"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -136,14 +193,13 @@
android:text="@string/login_select_other_login_type"
android:textColor="@color/text_title_color"
android:textSize="12sp"
app:drawableEndCompat="@drawable/ic_login_arrow_right" />
android:layout_marginTop="@dimen/dp_28"
app:drawableEndCompat="@drawable/ic_login_arrow_right"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cs_line"/>
<androidx.legacy.widget.Space
android:layout_width="wrap_content"
android:layout_weight="4"
android:layout_height="0dp"/>
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_protocol_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -153,12 +209,11 @@
android:text="@string/login_agree_with_the_protocol"
android:textColor="@color/white"
android:textSize="@dimen/sp_10"
android:visibility="gone" />
<androidx.legacy.widget.Space
android:layout_width="wrap_content"
android:layout_weight="0.2"
android:layout_height="0dp"/>
android:visibility="gone"
tools:visibility="visible"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@+id/tv_protocol"/>
<CheckBox
android:id="@+id/tv_protocol"
@@ -171,13 +226,12 @@
android:text="@string/text_login_protocol"
android:textColor="@color/color_B3B3C3"
android:textSize="@dimen/dp_11"
tools:ignore="SpUsage" />
tools:ignore="SpUsage"
android:layout_marginBottom="@dimen/dp_20"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
<androidx.legacy.widget.Space
android:layout_width="wrap_content"
android:layout_weight="1"
android:layout_height="0dp"/>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

39
app/src/main/res/layout/activity_login_bound_auth_code.xml
View File

@@ -10,7 +10,7 @@
android:id="@+id/view_bg_top"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@drawable/bg_login"
android:background="@drawable/bg_login_new"
app:layout_constraintDimensionRatio="750:666"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -20,15 +20,15 @@
android:id="@+id/tv_slogan"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:layout_marginTop="100dp"
android:layout_marginStart="@dimen/dp_24"
android:layout_marginBottom="@dimen/dp_24"
android:fontFamily="sans-serif-medium"
android:text="@string/text_login_auth_code"
android:textColor="@color/text_title_color"
android:textSize="40sp"
android:textSize="28sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintBottom_toTopOf="@+id/view_bg_bottom"/>
<LinearLayout
android:id="@+id/view_bg_bottom"
@@ -37,20 +37,20 @@
android:background="@drawable/shape_white_top_25dp"
android:gravity="center_horizontal"
android:orientation="vertical"
android:layout_marginTop="-20dp"
android:layout_marginTop="-120dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/view_bg_top"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<LinearLayout
android:layout_marginTop="30dp"
android:layout_marginTop="68dp"
android:layout_marginStart="34dp"
android:layout_marginEnd="34dp"
android:gravity="center_vertical"
android:background="@drawable/shape_login_btn_bg"
android:layout_width="match_parent"
android:layout_height="64dp">
android:layout_height="52dp">
<EditText
android:id="@+id/etAccount"
@@ -58,25 +58,32 @@
android:layout_height="match_parent"
android:background="@null"
android:gravity="center_vertical"
android:paddingStart="@dimen/dp_10"
android:paddingStart="@dimen/dp_24"
android:paddingEnd="@dimen/dp_10"
android:inputType="text"
android:hint="@string/Please_enter_the_authorization_code"
android:textColorHint="@color/color_B3B3C3"
android:singleLine="true"
android:textColor="@color/text_title_color"
android:textSize="@dimen/dp_15"
android:textSize="@dimen/dp_14"
tools:ignore="SpUsage" />
</LinearLayout>
<Button
android:id="@+id/btnNext"
android:layout_width="165dp"
android:layout_height="63dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="30dp"
android:background="@drawable/ic_login_next"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginStart="@dimen/dp_36"
android:layout_marginTop="48dp"
android:layout_marginEnd="@dimen/dp_36"
android:background="@drawable/bg_common_enabled"
android:enabled="false"
android:gravity="center"
android:textColor="@color/white" />
android:text="@string/text_login"
android:textColor="@color/white"
android:textSize="@dimen/sp_16"
android:textStyle="bold" />
</LinearLayout>

2
app/src/main/res/layout/activity_login_password.xml
View File

@@ -10,7 +10,7 @@
android:id="@+id/view_bg_top"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@drawable/bg_login_password_code"
android:background="@drawable/bg_login_new"
app:layout_constraintDimensionRatio="375:418"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

172
app/src/main/res/layout/fragment_add_user_info.xml
View File

@@ -12,12 +12,36 @@
android:id="@+id/view_bg_top"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@drawable/bg_login"
android:background="@drawable/bg_login_new"
app:layout_constraintDimensionRatio="750:666"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_24"
android:layout_marginBottom="@dimen/dp_24"
android:fontFamily="sans-serif-medium"
android:text="@string/layout_fragment_add_user_info_01"
android:textColor="@color/text_title_color"
android:textSize="28sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toTopOf="@+id/view_bottom_top"/>
<View
android:id="@+id/view_bottom_top"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="180dp"
app:layout_constraintBottom_toBottomOf="@+id/view_bg_top"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<View
android:id="@+id/view_bg_bottom"
android:layout_width="0dp"
@@ -30,37 +54,39 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/view_bottom_top" />
<View
android:id="@+id/view_bottom_top"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="20dp"
app:layout_constraintBottom_toTopOf="@id/rg_gender"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/tv_title"
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_gender"
android:text="@string/select_your_gender"
android:textSize="@dimen/sp_16"
android:textColor="@color/color_1F1B4F"
android:textStyle="bold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:layout_marginTop="@dimen/dp_100"
android:fontFamily="sans-serif-medium"
android:text="@string/layout_fragment_add_user_info_01"
android:textColor="@color/text_title_color"
android:textSize="40sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
android:layout_marginStart="@dimen/dp_38"
android:layout_marginTop="48dp"
app:layout_constraintTop_toTopOf="@+id/view_bg_bottom"
app:layout_constraintStart_toStartOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_detail"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/gender_cannot_modify"
android:textColor="@color/color_6D6B89"
android:textSize="@dimen/sp_12"
app:layout_constraintTop_toTopOf="@+id/tv_gender"
app:layout_constraintBottom_toBottomOf="@+id/tv_gender"
app:layout_constraintStart_toEndOf="@+id/tv_gender" />
<me.shihao.library.XRadioGroup
android:id="@+id/rg_gender"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="35dp"
android:layout_marginEnd="35dp"
android:layout_marginBottom="16dp"
android:layout_marginStart="48dp"
android:layout_marginEnd="48dp"
android:orientation="horizontal"
app:layout_constraintBottom_toTopOf="@id/tv_detail"
android:layout_marginTop="@dimen/dp_16"
app:layout_constraintTop_toBottomOf="@+id/tv_gender"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:ignore="SpUsage">
@@ -88,45 +114,18 @@
</me.shihao.library.XRadioGroup>
<TextView
android:id="@+id/tv_detail"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="23dp"
android:text="@string/gender_cannot_modify"
android:textColor="#B3B3C3"
android:textSize="@dimen/dp_13"
app:layout_constraintBottom_toTopOf="@id/view_nick_bg"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<View
android:id="@+id/view_nick_bg"
android:layout_width="0dp"
android:layout_height="63dp"
android:layout_marginStart="33dp"
android:layout_marginEnd="33dp"
android:layout_marginBottom="25dp"
android:layout_height="52dp"
android:layout_marginStart="@dimen/dp_36"
android:layout_marginEnd="@dimen/dp_36"
android:layout_marginTop="@dimen/dp_28"
android:background="@drawable/shape_login_btn_bg"
app:layout_constraintBottom_toTopOf="@id/view_code_bg"
app:layout_constraintTop_toBottomOf="@+id/rg_gender"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/tv_nick_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="23dp"
android:fontFamily="sans-serif-medium"
android:gravity="center_vertical"
android:text="@string/layout_fragment_add_user_info_02"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/dp_15"
app:layout_constraintBottom_toBottomOf="@id/view_nick_bg"
app:layout_constraintStart_toStartOf="@id/view_nick_bg"
app:layout_constraintTop_toTopOf="@id/view_nick_bg" />
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/tv_nick"
android:layout_width="0dp"
@@ -134,26 +133,33 @@
android:layout_marginEnd="9dp"
android:layout_weight="1"
android:background="@null"
android:gravity="end|center_vertical"
android:gravity="center_vertical"
android:lines="1"
android:maxLength="8"
android:paddingStart="@dimen/dp_9"
android:paddingStart="@dimen/dp_24"
android:paddingEnd="0dp"
android:singleLine="true"
android:textColor="@color/text_title_color"
android:textSize="@dimen/dp_14"
android:hint="@string/please_input_name"
android:textColorHint="@color/color_B3B3C3"
app:layout_constraintBottom_toBottomOf="@id/view_nick_bg"
app:layout_constraintEnd_toStartOf="@id/tv_random_nick"
app:layout_constraintStart_toEndOf="@id/tv_nick_title"
app:layout_constraintStart_toStartOf="@+id/view_nick_bg"
app:layout_constraintTop_toTopOf="@id/view_nick_bg"
tools:ignore="SpUsage" />
<ImageView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_random_nick"
android:text="@string/random"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_1F1B4F"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:paddingEnd="23dp"
android:src="@drawable/ic_random_nick"
android:layout_marginEnd="@dimen/dp_18"
android:drawableStart="@drawable/ic_random_nick"
android:drawablePadding="@dimen/dp_4"
android:gravity="center_vertical"
app:layout_constraintBottom_toBottomOf="@id/view_nick_bg"
app:layout_constraintEnd_toEndOf="@id/view_nick_bg"
app:layout_constraintTop_toTopOf="@id/view_nick_bg" />
@@ -161,60 +167,48 @@
<View
android:id="@+id/view_code_bg"
android:layout_width="0dp"
android:layout_height="63dp"
android:layout_marginStart="33dp"
android:layout_height="52dp"
android:layout_marginStart="36dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="33dp"
android:layout_marginBottom="30dp"
android:layout_marginEnd="36dp"
android:background="@drawable/shape_login_btn_bg"
app:layout_constraintBottom_toTopOf="@id/ok_btn"
app:layout_constraintTop_toBottomOf="@+id/view_nick_bg"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/tv_code_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="23dp"
android:fontFamily="sans-serif-medium"
android:text="@string/layout_fragment_add_user_info_03"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/dp_15"
app:layout_constraintBottom_toBottomOf="@id/view_code_bg"
app:layout_constraintStart_toStartOf="@id/view_code_bg"
app:layout_constraintTop_toTopOf="@id/view_code_bg" />
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/tv_code"
android:layout_width="0dp"
android:layout_height="45dp"
android:layout_marginStart="5dp"
android:layout_height="52dp"
android:layout_weight="1"
android:background="@null"
android:gravity="center_vertical|end"
android:gravity="center_vertical"
android:hint="@string/text_default_code"
android:lines="1"
android:maxLength="8"
android:paddingEnd="23dp"
android:paddingStart="@dimen/dp_24"
android:paddingEnd="@dimen/dp_24"
android:singleLine="true"
android:textColor="@color/text_title_color"
android:textColorHint="#B3B3C3"
android:textColorHint="@color/color_B3B3C3"
android:textSize="@dimen/dp_14"
app:layout_constraintBottom_toBottomOf="@id/view_code_bg"
app:layout_constraintEnd_toEndOf="@id/view_code_bg"
app:layout_constraintStart_toEndOf="@id/tv_code_title"
app:layout_constraintStart_toStartOf="@+id/view_code_bg"
app:layout_constraintTop_toTopOf="@id/view_code_bg"
tools:ignore="SpUsage" />
<Button
android:id="@+id/ok_btn"
android:layout_width="165dp"
android:layout_height="63dp"
android:layout_marginBottom="@dimen/dp_50"
android:layout_width="match_parent"
android:layout_height="48dp"
android:background="@drawable/selector_common_confirm"
android:text="@string/layout_fragment_add_user_info_04"
android:textColor="@color/white"
android:textSize="@dimen/sp_15"
android:layout_marginStart="@dimen/dp_36"
android:layout_marginEnd="@dimen/dp_36"
app:layout_constraintTop_toBottomOf="@+id/view_code_bg"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

11
app/src/main/res/values/strings.xml
View File

@@ -666,7 +666,7 @@
<string name="common_loading_tips">加載中…</string>
<string name="text_default_nick">Piko小新</string>
<string name="text_default_code">(選填)</string>
<string name="text_default_code">請輸入邀請碼(選填)</string>
<string name="text_room_queuing_micro_mode">排麥模式</string>
<string name="text_room_pure_mode">純凈模式</string>
@@ -912,7 +912,7 @@
<string name="search_room_tab">房間</string>
<string name="search_user_tab">用戶</string>
<string name="add_info">完善資料</string>
<string name="gender_cannot_modify">性別後期無法進行修改</string>
<string name="gender_cannot_modify">（ 性別後期無法進行修改哦～）</string>
<string name="add_user_info_desc">本軟件只提供給18歲或以上用戶使用</string>
<string name="find_new">發現萌新</string>
<string name="empty_newbie_list">暫無推薦萌新</string>
@@ -5109,5 +5109,12 @@
<string name="code_login">短信登錄</string>
<string name="please_input_piko_account">請輸入Piko賬號</string>
<string name="please_get_code">請獲取驗證碼</string>
<string name="Please_enter_the_authorization_code">請輸入授權碼</string>
<string name="select_your_gender">請選擇您的性別</string>
<string name="random">隨機</string>
<string name="please_input_name">請輸入昵稱</string>
<string name="set_login_password">設置登錄密碼</string>
<string name="set_login_password_tip">為了方便您下次登錄，請先設置登錄密碼</string>
<string name="last_login">上次登錄</string>
</resources>

5
library/src/module_common/java/com/yizhuan/xchat_android_library/common/SpConstants.kt
View File

@@ -2,4 +2,9 @@ package com.yizhuan.xchat_android_library.common
object SpConstants {
const val TAB_INFO_LIST = "tab_info_list"
const val SET_PASSWORD = "set_password"
const val LOGIN_TYPE = "login_type"
const val GOOGLE = "google"
const val FACEBOOK = "facebook"
const val LINE = "line"
}