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
d16ddfaa
Commit
d16ddfaa
authored
Mar 19, 2018
by
姜敏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更改线的粗细
parent
c8ec1a0c
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
7 additions
and
7 deletions
+7
-7
app/src/main/java/com/xingdata/zzdpos/C.java
app/src/main/java/com/xingdata/zzdpos/C.java
+2
-2
app/src/main/java/com/xingdata/zzdpos/ui/vip/adapter/VipTruleAdapter.java
...a/com/xingdata/zzdpos/ui/vip/adapter/VipTruleAdapter.java
+4
-4
app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java
app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java
+1
-1
app/src/main/res/mipmap-xhdpi/bg_return_ticket01.png
app/src/main/res/mipmap-xhdpi/bg_return_ticket01.png
+0
-0
app/src/main/res/mipmap-xhdpi/bg_return_ticket02.png
app/src/main/res/mipmap-xhdpi/bg_return_ticket02.png
+0
-0
app/src/main/res/mipmap-xhdpi/bg_return_ticket03.png
app/src/main/res/mipmap-xhdpi/bg_return_ticket03.png
+0
-0
app/src/main/res/mipmap-xhdpi/bg_return_ticket04.png
app/src/main/res/mipmap-xhdpi/bg_return_ticket04.png
+0
-0
No files found.
app/src/main/java/com/xingdata/zzdpos/C.java
View file @
d16ddfaa
...
...
@@ -63,12 +63,12 @@ public class C {
* sn:test2018 设备型号 AECRC10 (pos)
* sn:test2019 设备型号 X990 (收银机)
*/
private
static
final
String
URL_TEST
=
"http://121.40.56.52:80
80
/"
;
private
static
final
String
URL_TEST
=
"http://121.40.56.52:80/"
;
/**
* 开发平台(开发人员使用)
*/
private
static
final
String
URL_DEMO
=
"http://demo.51zzd.cn
:8080
/"
;
private
static
final
String
URL_DEMO
=
"http://demo.51zzd.cn/"
;
/**
* 生产平台
...
...
app/src/main/java/com/xingdata/zzdpos/ui/vip/adapter/VipTruleAdapter.java
View file @
d16ddfaa
...
...
@@ -31,12 +31,12 @@ public class VipTruleAdapter extends BaseAdapter<Ticket, ItemVipMscardItemBindin
@Override
protected
void
convert
(
ItemVipMscardItemBinding
mViewBinding
,
Ticket
item
)
{
mViewBinding
.
truleName
.
setText
(
ConvertUtil
.
fenToYuanNoZero
(
item
.
getTicketValAmt
()));
mViewBinding
.
truleMoney
.
setText
(
"满"
+
ConvertUtil
.
fenToYuanNoZero
(
item
.
getTicketValAmt
())+
"元使用"
);
mViewBinding
.
truleMoney
.
setText
(
"满"
+
ConvertUtil
.
fenToYuanNoZero
(
item
.
getTruleOrderAmt
())
+
"元使用"
);
mViewBinding
.
truleValidity
.
setText
(
mContext
.
getString
(
R
.
string
.
vip_mscard_period_of_validity
,
StringUtil
.
format
(
new
Date
(
item
.
getTicketExp
()),
"yyyy.MM.dd"
),
StringUtil
.
format
(
new
Date
(
item
.
getTicketExp
()),
"yyyy.MM.dd"
)));
// mViewBinding.truleCondition.setText(ConvertUtil.fenToYuanNoPoint(item.getTruleOrderAmt()));
if
(
item
.
getTruleStatus
()
!=
null
&&
item
.
getUsedFlag
()!=
null
&&
item
.
getTruleStatus
().
toString
().
equals
(
"0"
)&&
item
.
getUsedFlag
().
toString
().
equals
(
"1"
))
{
mViewBinding
.
truleBgLeft
.
setBackgroundResource
(
R
.
mipmap
.
return_ticket_one
);
mViewBinding
.
truleBgRight
.
setBackgroundResource
(
R
.
mipmap
.
return_ticket_two
);
if
(
item
.
getTruleStatus
()
!=
null
&&
item
.
getUsedFlag
()
!=
null
&&
item
.
getTruleStatus
().
toString
().
equals
(
"0"
)
&&
item
.
getUsedFlag
().
toString
().
equals
(
"1"
))
{
mViewBinding
.
truleBgLeft
.
setBackgroundResource
(
R
.
mipmap
.
bg_return_ticket01
);
mViewBinding
.
truleBgRight
.
setBackgroundResource
(
R
.
mipmap
.
bg_return_ticket02
);
}
else
{
mViewBinding
.
truleBgLeft
.
setBackgroundResource
(
R
.
mipmap
.
bg_return_ticket03
);
mViewBinding
.
truleBgRight
.
setBackgroundResource
(
R
.
mipmap
.
bg_return_ticket04
);
...
...
app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java
View file @
d16ddfaa
...
...
@@ -57,8 +57,8 @@ public final class SystemUtil {
e
.
printStackTrace
();
}
}
return
"test2018"
;
// return deviceSN;
return
"test2019"
;
}
/**
...
...
app/src/main/res/mipmap-xhdpi/bg_return_ticket01.png
0 → 100644
View file @
d16ddfaa
4.3 KB
app/src/main/res/mipmap-xhdpi/bg_return_ticket02.png
0 → 100644
View file @
d16ddfaa
5.96 KB
app/src/main/res/mipmap-xhdpi/bg_return_ticket03.png
View replaced file @
c8ec1a0c
View file @
d16ddfaa
6.65 KB
|
W:
|
H:
4.46 KB
|
W:
|
H:
2-up
Swipe
Onion skin
app/src/main/res/mipmap-xhdpi/bg_return_ticket04.png
View replaced file @
c8ec1a0c
View file @
d16ddfaa
5.13 KB
|
W:
|
H:
6.55 KB
|
W:
|
H:
2-up
Swipe
Onion skin
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