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
c3b120ac
Commit
c3b120ac
authored
Mar 19, 2018
by
王海
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
e14f53ae
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
4 deletions
+9
-4
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/adapter/VipAdapter.java
.../com/xingdata/zzdpos/ui/sendticke/adapter/VipAdapter.java
+2
-0
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/SendTickerFragment.java
...data/zzdpos/ui/sendticke/fragment/SendTickerFragment.java
+2
-0
app/src/main/res/layout/dialog_ticket_add_setting.xml
app/src/main/res/layout/dialog_ticket_add_setting.xml
+3
-2
app/src/main/res/layout/fragment_send_ticker.xml
app/src/main/res/layout/fragment_send_ticker.xml
+1
-1
app/src/main/res/layout/item_settle_vip.xml
app/src/main/res/layout/item_settle_vip.xml
+1
-1
No files found.
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/adapter/VipAdapter.java
View file @
c3b120ac
...
...
@@ -21,6 +21,8 @@ public class VipAdapter extends BaseAdapter<Vip, ItemSettleVipBinding> {
mViewBinding
.
setPhone
(
ConvertUtil
.
longToString
(
item
.
getVipMobile
()));
if
(
item
.
getVipDefDiscount
()
<
100
&&
item
.
getVipDefDiscount
()
>
0
)
{
mViewBinding
.
setDisRate
(
String
.
valueOf
((
double
)
item
.
getVipDefDiscount
()
/
10
));
}
else
if
(
item
.
getVipDefDiscount
()
==
100
)
{
mViewBinding
.
setDisRate
(
"无折扣"
);
}
switch
(
item
.
getVipLevel
())
{
case
1
:
...
...
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/SendTickerFragment.java
View file @
c3b120ac
...
...
@@ -172,6 +172,8 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
if
(
nowVip
.
getVipDefDiscount
()
<
100
&&
nowVip
.
getVipDefDiscount
()
>
0
)
{
mViewBinding
.
setDisRate
(
String
.
valueOf
((
double
)
nowVip
.
getVipDefDiscount
()
/
10
));
}
else
if
(
nowVip
.
getVipDefDiscount
()
==
100
)
{
mViewBinding
.
setDisRate
(
"无折扣"
);
}
switch
(
nowVip
.
getVipLevel
())
{
case
1
:
...
...
app/src/main/res/layout/dialog_ticket_add_setting.xml
View file @
c3b120ac
...
...
@@ -311,7 +311,7 @@
android:textColor=
"@color/black_baozheng"
android:textSize=
"@dimen/et_textsize"
/>
<
EditText
<
TextView
android:id=
"@+id/et_ticket_count"
style=
"@style/dialog_edit"
android:layout_width=
"0dp"
...
...
@@ -321,7 +321,8 @@
android:digits=
"1234567890"
android:ems=
"5"
android:inputType=
"phone|number"
android:maxLength=
"2"
/>
android:maxLength=
"2"
android:text=
"1"
/>
<TextView
android:layout_width=
"0dp"
...
...
app/src/main/res/layout/fragment_send_ticker.xml
View file @
c3b120ac
...
...
@@ -118,7 +118,7 @@
android:layout_marginEnd=
"@dimen/all_spacing"
android:drawablePadding=
"@dimen/all_bounced_spacing"
android:drawableRight=
"@mipmap/drop_down"
android:text=
"@{@string/settle_vip_dis_rate_hint + disRate
+ @string/settle_vip_dis_rate
}"
android:text=
"@{@string/settle_vip_dis_rate_hint + disRate }"
android:textColor=
"@color/black_zhangfei"
android:textSize=
"@dimen/all_caption_size"
app:layout_constraintBottom_toTopOf=
"parent"
...
...
app/src/main/res/layout/item_settle_vip.xml
View file @
c3b120ac
...
...
@@ -75,7 +75,7 @@
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginEnd=
"@dimen/all_spacing"
android:text=
"@{@string/settle_vip_dis_rate_hint + disRate
+ @string/settle_vip_dis_rate
}"
android:text=
"@{@string/settle_vip_dis_rate_hint + disRate }"
android:textColor=
"@color/black_zhangfei"
android:textSize=
"@dimen/all_caption_size"
app:layout_constraintBottom_toTopOf=
"parent"
...
...
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