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
f81156d8
Commit
f81156d8
authored
Oct 11, 2019
by
sikang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fix
parent
13d4f873
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
78 additions
and
66 deletions
+78
-66
src/main/java/tech/starwin/base/BasePresenter.java
+6
-7
src/main/java/tech/starwin/mvp/presenter/LoanPresenter.java
+14
-14
src/main/java/tech/starwin/mvp/presenter/UploadPresenter.java
+6
-6
src/main/java/tech/starwin/mvp/presenter/UserPresenter.java
+38
-38
src/main/java/tech/starwin/network/ServiceGenerator.java
+14
-1
No files found.
src/main/java/tech/starwin/base/BasePresenter.java
View file @
f81156d8
...
...
@@ -17,7 +17,6 @@ import retrofit2.Response;
import
tech.starwin.LibConfig
;
import
tech.starwin.impl.HttpObserver
;
import
tech.starwin.mvp.IView
;
import
tech.starwin.mvp.api.UploadApi
;
import
tech.starwin.network.ServiceGenerator
;
/**
...
...
@@ -26,18 +25,18 @@ import tech.starwin.network.ServiceGenerator;
public
class
BasePresenter
<
T
>
{
protected
String
TAG
;
protected
IView
view
;
protected
T
apiService
;
Class
<
T
>
serviceClz
;
/**
* 使用默认的HttpClient
*/
public
BasePresenter
(
Class
<
T
>
service
)
{
public
BasePresenter
(
Class
<
T
>
service
Clz
)
{
TAG
=
getClass
().
getSimpleName
();
apiService
=
ServiceGenerator
.
getService
(
service
)
;
this
.
serviceClz
=
serviceClz
;
}
protected
T
getApiService
()
{
return
apiService
;
return
ServiceGenerator
.
getService
(
serviceClz
)
;
}
@SuppressLint
(
"CheckResult"
)
...
...
@@ -49,7 +48,7 @@ public class BasePresenter<T> {
* 处理请求
*/
protected
<
T
>
void
handleRequest
(
Observable
<
T
>
observable
,
Observer
<
T
>
observer
)
{
if
(
DeviceInfo
.
isReviewMachine
(
LibConfig
.
getContext
()))
{
if
(
DeviceInfo
.
isReviewMachine
(
LibConfig
.
getContext
()))
{
return
;
}
observable
=
view
==
null
?
observable
:
observable
.
compose
(
view
.
bindToLifecycle
());
...
...
@@ -60,7 +59,7 @@ public class BasePresenter<T> {
protected
<
T
>
void
handleRequest
(
final
String
action
,
Observable
<
T
>
observable
)
{
if
(
DeviceInfo
.
isReviewMachine
(
LibConfig
.
getContext
()))
{
if
(
DeviceInfo
.
isReviewMachine
(
LibConfig
.
getContext
()))
{
return
;
}
observable
=
view
==
null
?
observable
:
observable
.
compose
(
view
.
bindToLifecycle
());
...
...
src/main/java/tech/starwin/mvp/presenter/LoanPresenter.java
View file @
f81156d8
...
...
@@ -34,14 +34,14 @@ public class LoanPresenter extends BasePresenter<LoanApi> {
* 获取贷款额度、贷款周期 可选范围
*/
public
void
getLoanRange
(
String
action
)
{
handleRequest
(
action
,
apiService
.
getLoanRange
());
handleRequest
(
action
,
getApiService
()
.
getLoanRange
());
}
/**
* 验证贷款资格
*/
public
void
checkQualification
(
String
action
)
{
handleRequest
(
action
,
apiService
.
isQualification
());
handleRequest
(
action
,
getApiService
()
.
isQualification
());
}
/**
...
...
@@ -49,28 +49,28 @@ public class LoanPresenter extends BasePresenter<LoanApi> {
*/
public
void
getCertifyProgress
(
String
action
)
{
boolean
tdFlag
=
!
TextUtils
.
isEmpty
(
LibConfig
.
TONGDUN_PARENT_KEY
);
handleRequest
(
action
,
apiService
.
getCertifyProgress
(
tdFlag
));
handleRequest
(
action
,
getApiService
()
.
getCertifyProgress
(
tdFlag
));
}
/**
* 获取贷款详情
*/
public
void
getLoanDetail
(
String
action
,
ProductBean
productBean
)
{
handleRequest
(
action
,
apiService
.
getLoanAmoutData
(
productBean
.
getCheckedAmount
(),
productBean
.
getCheckedPeriod
(),
productBean
.
getPeriodUnit
(),
productBean
.
getId
()));
handleRequest
(
action
,
getApiService
()
.
getLoanAmoutData
(
productBean
.
getCheckedAmount
(),
productBean
.
getCheckedPeriod
(),
productBean
.
getPeriodUnit
(),
productBean
.
getId
()));
}
/**
* 获取最新的贷款申请信息
*/
public
void
getLatestLoanApp
(
String
action
)
{
handleRequest
(
action
,
apiService
.
getLatestLoanApp
());
handleRequest
(
action
,
getApiService
()
.
getLatestLoanApp
());
}
/**
* 获取贷款记录
*/
public
void
getLoanHistory
(
String
action
)
{
handleRequest
(
apiService
.
getLoanAppAll
(),
new
HttpObserver
<
List
<
HistoryLoanAppInfoBean
>>()
{
handleRequest
(
getApiService
()
.
getLoanAppAll
(),
new
HttpObserver
<
List
<
HistoryLoanAppInfoBean
>>()
{
@Override
public
void
onStart
()
{
view
.
onHttpStart
(
action
,
true
);
...
...
@@ -98,7 +98,7 @@ public class LoanPresenter extends BasePresenter<LoanApi> {
* 取消贷款
*/
public
void
cancelLoan
(
String
action
,
String
loanAppId
)
{
handleRequest
(
apiService
.
cancelLoan
(
loanAppId
),
new
HttpObserver
<
ResponseBody
>()
{
handleRequest
(
getApiService
()
.
cancelLoan
(
loanAppId
),
new
HttpObserver
<
ResponseBody
>()
{
@Override
public
void
onStart
()
{
view
.
onHttpStart
(
action
,
true
);
...
...
@@ -128,9 +128,9 @@ public class LoanPresenter extends BasePresenter<LoanApi> {
*/
public
void
getProductList
(
String
action
)
{
if
(
TextUtils
.
isEmpty
(
LoginManager
.
get
().
getToken
()))
{
handleRequest
(
action
,
apiService
.
getProductsDefault
());
handleRequest
(
action
,
getApiService
()
.
getProductsDefault
());
}
else
{
handleRequest
(
action
,
apiService
.
getProducts
());
handleRequest
(
action
,
getApiService
()
.
getProducts
());
}
}
...
...
@@ -139,7 +139,7 @@ public class LoanPresenter extends BasePresenter<LoanApi> {
*/
public
void
getBankList
(
String
action
)
{
handleRequest
(
action
,
apiService
.
getBankList
());
handleRequest
(
action
,
getApiService
()
.
getBankList
());
}
...
...
@@ -147,7 +147,7 @@ public class LoanPresenter extends BasePresenter<LoanApi> {
* 申请贷款
*/
public
void
applyLoan
(
String
action
,
LatestLoanAppBean
loanInfo
)
{
Observable
<
ResponseBody
>
observable
=
apiService
.
addBank
(
loanInfo
.
getLoanAppId
(),
Observable
<
ResponseBody
>
observable
=
getApiService
()
.
addBank
(
loanInfo
.
getLoanAppId
(),
loanInfo
.
getBankCode
(),
loanInfo
.
getCardNo
(),
loanInfo
.
getApplyFor
(),
...
...
@@ -183,7 +183,7 @@ public class LoanPresenter extends BasePresenter<LoanApi> {
* 获取付款方式
*/
public
void
getDepostMethods
(
String
action
)
{
handleRequest
(
action
,
apiService
.
getDepostMethods
());
handleRequest
(
action
,
getApiService
()
.
getDepostMethods
());
}
...
...
@@ -191,7 +191,7 @@ public class LoanPresenter extends BasePresenter<LoanApi> {
* 是否授权数据
*/
public
void
getHarvestGrant
(
String
action
)
{
handleRequest
(
action
,
apiService
.
getHarvestGrant
());
handleRequest
(
action
,
getApiService
()
.
getHarvestGrant
());
}
...
...
@@ -200,7 +200,7 @@ public class LoanPresenter extends BasePresenter<LoanApi> {
*/
public
void
getRepayOrder
(
String
action
,
LatestLoanAppBean
loanAppBean
,
final
double
payAmount
,
final
String
repayMethodorBank
)
{
handleRequest
(
action
,
apiService
.
getRepayOrder
(
loanAppBean
.
getLoanAppId
(),
getApiService
()
.
getRepayOrder
(
loanAppBean
.
getLoanAppId
(),
"IDR"
,
repayMethodorBank
,
payAmount
...
...
src/main/java/tech/starwin/mvp/presenter/UploadPresenter.java
View file @
f81156d8
...
...
@@ -67,7 +67,7 @@ public class UploadPresenter extends BasePresenter<UploadApi> {
* 身份证ocr识别,直接使用Bitmap
*/
private
void
identityOcr
(
final
String
action
,
MultipartBody
.
Part
filePart
)
{
handleRequest
(
apiService
.
identityOcr
(
filePart
),
handleRequest
(
getApiService
()
.
identityOcr
(
filePart
),
new
HttpObserver
<
OcrResultBean
>()
{
@Override
public
void
onStart
()
{
...
...
@@ -134,7 +134,7 @@ public class UploadPresenter extends BasePresenter<UploadApi> {
public
void
faceVerify
(
final
String
action
,
String
androidId
,
String
faceData
,
double
amount
,
int
day
,
long
productId
,
String
method
)
{
handleRequest
(
apiService
.
faceVerify
(
getApiService
()
.
faceVerify
(
"PAYDAY"
,
amount
,
day
,
"D"
,
null
,
null
,
MultipartBodyMaker
.
makeSimplePart
(
"delta"
,
faceData
),
androidId
,
...
...
@@ -172,7 +172,7 @@ public class UploadPresenter extends BasePresenter<UploadApi> {
public
void
faceVerifyWithoutSDK
(
final
String
action
,
Context
context
,
double
amount
,
int
day
,
long
productId
)
{
Observable
observable
=
Observable
.
fromArray
(
1
,
2
,
3
,
4
,
5
,
6
,
7
,
8
,
9
,
10
)
.
flatMap
((
Function
<
Integer
,
ObservableSource
<
BasicAck
>>)
integer
->
apiService
.
faceVerify
(
"PAYDAY"
,
amount
,
day
,
"D"
,
null
,
null
,
getApiService
()
.
faceVerify
(
"PAYDAY"
,
amount
,
day
,
"D"
,
null
,
null
,
MultipartBodyMaker
.
makeSimplePart
(
"delta"
,
"null"
),
AppInfoUtils
.
getAndroidID
(
context
),
productId
,
!
TextUtils
.
isEmpty
(
LibConfig
.
TONGDUN_PARENT_KEY
),
"yitu"
).
onErrorReturn
(
throwable
->
new
BasicAck
()))
...
...
@@ -210,7 +210,7 @@ public class UploadPresenter extends BasePresenter<UploadApi> {
*/
public
void
uploadFirebaseToken
(
String
action
,
String
token
)
{
if
(!
TextUtils
.
isEmpty
(
token
))
{
handleRequest
(
action
,
apiService
.
uploadFirebaseToken
(
token
));
handleRequest
(
action
,
getApiService
()
.
uploadFirebaseToken
(
token
));
}
}
...
...
@@ -233,14 +233,14 @@ public class UploadPresenter extends BasePresenter<UploadApi> {
index
++;
}
}
handleRequest
(
action
,
apiService
.
uploadOtherPhoto
(
MultipartBodyMaker
.
makeSimplePart
(
"file"
,
file
),
"EXTRA"
,
index
,
"ADD"
));
handleRequest
(
action
,
getApiService
()
.
uploadOtherPhoto
(
MultipartBodyMaker
.
makeSimplePart
(
"file"
,
file
),
"EXTRA"
,
index
,
"ADD"
));
}
/**
* 删除其他证件照
*/
public
void
deleteOtherPhoto
(
String
action
,
int
photoIndex
)
{
handleRequest
(
action
,
apiService
.
uploadOtherPhoto
(
MultipartBodyMaker
.
makeSimplePart
(
"file"
,
"null"
),
"EXTRA"
,
photoIndex
,
"DELETE"
));
handleRequest
(
action
,
getApiService
()
.
uploadOtherPhoto
(
MultipartBodyMaker
.
makeSimplePart
(
"file"
,
"null"
),
"EXTRA"
,
photoIndex
,
"DELETE"
));
}
...
...
src/main/java/tech/starwin/mvp/presenter/UserPresenter.java
View file @
f81156d8
...
...
@@ -86,7 +86,7 @@ public class UserPresenter extends BasePresenter<UserApi> {
.
concatMap
(
new
Function
<
String
,
ObservableSource
<
GatewayInfoBean
>>()
{
@Override
public
ObservableSource
<
GatewayInfoBean
>
apply
(
String
s
)
throws
Exception
{
return
apiService
.
getGateway
(
s
).
onErrorReturn
(
new
Function
<
Throwable
,
GatewayInfoBean
>()
{
return
getApiService
()
.
getGateway
(
s
).
onErrorReturn
(
new
Function
<
Throwable
,
GatewayInfoBean
>()
{
@Override
public
GatewayInfoBean
apply
(
Throwable
throwable
)
throws
Exception
{
return
new
GatewayInfoBean
();
...
...
@@ -127,7 +127,7 @@ public class UserPresenter extends BasePresenter<UserApi> {
* 发送短信
*/
public
void
sendSms
(
String
action
,
String
mobile
)
{
handleRequest
(
action
,
apiService
.
sendSms
(
mobile
));
handleRequest
(
action
,
getApiService
()
.
sendSms
(
mobile
));
}
/**
...
...
@@ -143,7 +143,7 @@ public class UserPresenter extends BasePresenter<UserApi> {
@SuppressLint
(
"CheckResult"
)
public
void
login
(
final
String
action
,
String
mobile
,
String
smsCode
,
String
captchaSid
,
String
captcha
,
String
inviteCode
)
{
handleRequest
(
apiService
.
login
(
smsCode
,
captchaSid
,
captcha
,
mobile
,
inviteCode
)
getApiService
()
.
login
(
smsCode
,
captchaSid
,
captcha
,
mobile
,
inviteCode
)
.
flatMap
(
new
Function
<
TokenInfoBean
,
ObservableSource
<
UserBean
>>()
{
@Override
public
ObservableSource
<
UserBean
>
apply
(
TokenInfoBean
tokenInfoBean
)
throws
Exception
{
...
...
@@ -151,7 +151,7 @@ public class UserPresenter extends BasePresenter<UserApi> {
//刷新Token信息
LoginManager
.
get
().
notifyTokenInfo
(
tokenInfoBean
);
uploadFirebaseToken
(
PreferencesManager
.
get
().
getFireBaseMessagingToken
());
return
apiService
.
getUserInfo
();
return
getApiService
()
.
getUserInfo
();
}
}),
new
HttpObserver
<
UserBean
>()
{
...
...
@@ -188,7 +188,7 @@ public class UserPresenter extends BasePresenter<UserApi> {
* 获取用户信息
*/
public
void
getUserInfo
(
final
String
action
)
{
handleRequest
(
apiService
.
getUserInfo
(),
new
HttpObserver
<
UserBean
>()
{
handleRequest
(
getApiService
()
.
getUserInfo
(),
new
HttpObserver
<
UserBean
>()
{
@Override
public
void
onStart
()
{
}
...
...
@@ -215,7 +215,7 @@ public class UserPresenter extends BasePresenter<UserApi> {
* 活动中心数据
*/
public
void
trackEvent
(
String
event
)
{
handleRequest
(
apiService
.
trackEvent
(
"system"
,
"api"
,
event
),
new
HttpObserver
<
ResponseBody
>()
{
handleRequest
(
getApiService
()
.
trackEvent
(
"system"
,
"api"
,
event
),
new
HttpObserver
<
ResponseBody
>()
{
@Override
public
void
onStart
()
{
...
...
@@ -243,7 +243,7 @@ public class UserPresenter extends BasePresenter<UserApi> {
* 活动中心数据
*/
public
void
trackEvent
(
String
type
,
String
action
,
String
event
)
{
handleRequest
(
apiService
.
trackEvent
(
type
,
action
,
event
),
new
HttpObserver
<
ResponseBody
>()
{
handleRequest
(
getApiService
()
.
trackEvent
(
type
,
action
,
event
),
new
HttpObserver
<
ResponseBody
>()
{
@Override
public
void
onStart
()
{
...
...
@@ -271,7 +271,7 @@ public class UserPresenter extends BasePresenter<UserApi> {
*/
public
void
uploadFirebaseToken
(
String
token
)
{
if
(!
TextUtils
.
isEmpty
(
token
))
{
apiService
.
uploadFirebaseToken
(
token
);
getApiService
()
.
uploadFirebaseToken
(
token
);
}
}
...
...
@@ -282,7 +282,7 @@ public class UserPresenter extends BasePresenter<UserApi> {
*/
public
void
accountKotLogin
(
final
String
action
,
String
auth_code
)
{
handleRequest
(
apiService
.
accountKitLogin
(
null
,
auth_code
)
getApiService
()
.
accountKitLogin
(
null
,
auth_code
)
.
flatMap
(
new
Function
<
TokenInfoBean
,
ObservableSource
<
UserBean
>>()
{
@Override
public
ObservableSource
<
UserBean
>
apply
(
TokenInfoBean
tokenInfoBean
)
throws
Exception
{
...
...
@@ -290,7 +290,7 @@ public class UserPresenter extends BasePresenter<UserApi> {
//刷新Token信息
LoginManager
.
get
().
notifyTokenInfo
(
tokenInfoBean
);
uploadFirebaseToken
(
PreferencesManager
.
get
().
getFireBaseMessagingToken
());
return
apiService
.
getUserInfo
();
return
getApiService
()
.
getUserInfo
();
}
}),
new
HttpObserver
<
UserBean
>()
{
...
...
@@ -329,8 +329,8 @@ public class UserPresenter extends BasePresenter<UserApi> {
public
void
getBankAndLoanAmout
(
String
action
,
LatestLoanAppBean
loanBean
)
{
Observable
<
LoanInfo
>
observable
=
Observable
.
zip
(
getService
(
LoanApi
.
class
).
getLatestLoanApp
(),
clearError
(
apiService
.
getLoanAmoutData
(
loanBean
.
getAmount
(),
loanBean
.
getPeriod
(),
loanBean
.
getPeriodUnit
(),
loanBean
.
getProductId
()),
LoaningAmoutBean
.
class
),
clearError
(
apiService
.
getBankCardInfo
(),
UserBankInfo
.
class
),
clearError
(
getApiService
()
.
getLoanAmoutData
(
loanBean
.
getAmount
(),
loanBean
.
getPeriod
(),
loanBean
.
getPeriodUnit
(),
loanBean
.
getProductId
()),
LoaningAmoutBean
.
class
),
clearError
(
getApiService
()
.
getBankCardInfo
(),
UserBankInfo
.
class
),
getService
(
LoanApi
.
class
).
getBankList
(),
new
Function4
<
LatestLoanAppBean
,
LoaningAmoutBean
,
UserBankInfo
,
List
<
BankBean
>,
LoanInfo
>()
{
@Override
...
...
@@ -352,7 +352,7 @@ public class UserPresenter extends BasePresenter<UserApi> {
* 活动中心数据
*/
public
void
getActivitys
(
String
action
)
{
handleRequest
(
action
,
apiService
.
getActivityList
());
handleRequest
(
action
,
getApiService
()
.
getActivityList
());
}
...
...
@@ -361,7 +361,7 @@ public class UserPresenter extends BasePresenter<UserApi> {
* 消息列表
*/
public
void
getMsgList
(
String
action
)
{
handleRequest
(
action
,
apiService
.
getMsgInbox
());
handleRequest
(
action
,
getApiService
()
.
getMsgInbox
());
}
// @SuppressLint("CheckResult")
...
...
@@ -377,8 +377,8 @@ public class UserPresenter extends BasePresenter<UserApi> {
// userInfoBean.setLatestLoanAppBean(latestLoanAppBean);
// //继续请求用户银行卡信息,和贷款详情
// return Observable.zip(
// clearError(
apiService
.getLoanAmoutData(latestLoanAppBean.getAmount(), latestLoanAppBean.getPeriod(), latestLoanAppBean.getPeriodUnit(), latestLoanAppBean.getProductId())),
// clearError(
apiService
.getBankCardInfo(LoginManager.get().getToken())),
// clearError(
getApiService()
.getLoanAmoutData(latestLoanAppBean.getAmount(), latestLoanAppBean.getPeriod(), latestLoanAppBean.getPeriodUnit(), latestLoanAppBean.getProductId())),
// clearError(
getApiService()
.getBankCardInfo(LoginManager.get().getToken())),
// new BiFunction<LoaningAmoutBean, UserBankInfo, Pair<LoaningAmoutBean, UserBankInfo>>() {
// @Override
// public Pair<LoaningAmoutBean, UserBankInfo> apply(LoaningAmoutBean loaningAmoutBean, UserBankInfo userBankInfo) throws Exception {
...
...
@@ -402,14 +402,14 @@ public class UserPresenter extends BasePresenter<UserApi> {
* 获取身份证图片地址
*/
public
void
getKtpImg
(
String
action
)
{
handleRequest
(
action
,
apiService
.
getKtpImg
());
handleRequest
(
action
,
getApiService
()
.
getKtpImg
());
}
/**
* 获取用户身份信息
*/
public
void
getPersonalInfo
(
String
action
)
{
handleRequest
(
action
,
apiService
.
getPersonalInfo
());
handleRequest
(
action
,
getApiService
()
.
getPersonalInfo
());
}
...
...
@@ -417,7 +417,7 @@ public class UserPresenter extends BasePresenter<UserApi> {
* 查询学历类型列表
*/
public
void
getEducationList
(
String
action
)
{
handleRequest
(
action
,
apiService
.
sysDict
(
"EDUCATION"
));
handleRequest
(
action
,
getApiService
()
.
sysDict
(
"EDUCATION"
));
}
...
...
@@ -425,7 +425,7 @@ public class UserPresenter extends BasePresenter<UserApi> {
* 查询区域列表
*/
public
void
getRegion
(
String
action
,
String
level
,
int
id
)
{
handleRequest
(
action
,
apiService
.
getRegion
(
level
,
id
));
handleRequest
(
action
,
getApiService
()
.
getRegion
(
level
,
id
));
}
...
...
@@ -433,7 +433,7 @@ public class UserPresenter extends BasePresenter<UserApi> {
* 提交个人信息
*/
public
void
submitPersonalInfo
(
String
action
,
PersonalInfoServerBean
personalInfo
)
{
Observable
<
ResponseBody
>
observable
=
apiService
.
submitPersonalInfo
(
Observable
<
ResponseBody
>
observable
=
getApiService
()
.
submitPersonalInfo
(
personalInfo
.
getFullName
(),
personalInfo
.
getCredentialNo
(),
personalInfo
.
getFamilyNameInLaw
(),
...
...
@@ -476,7 +476,7 @@ public class UserPresenter extends BasePresenter<UserApi> {
public
void
submitContactInfo
(
String
action
,
ContactInfoBean
contactInfo
)
{
handleRequest
(
apiService
.
submitContactInfo
(
contactInfo
.
getParentId
(),
contactInfo
.
getParentName
(),
contactInfo
.
getParentMobile
(),
contactInfo
.
getParentType
(),
handleRequest
(
getApiService
()
.
submitContactInfo
(
contactInfo
.
getParentId
(),
contactInfo
.
getParentName
(),
contactInfo
.
getParentMobile
(),
contactInfo
.
getParentType
(),
contactInfo
.
getFriendId
(),
contactInfo
.
getFriendName
(),
contactInfo
.
getFriendMobile
(),
contactInfo
.
getFriendType
(),
contactInfo
.
getFriendId1
(),
contactInfo
.
getFriendName1
(),
contactInfo
.
getFriendMobile1
(),
contactInfo
.
getFriendType1
()),
new
HttpObserver
<
ResponseBody
>()
{
...
...
@@ -508,8 +508,8 @@ public class UserPresenter extends BasePresenter<UserApi> {
* 获取工作信息
*/
public
void
getEmploymentInfo
(
String
action
)
{
Observable
<
EmploymentServerBean
>
employment
=
apiService
.
getEmploymentInfo
();
Observable
<
RecordFilesResponse
>
jobImg
=
apiService
.
getJobImg
();
Observable
<
EmploymentServerBean
>
employment
=
getApiService
()
.
getEmploymentInfo
();
Observable
<
RecordFilesResponse
>
jobImg
=
getApiService
()
.
getJobImg
();
handleRequest
(
action
,
Observable
.
zip
(
clearError
(
employment
,
EmploymentServerBean
.
class
),
clearError
(
jobImg
,
RecordFilesResponse
.
class
),
...
...
@@ -603,7 +603,7 @@ public class UserPresenter extends BasePresenter<UserApi> {
* 客户服务热线、公司介绍
*/
public
void
getCustomerMsg
(
String
action
)
{
handleRequest
(
apiService
.
display
(),
new
HttpObserver
<
DisplayBean
>()
{
handleRequest
(
getApiService
()
.
display
(),
new
HttpObserver
<
DisplayBean
>()
{
@Override
public
void
onStart
()
{
}
...
...
@@ -648,7 +648,7 @@ public class UserPresenter extends BasePresenter<UserApi> {
* 获取SD权限后再调用一次display
*/
public
void
refreshDiaplay
(
String
action
)
{
handleRequest
(
action
,
apiService
.
display
());
handleRequest
(
action
,
getApiService
()
.
display
());
}
...
...
@@ -656,7 +656,7 @@ public class UserPresenter extends BasePresenter<UserApi> {
* 获取联系人信息
*/
public
void
getContactInfo
(
String
action
)
{
handleRequest
(
action
,
apiService
.
getContactInfo
());
handleRequest
(
action
,
getApiService
()
.
getContactInfo
());
}
...
...
@@ -664,14 +664,14 @@ public class UserPresenter extends BasePresenter<UserApi> {
* 获取联系人信息
*/
public
void
getContactList
(
String
action
)
{
handleRequest
(
action
,
apiService
.
getContactList
());
handleRequest
(
action
,
getApiService
()
.
getContactList
());
}
/**
* 获取联系人信息
*/
public
void
submitContactList
(
String
action
,
List
<
ContactBean
>
contactBeans
)
{
handleRequest
(
apiService
.
submitContactList
(
contactBeans
),
new
HttpObserver
<
BasicAck
>()
{
handleRequest
(
getApiService
()
.
submitContactList
(
contactBeans
),
new
HttpObserver
<
BasicAck
>()
{
@Override
public
void
onStart
()
{
view
.
onHttpStart
(
action
,
true
);
...
...
@@ -699,14 +699,14 @@ public class UserPresenter extends BasePresenter<UserApi> {
* 获取其他照片
*/
public
void
getPhotoList
(
String
action
)
{
handleRequest
(
action
,
apiService
.
getPhotoList
());
handleRequest
(
action
,
getApiService
()
.
getPhotoList
());
}
/**
* 公告
*/
public
void
getBannerMsg
(
String
action
)
{
handleRequest
(
action
,
apiService
.
getBannerMsg
());
handleRequest
(
action
,
getApiService
()
.
getBannerMsg
());
}
...
...
@@ -714,7 +714,7 @@ public class UserPresenter extends BasePresenter<UserApi> {
* 获取绑定的第三方账户
*/
public
void
getThirdPartData
(
String
action
)
{
handleRequest
(
action
,
apiService
.
getThirdPartAccount
());
handleRequest
(
action
,
getApiService
()
.
getThirdPartAccount
());
}
...
...
@@ -722,14 +722,14 @@ public class UserPresenter extends BasePresenter<UserApi> {
* 获取同盾列表
*/
public
void
getThirdPartList
(
String
action
)
{
handleRequest
(
action
,
apiService
.
getThirdPartList
());
handleRequest
(
action
,
getApiService
()
.
getThirdPartList
());
}
/**
* 获取绑定的第三方账户
*/
public
void
getThirdPartListV2
(
String
action
)
{
handleRequest
(
action
,
apiService
.
getThirdPartListV2
());
handleRequest
(
action
,
getApiService
()
.
getThirdPartListV2
());
}
/**
...
...
@@ -737,12 +737,12 @@ public class UserPresenter extends BasePresenter<UserApi> {
*/
public
void
submitTDData
(
String
action
,
String
dataType
,
String
taskId
,
String
credentialNo
,
String
realName
,
String
mobile
)
{
handleRequest
(
action
,
apiService
.
submitThirdPartData
(
"TONGDUN"
,
dataType
,
taskId
,
credentialNo
,
realName
,
mobile
,
""
));
getApiService
()
.
submitThirdPartData
(
"TONGDUN"
,
dataType
,
taskId
,
credentialNo
,
realName
,
mobile
,
""
));
}
public
void
submitMXData
(
String
action
,
String
dataType
,
String
taskId
,
String
credentialNo
,
String
realName
,
String
mobile
)
{
handleRequest
(
action
,
apiService
.
submitThirdPartData
(
"MOXIE"
,
dataType
,
taskId
,
credentialNo
,
realName
,
mobile
,
""
));
getApiService
()
.
submitThirdPartData
(
"MOXIE"
,
dataType
,
taskId
,
credentialNo
,
realName
,
mobile
,
""
));
}
// /**
...
...
@@ -751,13 +751,13 @@ public class UserPresenter extends BasePresenter<UserApi> {
// @SuppressLint("CheckResult")
// public void getKTPInfo(String action) {
// Observable<OcrResultBean.KTP> observable = Observable.zip(
//
apiService
.getKtpImg(LoginManager.get().getToken()).onErrorReturn(new Function<Throwable, RecordFilesResponse>() {
//
getApiService()
.getKtpImg(LoginManager.get().getToken()).onErrorReturn(new Function<Throwable, RecordFilesResponse>() {
// @Override
// public RecordFilesResponse apply(Throwable throwable) throws Exception {
// return new RecordFilesResponse();
// }
// }),
//
apiService
.getPersonalInfo(LoginManager.get().getToken()).onErrorReturn(new Function<Throwable, PersonalInfoServerBean>() {
//
getApiService()
.getPersonalInfo(LoginManager.get().getToken()).onErrorReturn(new Function<Throwable, PersonalInfoServerBean>() {
// @Override
// public PersonalInfoServerBean apply(Throwable throwable) throws Exception {
// return new PersonalInfoServerBean();
...
...
src/main/java/tech/starwin/network/ServiceGenerator.java
View file @
f81156d8
...
...
@@ -21,6 +21,7 @@ public class ServiceGenerator {
private
static
final
int
TIME_OUT
=
15
;
private
static
Map
<
String
,
Retrofit
>
retrofitMap
;
private
static
Map
<
String
,
Object
>
serviceMap
;
private
static
OkHttpClient
okHttpClient
;
static
{
...
...
@@ -59,7 +60,19 @@ public class ServiceGenerator {
.
build
();
retrofitMap
.
put
(
baseUrl
,
retrofit
);
}
return
retrofitMap
.
get
(
baseUrl
).
create
(
serviceClz
);
if
(
serviceMap
==
null
)
{
serviceMap
=
new
HashMap
<>();
}
String
key
=
baseUrl
+
serviceClz
.
getName
();
Object
service
=
serviceMap
.
get
(
key
);
if
(
service
==
null
)
{
service
=
retrofitMap
.
get
(
baseUrl
).
create
(
serviceClz
);
serviceMap
.
put
(
key
,
service
);
}
return
(
T
)
service
;
}
...
...
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