Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
T
TangKuPos
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王海
TangKuPos
Commits
f47a5a99
Commit
f47a5a99
authored
Jan 31, 2018
by
zhang_z
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化代码;
parent
859d7aac
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
23 deletions
+15
-23
app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java
app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java
+11
-12
app/src/main/java/com/xingdata/zzdpos/base/BaseActivity.java
app/src/main/java/com/xingdata/zzdpos/base/BaseActivity.java
+3
-8
app/src/main/java/com/xingdata/zzdpos/model/Saledetail.java
app/src/main/java/com/xingdata/zzdpos/model/Saledetail.java
+1
-3
No files found.
app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java
View file @
f47a5a99
...
...
@@ -683,21 +683,11 @@ public final class ApiFactory {
}
public
static
Observable
<
Pager
<
com
.
xingdata
.
zzdpos
.
model
.
Sssku
>>
querySssku
(
int
pageNum
,
String
keyword
,
Long
skuGrpId
)
{
return
Api
.
getInstance
().
service
.
querySssku
(
pageNum
,
C
.
PRODUCT
.
PAGE_SIZE
,
skuGrpId
,
keyword
)
.
onErrorReturn
(
new
ErrorFilter
<>())
.
map
(
new
ResultFilter
<>())
.
subscribeOn
(
Schedulers
.
io
())
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
retryWhen
(
new
RetryHelper
(
3
));
return
run
(
Api
.
getInstance
().
service
.
querySssku
(
pageNum
,
C
.
PRODUCT
.
PAGE_SIZE
,
skuGrpId
,
keyword
));
}
public
static
Observable
<
Pager
<
com
.
xingdata
.
zzdpos
.
model
.
Sssku
>>
querySssku
(
int
pageNum
,
String
keyword
)
{
return
Api
.
getInstance
().
service
.
querySssku
(
pageNum
,
C
.
PRODUCT
.
PAGE_SIZE
,
keyword
)
.
onErrorReturn
(
new
ErrorFilter
<>())
.
map
(
new
ResultFilter
<>())
.
subscribeOn
(
Schedulers
.
io
())
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
retryWhen
(
new
RetryHelper
(
3
));
return
run
(
Api
.
getInstance
().
service
.
querySssku
(
pageNum
,
C
.
PRODUCT
.
PAGE_SIZE
,
keyword
));
}
public
static
Observable
<
com
.
xingdata
.
zzdpos
.
model
.
Sssku
>
update
(
com
.
xingdata
.
zzdpos
...
...
@@ -1308,4 +1298,13 @@ public final class ApiFactory {
}
public
static
<
T
>
Observable
<
T
>
run
(
Observable
<
HttpMessage
<
T
>>
observable
)
{
return
observable
.
onErrorReturn
(
new
ErrorFilter
<>())
.
map
(
new
ResultFilter
<>())
.
subscribeOn
(
Schedulers
.
io
())
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
retryWhen
(
new
RetryHelper
(
3
));
}
}
app/src/main/java/com/xingdata/zzdpos/base/BaseActivity.java
View file @
f47a5a99
...
...
@@ -43,7 +43,6 @@ public abstract class BaseActivity<P extends BasePresenter, B extends ViewDataBi
AppCompatDelegate
.
setCompatVectorFromResourcesEnabled
(
true
);
}
public
abstract
int
getLayoutId
();
@Override
...
...
@@ -62,14 +61,10 @@ public abstract class BaseActivity<P extends BasePresenter, B extends ViewDataBi
initView
();
}
protected
void
initPresenter
()
{
if
(
this
instanceof
BaseView
&&
this
.
getClass
().
getGenericSuperclass
()
instanceof
ParameterizedType
&&
((
ParameterizedType
)
(
this
.
getClass
().
getGenericSuperclass
()))
.
getActualTypeArguments
().
length
>
0
)
{
Class
mPresenterClass
=
(
Class
)
((
ParameterizedType
)
(
this
.
getClass
()
.
getGenericSuperclass
())).
getActualTypeArguments
()[
0
];
if
(
this
instanceof
BaseView
&&
this
.
getClass
().
getGenericSuperclass
()
instanceof
ParameterizedType
&&
((
ParameterizedType
)
(
this
.
getClass
().
getGenericSuperclass
())).
getActualTypeArguments
().
length
>
0
)
{
Class
mPresenterClass
=
(
Class
)
((
ParameterizedType
)
(
this
.
getClass
().
getGenericSuperclass
())).
getActualTypeArguments
()[
0
];
mPresenter
=
InstanceUtil
.
getInstance
(
mPresenterClass
);
mPresenter
.
setIntent
(
getIntent
()).
setView
(
this
).
build
();
}
...
...
app/src/main/java/com/xingdata/zzdpos/model/Saledetail.java
View file @
f47a5a99
...
...
@@ -222,9 +222,7 @@ public class Saledetail implements BaseModel, BaseBean, BaseGoodPrint {
}
public
Long
getPromotionAmt
()
{
return
detailAmt
-
(
detailCnt
*
(
skuOffFlag
>
0
?
skuPromotionPrice
*
(
vip
.
getVipDefDiscount
()
>
0
?
vip
.
getVipDefDiscount
()
:
100
)
/
100
:
skuPromotionPrice
));
return
detailAmt
-
(
detailCnt
*
(
skuOffFlag
>
0
?
skuPromotionPrice
*
(
vip
.
getVipDefDiscount
()
>
0
?
vip
.
getVipDefDiscount
()
:
100
)
/
100
:
skuPromotionPrice
));
}
private
Saledetail
()
{
...
...
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