Commit c027b1b1 by sikang

BUG修复

parent 0dc065b9
......@@ -20,6 +20,7 @@ import org.greenrobot.eventbus.EventBus;
import java.util.List;
import tech.starwin.LibConfig;
import tech.starwin.R;
import tech.starwin.constants.ActionEnum;
import tech.starwin.mvp.beans.TokenInfoBean;
import tech.starwin.mvp.beans.UserBean;
......@@ -101,7 +102,9 @@ public class LoginManager {
public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == 0) { // confirm that this response matches your request
AccountKitLoginResult loginResult = data.getParcelableExtra(AccountKitLoginResult.RESULT_KEY);
if (loginResult.getError() != null) {
if (loginResult == null) {
result.onLoginError(null);
} else if (loginResult.getError() != null) {
result.onLoginError(loginResult.getError());
} else if (loginResult.wasCancelled()) {
result.onLoginCancelled();
......
......@@ -83,7 +83,7 @@ public class FragmentLauncher {
if (framentSet.containsKey(className)) {
fragment = (T) framentSet.get(className);
if (fragment == currentFragment) {
fragment.setArguments(arguments);
// fragment.setArguments(arguments);
return fragment;
}
}
......@@ -113,7 +113,9 @@ public class FragmentLauncher {
if (listener != null) {
listener.onFragmentCreated(fragment);
}
if (arguments != null) {
fragment.setArguments(arguments);
}
//提交
transaction.commit();
return fragment;
......
......@@ -44,15 +44,24 @@ public class ProgressDialog {
public void showLoading() {
try {
if (!loadingDialog.isShowing() && enable) {
loadingDialog.show();
}
} catch (Exception e) {
}
}
public void dissmissLoading() {
try {
if (loadingDialog.isShowing()) {
loadingDialog.dismiss();
}
} catch (Exception e) {
}
}
/**
......
......@@ -56,7 +56,9 @@
<string name="text_certify_in_order">Please submit the certification materials in order</string>
<string name="text_login_failed">login failed</string>
<string name="text_get_photo_failed">Failed to get photo</string>
<string name="text_relationship">Relationship</string>
......
......@@ -36,6 +36,8 @@
<string name="text_low_level">您的等级不足,无法申请此产品</string>
<string name="text_login_failed">登录失败</string>
<string name="text_loan_amount_statement">请选择贷款金额</string>
<string name="text_loan_replayment_statement">请选择贷款期限</string>
<string name="RP600k">¥ 600</string>
......@@ -81,6 +83,9 @@
<string name="button_certification_submit">提交</string>
<string name="text_get_photo_failed">获取照片失败</string>
<string name="text_remain_days">05</string>
<string name="text_unit_days"></string>
<string name="text_unit_tips_expird">您已超期</string>
......
......@@ -71,6 +71,9 @@
<string name="text_repayment_raiders">Lihat Cara Pengembalian Pinjaman >></string>
<string name="text_get_photo_failed">Gagal mendapatkan foto</string>
<string name="text_login_failed">Login gagal</string>
<string name="text_loan_amount">Jumlah Pinjaman</string>
<string name="text_repayment_time">Jatuh Tempo</string>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment