yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

验证码登录替换

Browse Source
This commit is contained in:
huangjian
2023-03-17 21:10:50 +08:00
parent 6234480529
commit 8c8f93580d
5 changed files with 21 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/nnbc123/app/home/HomeViewModel.kt
View File

@@ -96,9 +96,14 @@ class HomeViewModel : BaseViewModel() {
} }
fun getHomeResource() { fun getHomeResource() {
safeLaunch { safeLaunch(
_resourceLiveData.value = HomeModel.getHomeResource() block = {
} _resourceLiveData.value = HomeModel.getHomeResource()
},
onError = {
}
)
} }
fun getResourceJumpInfo(id: Int) { fun getResourceJumpInfo(id: Int) {

4
app/src/main/java/com/nnbc123/app/ui/user/viewmodel/UserInfoViewModel.kt
View File

@@ -59,7 +59,7 @@ class UserInfoViewModel : ViewModel() {
{ data -> data?.let { _hallData.value = data } }, { data -> data?.let { _hallData.value = data } },
{ th -> { th ->
th.printStackTrace() th.printStackTrace()
th.message?.toast() //th.message?.toast()
} }
) )
disposable.add(subscribe) disposable.add(subscribe)
@@ -71,7 +71,7 @@ class UserInfoViewModel : ViewModel() {
.toFlowable() .toFlowable()
.subscribe({ _userInfoSkillData.value = it }, { th -> .subscribe({ _userInfoSkillData.value = it }, { th ->
th.printStackTrace() th.printStackTrace()
th.message?.toast() //th.message?.toast()
}) })
disposable.add(subscribe) disposable.add(subscribe)
} }

12
app/src/module_quick_pass/java/com/nnbc123/app/quick_pass/QuickPassLoginAct.java
View File

@@ -167,7 +167,8 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
toast("一键登录失败，请使用其他方式登录"); toast("一键登录失败，请使用其他方式登录");
getDialogManager().dismissDialog(); getDialogManager().dismissDialog();
//跳转到手机登录页 //跳转到手机登录页
LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode); LoginPasswordActivity.start(QuickPassLoginAct.this);
//LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode);
} }
}); });
} }
@@ -213,7 +214,8 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
@Override @Override
public void onGetTokenError(String s, String s1) { public void onGetTokenError(String s, String s1) {
toast("一键登录失败，请使用其他登录方式"); toast("一键登录失败，请使用其他登录方式");
LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode); LoginPasswordActivity.start(QuickPassLoginAct.this);
// LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode);
setClickEnable(true); setClickEnable(true);
} }
@@ -262,10 +264,12 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
spannableString, "我知道了", true, null); spannableString, "我知道了", true, null);
} else if (e instanceof IOException) { } else if (e instanceof IOException) {
toast("网络异常,请检查您的网络再试~"); toast("网络异常,请检查您的网络再试~");
LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode); LoginPasswordActivity.start(QuickPassLoginAct.this);
//LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode);
} else { } else {
toast(e.getMessage()); toast(e.getMessage());
LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode); LoginPasswordActivity.start(QuickPassLoginAct.this);
//LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode);
} }
} }

19
channel.txt
View File

@@ -4,22 +4,3 @@ vivo
oppo oppo
xiaomi xiaomi
huawei huawei
yinyou0
yinyou1
yinyou2
yinyou3
yinyou4
yinyou5
yinyou6
yinyou7
yinyou8
yinyou9
yinyou10
yinyou11
yinyou12
gongzhonghao
kuaishou-xxl-01
zhaohui
big_goose_toutiaoxfc01
big_goose_toutiao
kuaishou_xinxiliu

6
gradle.properties
View File

@@ -21,9 +21,9 @@ MobSDK.spEdition=FP
with_flutter_aar=true with_flutter_aar=true
with_jenkins=false with_jenkins=false
only_arm64=false only_arm64=true
channel_file=channel.txt channel_file=channel.txt
version_name=5.6.0.3 version_name=1.0.0
version_code=560 version_code=100