Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lib_base
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sikang
lib_base
Commits
c027b1b1
Commit
c027b1b1
authored
Dec 21, 2018
by
sikang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BUG修复
parent
0dc065b9
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
31 additions
and
7 deletions
+31
-7
src/main/java/tech/starwin/utils/LoginManager.java
+4
-1
src/main/java/tech/starwin/utils/context_utils/FragmentLauncher.java
+4
-2
src/main/java/tech/starwin/widget/ProgressDialog.java
+13
-4
src/main/res/values-en-rUS/strings.xml
+2
-0
src/main/res/values-zh-rCN/strings.xml
+5
-0
src/main/res/values/strings.xml
+3
-0
No files found.
src/main/java/tech/starwin/utils/LoginManager.java
View file @
c027b1b1
...
@@ -20,6 +20,7 @@ import org.greenrobot.eventbus.EventBus;
...
@@ -20,6 +20,7 @@ import org.greenrobot.eventbus.EventBus;
import
java.util.List
;
import
java.util.List
;
import
tech.starwin.LibConfig
;
import
tech.starwin.LibConfig
;
import
tech.starwin.R
;
import
tech.starwin.constants.ActionEnum
;
import
tech.starwin.constants.ActionEnum
;
import
tech.starwin.mvp.beans.TokenInfoBean
;
import
tech.starwin.mvp.beans.TokenInfoBean
;
import
tech.starwin.mvp.beans.UserBean
;
import
tech.starwin.mvp.beans.UserBean
;
...
@@ -101,7 +102,9 @@ public class LoginManager {
...
@@ -101,7 +102,9 @@ public class LoginManager {
public
void
onActivityResult
(
int
requestCode
,
int
resultCode
,
Intent
data
)
{
public
void
onActivityResult
(
int
requestCode
,
int
resultCode
,
Intent
data
)
{
if
(
requestCode
==
0
)
{
// confirm that this response matches your request
if
(
requestCode
==
0
)
{
// confirm that this response matches your request
AccountKitLoginResult
loginResult
=
data
.
getParcelableExtra
(
AccountKitLoginResult
.
RESULT_KEY
);
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
());
result
.
onLoginError
(
loginResult
.
getError
());
}
else
if
(
loginResult
.
wasCancelled
())
{
}
else
if
(
loginResult
.
wasCancelled
())
{
result
.
onLoginCancelled
();
result
.
onLoginCancelled
();
...
...
src/main/java/tech/starwin/utils/context_utils/FragmentLauncher.java
View file @
c027b1b1
...
@@ -83,7 +83,7 @@ public class FragmentLauncher {
...
@@ -83,7 +83,7 @@ public class FragmentLauncher {
if
(
framentSet
.
containsKey
(
className
))
{
if
(
framentSet
.
containsKey
(
className
))
{
fragment
=
(
T
)
framentSet
.
get
(
className
);
fragment
=
(
T
)
framentSet
.
get
(
className
);
if
(
fragment
==
currentFragment
)
{
if
(
fragment
==
currentFragment
)
{
fragment
.
setArguments
(
arguments
);
//
fragment.setArguments(arguments);
return
fragment
;
return
fragment
;
}
}
}
}
...
@@ -113,7 +113,9 @@ public class FragmentLauncher {
...
@@ -113,7 +113,9 @@ public class FragmentLauncher {
if
(
listener
!=
null
)
{
if
(
listener
!=
null
)
{
listener
.
onFragmentCreated
(
fragment
);
listener
.
onFragmentCreated
(
fragment
);
}
}
fragment
.
setArguments
(
arguments
);
if
(
arguments
!=
null
)
{
fragment
.
setArguments
(
arguments
);
}
//提交
//提交
transaction
.
commit
();
transaction
.
commit
();
return
fragment
;
return
fragment
;
...
...
src/main/java/tech/starwin/widget/ProgressDialog.java
View file @
c027b1b1
...
@@ -44,15 +44,24 @@ public class ProgressDialog {
...
@@ -44,15 +44,24 @@ public class ProgressDialog {
public
void
showLoading
()
{
public
void
showLoading
()
{
if
(!
loadingDialog
.
isShowing
()
&&
enable
)
{
try
{
loadingDialog
.
show
();
if
(!
loadingDialog
.
isShowing
()
&&
enable
)
{
loadingDialog
.
show
();
}
}
catch
(
Exception
e
)
{
}
}
}
}
public
void
dissmissLoading
()
{
public
void
dissmissLoading
()
{
if
(
loadingDialog
.
isShowing
())
{
try
{
loadingDialog
.
dismiss
();
if
(
loadingDialog
.
isShowing
())
{
loadingDialog
.
dismiss
();
}
}
catch
(
Exception
e
)
{
}
}
}
}
/**
/**
...
...
src/main/res/values-en-rUS/strings.xml
View file @
c027b1b1
...
@@ -56,7 +56,9 @@
...
@@ -56,7 +56,9 @@
<string
name=
"text_certify_in_order"
>
Please submit the certification materials in order
</string>
<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>
<string
name=
"text_relationship"
>
Relationship
</string>
...
...
src/main/res/values-zh-rCN/strings.xml
View file @
c027b1b1
...
@@ -36,6 +36,8 @@
...
@@ -36,6 +36,8 @@
<string
name=
"text_low_level"
>
您的等级不足,无法申请此产品
</string>
<string
name=
"text_low_level"
>
您的等级不足,无法申请此产品
</string>
<string
name=
"text_login_failed"
>
登录失败
</string>
<string
name=
"text_loan_amount_statement"
>
请选择贷款金额
</string>
<string
name=
"text_loan_amount_statement"
>
请选择贷款金额
</string>
<string
name=
"text_loan_replayment_statement"
>
请选择贷款期限
</string>
<string
name=
"text_loan_replayment_statement"
>
请选择贷款期限
</string>
<string
name=
"RP600k"
>
¥ 600
</string>
<string
name=
"RP600k"
>
¥ 600
</string>
...
@@ -81,6 +83,9 @@
...
@@ -81,6 +83,9 @@
<string
name=
"button_certification_submit"
>
提交
</string>
<string
name=
"button_certification_submit"
>
提交
</string>
<string
name=
"text_get_photo_failed"
>
获取照片失败
</string>
<string
name=
"text_remain_days"
>
05
</string>
<string
name=
"text_remain_days"
>
05
</string>
<string
name=
"text_unit_days"
>
天
</string>
<string
name=
"text_unit_days"
>
天
</string>
<string
name=
"text_unit_tips_expird"
>
您已超期
</string>
<string
name=
"text_unit_tips_expird"
>
您已超期
</string>
...
...
src/main/res/values/strings.xml
View file @
c027b1b1
...
@@ -71,6 +71,9 @@
...
@@ -71,6 +71,9 @@
<string
name=
"text_repayment_raiders"
>
Lihat Cara Pengembalian Pinjaman >>
</string>
<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_loan_amount"
>
Jumlah Pinjaman
</string>
<string
name=
"text_repayment_time"
>
Jatuh Tempo
</string>
<string
name=
"text_repayment_time"
>
Jatuh Tempo
</string>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment