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

修复bug

Browse Source
This commit is contained in:
wushaocheng
2022-10-09 19:42:08 +08:00
parent 928f070311
commit a41388d40d
6 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/com/yizhuan/erban/home/HomeViewModel.kt
View File

@@ -29,11 +29,11 @@ class HomeViewModel : BaseViewModel() {
private val _gameRoomLiveData = MutableLiveData<ListResult<HomeRoomInfo>>()
val gameRoomLiveData: LiveData<ListResult<HomeRoomInfo>> = _gameRoomLiveData
private val _pickRoomLiveData = MutableLiveData<HomeRoomInfo>()
val pickRoomLiveData: LiveData<HomeRoomInfo> = _pickRoomLiveData
private val _pickRoomLiveData = MutableLiveData<HomeRoomInfo?>()
val pickRoomLiveData: MutableLiveData<HomeRoomInfo?> = _pickRoomLiveData
private val _openGameRoomLiveData = MutableLiveData<Long>()
val openGameRoomLiveData: LiveData<Long> = _openGameRoomLiveData
private val _openGameRoomLiveData = MutableLiveData<Long?>()
val openGameRoomLiveData: MutableLiveData<Long?> = _openGameRoomLiveData
private val _concernsLiveData = MutableLiveData<List<HomeRoomInfo>>()
val concernsLiveData: LiveData<List<HomeRoomInfo>> = _concernsLiveData
@@ -50,8 +50,8 @@ class HomeViewModel : BaseViewModel() {
private val _resourceLiveData = MutableLiveData<List<ResourceInfo>>()
val resourceLiveData: LiveData<List<ResourceInfo>> = _resourceLiveData
private val _resourceJumpLiveData = MutableLiveData<HomeRoomInfo>()
val resourceJumpLiveData: LiveData<HomeRoomInfo> = _resourceJumpLiveData
private val _resourceJumpLiveData = MutableLiveData<HomeRoomInfo?>()
val resourceJumpLiveData: MutableLiveData<HomeRoomInfo?> = _resourceJumpLiveData
private val _singleAnchorHomeLiveData = MutableLiveData<ListResult<HomeRoomInfo>>()
val singleAnchorHomeLiveData: LiveData<ListResult<HomeRoomInfo>> = _singleAnchorHomeLiveData
@@ -61,11 +61,11 @@ class HomeViewModel : BaseViewModel() {
val singleRoomSortInfoLiveData: LiveData<ListResult<SingleRoomSortInfo>> =
_singleRoomSortInfoLiveData
private val _homeLiveTopInfoLiveData = MutableLiveData<HomeLiveTopInfo>()
val homeLiveTopInfoLiveData: LiveData<HomeLiveTopInfo> = _homeLiveTopInfoLiveData
private val _homeLiveTopInfoLiveData = MutableLiveData<HomeLiveTopInfo?>()
val homeLiveTopInfoLiveData: MutableLiveData<HomeLiveTopInfo?> = _homeLiveTopInfoLiveData
private val _anchorInfoLiveData = MutableLiveData<AnchorInfo>()
val anchorInfoLiveData: LiveData<AnchorInfo> = _anchorInfoLiveData
private val _anchorInfoLiveData = MutableLiveData<AnchorInfo?>()
val anchorInfoLiveData: MutableLiveData<AnchorInfo?> = _anchorInfoLiveData
fun getBannerInfo() {
safeLaunch {

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

@@ -79,8 +79,8 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
int userAgreementTipIndex = privacyAgreementDescTip.indexOf(userAgreementTip);
ss.setSpan(new ForegroundColorSpan(ContextCompat.getColor(context, R.color.color_2D93FF)), privacyAgreementTipIndex, privacyAgreementTipIndex + privacyAgreementTip.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
ss.setSpan(new OriginalDrawStatusClickSpan(ContextCompat.getColor(context, R.color.color_2D93FF)) {
ss.setSpan(new ForegroundColorSpan(ContextCompat.getColor(context, R.color.color_1F1A4E)), privacyAgreementTipIndex, privacyAgreementTipIndex + privacyAgreementTip.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
ss.setSpan(new OriginalDrawStatusClickSpan(ContextCompat.getColor(context, R.color.color_1F1A4E)) {
@Override
public void onClick(@NonNull View widget) {
if (widget instanceof TextView)
@@ -89,8 +89,8 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
CommonWebViewActivity.start(context, UriProvider.getPrivacyAgreement());
}
}, privacyAgreementTipIndex, privacyAgreementTipIndex + privacyAgreementTip.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
ss.setSpan(new ForegroundColorSpan(ContextCompat.getColor(context, R.color.color_2D93FF)), userAgreementTipIndex, userAgreementTipIndex + userAgreementTip.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
ss.setSpan(new OriginalDrawStatusClickSpan(ContextCompat.getColor(context, R.color.color_2D93FF)) {
ss.setSpan(new ForegroundColorSpan(ContextCompat.getColor(context, R.color.color_1F1A4E)), userAgreementTipIndex, userAgreementTipIndex + userAgreementTip.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
ss.setSpan(new OriginalDrawStatusClickSpan(ContextCompat.getColor(context, R.color.color_1F1A4E)) {
@Override
public void onClick(@NonNull View widget) {

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

@@ -65,9 +65,9 @@ public class LoginPasswordActivity extends BaseActivity {
edtPassword.addTextChangedListener(textWatcher);
btnNext.setOnClickListener(v -> login());
findViewById(R.id.tv_forget_password).setOnClickListener(v ->
getDialogManager().showOkCancelWithTitleDialog("请联系客服处理", "官方账号：123456\n" + "官方WhatsApp：123456", "我知道了","", true, () -> {
getDialogManager().showOkCancelWithTitleDialog(getString(R.string.login_contact_service), "LINE：tlw20220510", getString(R.string.button_ok), "", true, () -> {
})
})
);
}
@@ -90,7 +90,7 @@ public class LoginPasswordActivity extends BaseActivity {
}
private void login() {
getDialogManager().showProgressDialog(this, "正在登录...");
getDialogManager().showProgressDialog(this, getString(R.string.login_is_logining));
AuthModel.get().login(
edtPhone.getText().toString().trim(),
edtPassword.getText().toString().trim(),

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

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

@@ -129,7 +129,7 @@
android:drawableStart="@drawable/selector_login_radio_btn"
android:drawablePadding="@dimen/dp_5"
android:text="@string/text_login_protocol"
android:textColor="#FFBBB1FF"
android:textColor="@color/color_B3B3C3"
android:textSize="@dimen/dp_11"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

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

@@ -16,7 +16,7 @@
<!--登录页-->
<string name="login_facebook">Facebook登录</string>
<string name="login_line">Line登录</string>
<string name="login_google">Google登陆</string>
<string name="login_google">Google登录</string>
<string name="login_select_other_login_type">选择其他方式登录</string>
<string name="login_agree_with_the_protocol">同意隐私政策和用户协议后，才可以注册登录哦~</string>
<string name="hint_login_account">手机号</string>
@@ -25,7 +25,7 @@
<string name="hint_login_password_2">请输入密码</string>
<string name="text_login_to_register">立即注册</string>
<string name="text_login_forget_password">忘记密码</string>
<string name="text_login_protocol">同意%s与%s</string>
<string name="text_login_protocol">阅读并同意%s和%s</string>
<string name="text_login_protocol_2">注册即代表同意 %s</string>
<string name="text_login_protocol_3">阅读并同意%s与\n%s方可登录</string>
<string name="text_how_to_set_pwd">未设置兔兔密码的用户记得前往\n兔兔设置密码哦 %s</string>
@@ -962,4 +962,8 @@
<string name="me_my_room">我的房间</string>
<string name="me_gain_recording">收益记录</string>
<!--登录-->
<string name="login_contact_service">请联系客服处理</string>
<string name="login_is_logining">正在登录...</string>
</resources>