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
adbe680c
Commit
adbe680c
authored
Nov 09, 2019
by
陈前
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
String 整理 统计
parent
e10d6707
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
111 additions
and
89 deletions
+111
-89
app/src/main/java/com/xingdata/zzdpos/ui/marketing/viplevel/adapter/VipLevelListAdapter.java
...os/ui/marketing/viplevel/adapter/VipLevelListAdapter.java
+1
-1
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/SendTickerC.java
...in/java/com/xingdata/zzdpos/ui/sendticke/SendTickerC.java
+8
-5
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/adapter/VipAdapter.java
.../com/xingdata/zzdpos/ui/sendticke/adapter/VipAdapter.java
+1
-1
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/dialog/SendTickerBeforDialog.java
...ata/zzdpos/ui/sendticke/dialog/SendTickerBeforDialog.java
+1
-1
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/SendTickerFragment.java
...data/zzdpos/ui/sendticke/fragment/SendTickerFragment.java
+6
-6
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/SendTickerIndexFragment.java
...zzdpos/ui/sendticke/fragment/SendTickerIndexFragment.java
+1
-1
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/SendTickerSuccFragment.java
.../zzdpos/ui/sendticke/fragment/SendTickerSuccFragment.java
+1
-1
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/VipFragment.java
...om/xingdata/zzdpos/ui/sendticke/fragment/VipFragment.java
+1
-1
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipInfoFragment.java
.../com/xingdata/zzdpos/ui/vip/fragment/VipInfoFragment.java
+1
-1
app/src/main/res/layout/dialog_sendticker_befor.xml
app/src/main/res/layout/dialog_sendticker_befor.xml
+3
-3
app/src/main/res/layout/fragment_send_succ_ticker.xml
app/src/main/res/layout/fragment_send_succ_ticker.xml
+31
-31
app/src/main/res/layout/fragment_send_ticker.xml
app/src/main/res/layout/fragment_send_ticker.xml
+32
-32
app/src/main/res/layout/fragment_send_ticker_main.xml
app/src/main/res/layout/fragment_send_ticker_main.xml
+2
-2
app/src/main/res/layout/item_vip_group.xml
app/src/main/res/layout/item_vip_group.xml
+3
-3
app/src/main/res/values/strings_chen.xml
app/src/main/res/values/strings_chen.xml
+19
-0
No files found.
app/src/main/java/com/xingdata/zzdpos/ui/marketing/viplevel/adapter/VipLevelListAdapter.java
View file @
adbe680c
...
...
@@ -45,7 +45,7 @@ public class VipLevelListAdapter extends BaseAdapter<Level, ItemVipLevelListItem
protected
void
convert
(
ItemVipLevelListItemBinding
mViewBinding
,
Level
item
)
{
mViewBinding
.
levelName
.
setText
(
item
.
getVipLevelName
());
if
(
item
.
getVipDefDiscount
()==
null
||
item
.
getVipDefDiscount
()==
100
){
mViewBinding
.
levelDiscount
.
setText
(
"无折扣"
);
mViewBinding
.
levelDiscount
.
setText
(
mContext
.
getString
(
R
.
string
.
ticket_default_noDiscount
)
);
}
else
{
mViewBinding
.
levelDiscount
.
setText
(
ConvertUtil
.
discount
(
item
.
getVipDefDiscount
())
+
"折"
);
}
...
...
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/SendTickerC.java
View file @
adbe680c
package
com
.
xingdata
.
zzdpos
.
ui
.
sendticke
;
import
android.content.Context
;
import
com.xingdata.zzdpos.R
;
import
com.xingdata.zzdpos.model.Level
;
import
java.util.ArrayList
;
...
...
@@ -12,25 +15,25 @@ import java.util.List;
public
class
SendTickerC
{
public
static
List
<
Level
>
vipTypeList
;
public
static
List
<
Level
>
getVipType
()
{
public
static
List
<
Level
>
getVipType
(
Context
context
)
{
if
(
vipTypeList
==
null
)
{
vipTypeList
=
new
ArrayList
<>();
Level
vipType
=
new
Level
();
vipType
.
setId
(
10000
l
);
vipType
.
setVipLevelName
(
"全部会员"
);
vipType
.
setVipLevelName
(
context
.
getString
(
R
.
string
.
ticket_default_allVip
)
);
Level
vipTypeNowMonth
=
new
Level
();
vipTypeNowMonth
.
setId
(
10001
l
);
vipTypeNowMonth
.
setVipLevelName
(
"本月生日"
);
vipTypeNowMonth
.
setVipLevelName
(
context
.
getString
(
R
.
string
.
ticket_default_monthBirthday
)
);
Level
vipTypeNextMonth
=
new
Level
();
vipTypeNextMonth
.
setId
(
10002
l
);
vipTypeNextMonth
.
setVipLevelName
(
"下月生日"
);
vipTypeNextMonth
.
setVipLevelName
(
context
.
getString
(
R
.
string
.
ticket_default_nextMonthBirthday
)
);
Level
vipTypeLoss
=
new
Level
();
vipTypeLoss
.
setId
(
10003
l
);
vipTypeLoss
.
setVipLevelName
(
"流失会员"
);
vipTypeLoss
.
setVipLevelName
(
context
.
getString
(
R
.
string
.
ticket_default_lostVip
)
);
vipTypeList
.
add
(
vipType
);
vipTypeList
.
add
(
vipTypeNowMonth
);
vipTypeList
.
add
(
vipTypeNextMonth
);
...
...
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/adapter/VipAdapter.java
View file @
adbe680c
...
...
@@ -22,7 +22,7 @@ public class VipAdapter extends BaseAdapter<Vip, ItemSettleVipBinding> {
if
(
item
.
getVipDefDiscount
()
<
100
&&
item
.
getVipDefDiscount
()
>
0
)
{
mViewBinding
.
setDisRate
(
String
.
valueOf
((
double
)
item
.
getVipDefDiscount
()
/
10
));
}
else
if
(
item
.
getVipDefDiscount
()
==
100
)
{
mViewBinding
.
setDisRate
(
"无折扣"
);
mViewBinding
.
setDisRate
(
mContext
.
getString
(
R
.
string
.
ticket_default_noDiscount
)
);
}
switch
(
item
.
getVipLevel
())
{
case
1
:
...
...
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/dialog/SendTickerBeforDialog.java
View file @
adbe680c
...
...
@@ -30,7 +30,7 @@ public class SendTickerBeforDialog extends BaseDialog<SendTicketPresenter,
public
void
initView
()
{
mViewBinding
.
tvTicker
.
setText
(
tickerName
);
mViewBinding
.
tvSendObject
.
setText
(
sendObject
);
mViewBinding
.
tvSendCount
.
setText
(
count
+
"张"
);
mViewBinding
.
tvSendCount
.
setText
(
count
+
getString
(
R
.
string
.
settle_ticket_unit
)
);
}
public
void
setData
(
String
tickerName
,
String
sendObject
,
long
count
)
{
...
...
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/SendTickerFragment.java
View file @
adbe680c
...
...
@@ -58,7 +58,7 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
public
void
initView
()
{
mLoadingDialog
.
show
((
BaseActivity
)
getActivity
());
mPresenter
.
truleQuery
(
mLoadingDialog
);
mViewBinding
.
icTitle
.
tvTitle
.
setText
(
"发券"
);
mViewBinding
.
icTitle
.
tvTitle
.
setText
(
getString
(
R
.
string
.
menu_ticket
)
);
mViewBinding
.
icTitle
.
setOnClickListener
(
new
OnClickListener
()
{
@Override
protected
void
myOnClickListener
(
View
v
)
{
...
...
@@ -89,7 +89,7 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
case
R
.
id
.
btn_send
:
{
if
(
isNull
())
{
if
(
truleList
.
size
()
<=
0
)
{
ToastUtils
.
showLong
(
"没有优惠券"
);
ToastUtils
.
showLong
(
getString
(
R
.
string
.
ticket_tv_noTicket
)
);
return
;
}
long
tickerId
=
truleList
...
...
@@ -173,7 +173,7 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
mViewBinding
.
setDisRate
(
String
.
valueOf
((
double
)
nowVip
.
getVipDefDiscount
()
/
10
));
}
else
if
(
nowVip
.
getVipDefDiscount
()
==
100
)
{
mViewBinding
.
setDisRate
(
"无折扣"
);
mViewBinding
.
setDisRate
(
getString
(
R
.
string
.
ticket_default_noDiscount
)
);
}
switch
(
nowVip
.
getVipLevel
())
{
case
1
:
...
...
@@ -259,7 +259,7 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
closeLoading
(
loadingDialog
);
if
(
trulePager
==
null
||
trulePager
.
getList
()
==
null
||
trulePager
.
getList
().
size
()
<=
0
)
{
returnTicketAdapter
.
setEmptyView
(
getEmptyView
(
"没有优惠券~"
));
returnTicketAdapter
.
setEmptyView
(
getEmptyView
(
getString
(
R
.
string
.
ticket_tv_noTicket
)
));
}
if
(
trulePager
!=
null
&&
trulePager
.
getList
()
!=
null
&&
trulePager
.
getList
().
size
()
>
0
)
{
truleList
=
trulePager
.
getList
();
...
...
@@ -299,13 +299,13 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
//单个会员发券
if
(
null
==
nowVip
||
nowTickerItemId
<
0
)
{
ToastUtils
.
showLong
(
"请选择会员或优惠券"
);
ToastUtils
.
showLong
(
getString
(
R
.
string
.
ticket_toast_selectVipOrTicket
)
);
return
false
;
}
}
else
if
(
nowtype
==
1
)
{
//分组发券
if
(
nowTickerItemId
<
0
)
{
ToastUtils
.
showLong
(
"请选择优惠券"
);
ToastUtils
.
showLong
(
getString
(
R
.
string
.
ticket_toast_selectTicket
)
);
return
false
;
}
}
...
...
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/SendTickerIndexFragment.java
View file @
adbe680c
...
...
@@ -22,7 +22,7 @@ public class SendTickerIndexFragment extends BaseFragment<SendTicketPresenter,
@Override
public
void
initView
()
{
mViewBinding
.
icTitle
.
tvTitle
.
setText
(
"发券"
);
mViewBinding
.
icTitle
.
tvTitle
.
setText
(
getString
(
R
.
string
.
menu_ticket
)
);
mViewBinding
.
icTitle
.
setOnClickListener
(
new
OnClickListener
()
{
@Override
protected
void
myOnClickListener
(
View
v
)
{
...
...
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/SendTickerSuccFragment.java
View file @
adbe680c
...
...
@@ -22,7 +22,7 @@ public class SendTickerSuccFragment extends BaseFragment<SendTicketPresenter,
@Override
public
void
initView
()
{
mViewBinding
.
icTitle
.
tvTitle
.
setText
(
"发券成功"
);
mViewBinding
.
icTitle
.
tvTitle
.
setText
(
getString
(
R
.
string
.
ticket_tv_sendSuc
)
);
mViewBinding
.
icTitle
.
setOnClickListener
(
new
OnClickListener
()
{
@Override
protected
void
myOnClickListener
(
View
v
)
{
...
...
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/VipFragment.java
View file @
adbe680c
...
...
@@ -70,7 +70,7 @@ public class VipFragment extends BaseFragment<SendTicketPresenter, FragmentSendT
mLoadingDialog
.
show
((
BaseActivity
)
getActivity
());
mPresenter
.
searchVip
(
keyword
);
});
mViewBinding
.
vSearch
.
setHint
(
"请输入会员手机号进行搜索"
);
mViewBinding
.
vSearch
.
setHint
(
getString
(
R
.
string
.
settle_vip_search_empty
)
);
// mViewBinding.vSearch.setEmptyEnabled(true);
mViewBinding
.
vSearch
.
showSoftInput
();
}
...
...
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipInfoFragment.java
View file @
adbe680c
...
...
@@ -64,7 +64,7 @@ public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipInfoB
mViewBinding
.
vipMoble
.
setText
(
mVip
.
getVipMobile
()
+
""
);
mViewBinding
.
crtTime
.
setText
(
StringUtil
.
format
(
new
Date
(
mVip
.
getCreateTime
())));
mViewBinding
.
vipSex
.
setText
(
getVipSex
(
mVip
.
getVipSex
()));
mViewBinding
.
vipDiscounts
.
setText
(
mVip
.
getVipDefDiscount
()==
100
?
"无折扣"
:
ConvertUtil
.
discount
(
mVip
.
getVipDefDiscount
())+
"折"
);
mViewBinding
.
vipDiscounts
.
setText
(
mVip
.
getVipDefDiscount
()==
100
?
getString
(
R
.
string
.
ticket_default_noDiscount
)
:
ConvertUtil
.
discount
(
mVip
.
getVipDefDiscount
())+
"折"
);
mPresenter
.
ticketQuery
(
mVip
.
getVipId
());
// mPresenter.truleQuery(mVip.getVipId());
}
...
...
app/src/main/res/layout/dialog_sendticker_befor.xml
View file @
adbe680c
...
...
@@ -42,7 +42,7 @@
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:text=
"
优惠券:
"
android:text=
"
@string/ticket_tv_ticket
"
android:textColor=
"@color/black_baozheng"
android:textSize=
"@dimen/all_text_size_low"
/>
...
...
@@ -66,7 +66,7 @@
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:text=
"
发送对象:
"
android:text=
"
@string/ticket_tv_sendTo
"
android:textColor=
"@color/black_baozheng"
android:textSize=
"@dimen/all_text_size_low"
/>
...
...
@@ -90,7 +90,7 @@
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:text=
"
发送张数:
"
android:text=
"
@string/ticket_tv_sendCnt
"
android:textColor=
"@color/black_baozheng"
android:textSize=
"@dimen/all_text_size_low"
/>
...
...
app/src/main/res/layout/fragment_send_succ_ticker.xml
View file @
adbe680c
...
...
@@ -6,7 +6,7 @@
<variable
name=
"OnClickListener"
type=
"com.xingdata.zzdpos.util.OnClickListener"
/>
type=
"com.xingdata.zzdpos.util.OnClickListener"
/>
</data>
...
...
@@ -23,7 +23,7 @@
<include
android:id=
"@+id/ic_title"
layout=
"@layout/title"
/>
layout=
"@layout/title"
/>
<android.support.v7.widget.CardView
android:layout_width=
"match_parent"
...
...
@@ -48,7 +48,7 @@
android:layout_height=
"wrap_content"
android:layout_centerInParent=
"true"
android:layout_marginTop=
"@dimen/all_margin"
android:src=
"@mipmap/ic_succeed"
/>
android:src=
"@mipmap/ic_succeed"
/>
<TextView
android:layout_width=
"match_parent"
...
...
@@ -56,20 +56,20 @@
android:layout_below=
"@+id/iv"
android:layout_marginTop=
"@dimen/all_margin"
android:gravity=
"center"
android:text=
"
发券成功
"
android:text=
"
@string/ticket_tv_sendSuc
"
android:textColor=
"@color/black_baozheng"
android:textSize=
"@dimen/all_sub_title_size"
android:textStyle=
"bold"
/>
android:textStyle=
"bold"
/>
</LinearLayout>
<View
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/all_line_width"
android:layout_marginBottom=
"@dimen/all_margin"
android:layout_marginEnd=
"@dimen/all_spacing"
android:layout_marginStart=
"@dimen/all_spacing"
android:layout_marginTop=
"@dimen/all_margin"
android:background=
"@color/gray_kongming"
/>
android:layout_marginEnd=
"@dimen/all_spacing"
android:layout_marginBottom=
"@dimen/all_margin"
android:background=
"@color/gray_kongming"
/>
<LinearLayout
...
...
@@ -82,16 +82,16 @@
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:orientation=
"horizontal"
android:padding
Bottom=
"@dimen/all_spacing
"
android:padding
Start=
"@dimen/all_margin
"
android:paddingEnd=
"@dimen/all_margin"
android:padding
Start=
"@dimen/all_margin
"
>
android:padding
Bottom=
"@dimen/all_spacing
"
>
<TextView
android:layout_width=
"@dimen/all_textview_width"
android:layout_height=
"wrap_content"
android:text=
"
优惠券
"
android:text=
"
@string/settle_ticket
"
android:textColor=
"@color/black_baozheng"
android:textSize=
"@dimen/all_body_size"
/>
android:textSize=
"@dimen/all_body_size"
/>
<TextView
android:id=
"@+id/tv_ticker_name"
...
...
@@ -99,23 +99,23 @@
android:layout_height=
"wrap_content"
android:gravity=
"right"
android:textColor=
"@color/black_likui"
android:textSize=
"@dimen/all_body_size"
/>
android:textSize=
"@dimen/all_body_size"
/>
</LinearLayout>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:orientation=
"horizontal"
android:padding
Bottom=
"@dimen/all_spacing
"
android:padding
Start=
"@dimen/all_margin
"
android:paddingEnd=
"@dimen/all_margin"
android:padding
Start=
"@dimen/all_margin
"
>
android:padding
Bottom=
"@dimen/all_spacing
"
>
<TextView
android:layout_width=
"@dimen/all_textview_width"
android:layout_height=
"wrap_content"
android:text=
"
发送对象
"
android:text=
"
@string/ticket_tv_sendTo
"
android:textColor=
"@color/black_baozheng"
android:textSize=
"@dimen/all_body_size"
/>
android:textSize=
"@dimen/all_body_size"
/>
<TextView
android:id=
"@+id/tv_send_ticker_user"
...
...
@@ -123,7 +123,7 @@
android:layout_height=
"wrap_content"
android:gravity=
"right"
android:textColor=
"@color/black_likui"
android:textSize=
"@dimen/all_body_size"
/>
android:textSize=
"@dimen/all_body_size"
/>
</LinearLayout>
<LinearLayout
...
...
@@ -131,16 +131,16 @@
android:layout_height=
"wrap_content"
android:layout_marginBottom=
"@dimen/all_margin"
android:orientation=
"horizontal"
android:padding
Bottom=
"@dimen/all_spacing
"
android:padding
Start=
"@dimen/all_margin
"
android:paddingEnd=
"@dimen/all_margin"
android:padding
Start=
"@dimen/all_margin
"
>
android:padding
Bottom=
"@dimen/all_spacing
"
>
<TextView
android:layout_width=
"@dimen/all_textview_width"
android:layout_height=
"wrap_content"
android:text=
"
发送时间
"
android:text=
"
@string/ticket_tv_sendDate
"
android:textColor=
"@color/black_baozheng"
android:textSize=
"@dimen/all_body_size"
/>
android:textSize=
"@dimen/all_body_size"
/>
<TextView
android:id=
"@+id/tv_send_ticker_time"
...
...
@@ -148,7 +148,7 @@
android:layout_height=
"wrap_content"
android:gravity=
"right"
android:textColor=
"@color/black_likui"
android:textSize=
"@dimen/all_body_size"
/>
android:textSize=
"@dimen/all_body_size"
/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
...
...
@@ -158,29 +158,29 @@
android:id=
"@+id/btn_over"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginBottom=
"@dimen/all_margin"
android:layout_marginEnd=
"@dimen/all_margin"
android:layout_marginStart=
"@dimen/all_margin"
android:layout_marginEnd=
"@dimen/all_margin"
android:layout_marginBottom=
"@dimen/all_margin"
android:background=
"@drawable/shape_red_r1"
android:foreground=
"?android:attr/selectableItemBackground"
android:onClick=
"@{OnClickListener}"
android:text=
"
完 成
"
android:text=
"
@string/settle_complete
"
android:textColor=
"@color/white_caocao"
android:textSize=
"@dimen/all_text_size"
/>
android:textSize=
"@dimen/all_text_size"
/>
<Button
android:id=
"@+id/btn_continue_send"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginBottom=
"@dimen/all_margin"
android:layout_marginEnd=
"@dimen/all_margin"
android:layout_marginStart=
"@dimen/all_margin"
android:layout_marginEnd=
"@dimen/all_margin"
android:layout_marginBottom=
"@dimen/all_margin"
android:background=
"@drawable/shape_red_r1_thr"
android:foreground=
"?android:attr/selectableItemBackground"
android:onClick=
"@{OnClickListener}"
android:text=
"
继续发券
"
android:text=
"
@string/all_continue
"
android:textColor=
"@color/red_guanyu"
android:textSize=
"@dimen/all_text_size"
/>
android:textSize=
"@dimen/all_text_size"
/>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_send_ticker.xml
View file @
adbe680c
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
>
xmlns:app=
"http://schemas.android.com/apk/res-auto"
>
<data>
<import
type=
"android.view.View"
/>
<import
type=
"android.view.View"
/>
<variable
name=
"empty"
type=
"boolean"
/>
type=
"boolean"
/>
<variable
name=
"OnClickListener"
type=
"com.xingdata.zzdpos.util.OnClickListener"
/>
type=
"com.xingdata.zzdpos.util.OnClickListener"
/>
<variable
name=
"titleMode"
type=
"int"
/>
type=
"int"
/>
<variable
name=
"name"
type=
"String"
/>
type=
"String"
/>
<variable
name=
"phone"
type=
"String"
/>
type=
"String"
/>
<variable
name=
"disRate"
type=
"String"
/>
type=
"String"
/>
</data>
...
...
@@ -46,7 +46,7 @@
<include
android:id=
"@+id/ic_title"
layout=
"@layout/title"
/>
layout=
"@layout/title"
/>
<LinearLayout
android:id=
"@+id/ll_vip_single"
...
...
@@ -77,7 +77,7 @@
app:placeholderImage=
"@mipmap/vip_send"
app:roundAsCircle=
"true"
app:roundingBorderColor=
"@color/gray_huanggai"
app:roundingBorderWidth=
"@dimen/all_line_width"
/>
app:roundingBorderWidth=
"@dimen/all_line_width"
/>
<com.facebook.drawee.view.SimpleDraweeView
...
...
@@ -86,7 +86,7 @@
android:layout_height=
"@dimen/settle_vip_level"
app:layout_constraintBottom_toBottomOf=
"@id/iv_head"
app:layout_constraintRight_toRightOf=
"@id/iv_head"
app:roundAsCircle=
"true"
/>
app:roundAsCircle=
"true"
/>
<LinearLayout
android:layout_width=
"wrap_content"
...
...
@@ -102,28 +102,28 @@
android:layout_height=
"wrap_content"
android:text=
"@{name}"
android:textColor=
"@color/black_zhangfei"
android:textSize=
"@dimen/all_text_size"
/>
android:textSize=
"@dimen/all_text_size"
/>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@{phone}"
android:textColor=
"@color/black_likui"
android:textSize=
"@dimen/all_caption_size"
/>
android:textSize=
"@dimen/all_caption_size"
/>
</LinearLayout>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginEnd=
"@dimen/all_spacing"
android:drawablePadding=
"@dimen/all_bounced_spacing"
android:drawableRight=
"@mipmap/drop_down"
android:drawablePadding=
"@dimen/all_bounced_spacing"
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:layout_constraintRight_toLeftOf=
"@id/cb_point"
app:layout_constraintTop_toBottomOf=
"parent"
/>
app:layout_constraintTop_toBottomOf=
"parent"
/>
<CheckBox
android:id=
"@+id/cb_point"
...
...
@@ -135,13 +135,13 @@
android:visibility=
"gone"
app:layout_constraintBottom_toTopOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"parent"
/>
app:layout_constraintTop_toBottomOf=
"parent"
/>
<View
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/all_line_width"
android:background=
"@color/gray_huanggai"
app:layout_constraintBottom_toBottomOf=
"parent"
/>
app:layout_constraintBottom_toBottomOf=
"parent"
/>
</android.support.constraint.ConstraintLayout>
</LinearLayout>
...
...
@@ -165,18 +165,18 @@
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@drawable/up_down_line_white"
android:paddingBottom=
"@dimen/all_margin"
android:paddingLeft=
"@dimen/all_padding"
android:paddingTop=
"@dimen/all_margin"
android:text=
"请选择发放对象"
android:paddingBottom=
"@dimen/all_margin"
android:text=
"@string/ticket_tv_pleaseSelecter"
android:textColor=
"@color/black_baozheng"
android:textSize=
"@dimen/text_three_title"
/>
android:textSize=
"@dimen/text_three_title"
/>
<android.support.v7.widget.RecyclerView
android:id=
"@+id/vip_type"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@color/white"
/>
android:background=
"@color/white"
/>
</LinearLayout>
...
...
@@ -202,7 +202,7 @@
app:placeholderImage=
"@mipmap/vip_type_send"
app:roundAsCircle=
"true"
app:roundingBorderColor=
"@color/gray_huanggai"
app:roundingBorderWidth=
"@dimen/all_line_width"
/>
app:roundingBorderWidth=
"@dimen/all_line_width"
/>
<LinearLayout
android:layout_width=
"wrap_content"
...
...
@@ -219,7 +219,7 @@
android:layout_height=
"match_parent"
android:gravity=
"center"
android:textColor=
"@color/black_zhangfei"
android:textSize=
"@dimen/all_text_size"
/>
android:textSize=
"@dimen/all_text_size"
/>
</LinearLayout>
...
...
@@ -228,7 +228,7 @@
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/all_line_width"
android:background=
"@color/gray_huanggai"
app:layout_constraintBottom_toBottomOf=
"parent"
/>
app:layout_constraintBottom_toBottomOf=
"parent"
/>
</android.support.constraint.ConstraintLayout>
...
...
@@ -238,12 +238,12 @@
<TextView
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:paddingBottom=
"@dimen/all_margin"
android:paddingLeft=
"@dimen/all_padding"
android:paddingTop=
"@dimen/all_margin"
android:text=
"请选择要发送的优惠券"
android:paddingBottom=
"@dimen/all_margin"
android:text=
"@string/ticket_tv_pleaseSelectTicket"
android:textColor=
"@color/black_baozheng"
android:textSize=
"@dimen/text_three_title"
/>
android:textSize=
"@dimen/text_three_title"
/>
<android.support.v7.widget.RecyclerView
android:id=
"@+id/rl_ticker"
...
...
@@ -252,7 +252,7 @@
android:layout_weight=
"9"
android:paddingLeft=
"@dimen/all_bounced_padding"
android:paddingRight=
"@dimen/all_bounced_padding"
android:visibility=
"visible"
/>
android:visibility=
"visible"
/>
</LinearLayout>
...
...
@@ -273,9 +273,9 @@
android:layout_marginLeft=
"@dimen/all_padding"
android:layout_weight=
"3"
android:gravity=
"center|left"
android:text=
"
白金会员
"
android:text=
""
android:textColor=
"@color/black_baozheng"
android:textSize=
"@dimen/et_textsize"
/>
android:textSize=
"@dimen/et_textsize"
/>
<Button
android:id=
"@+id/btn_send"
...
...
@@ -284,9 +284,9 @@
android:layout_weight=
"1"
android:background=
"@drawable/red_border_allradius"
android:onClick=
"@{OnClickListener}"
android:text=
"
发券
"
android:text=
"
@string/menu_ticket
"
android:textColor=
"@color/white"
android:textSize=
"@dimen/et_textsize"
/>
android:textSize=
"@dimen/et_textsize"
/>
</LinearLayout>
</RelativeLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_send_ticker_main.xml
View file @
adbe680c
...
...
@@ -43,7 +43,7 @@
android:layout_height=
"wrap_content"
android:layout_weight=
"5"
android:paddingLeft=
"@dimen/all_padding"
android:text=
"
按单独会员发券
"
android:text=
"
@string/ticket_tv_vipOnly
"
android:textColor=
"@color/black_baozheng"
android:textSize=
"@dimen/text_three_title"
/>
...
...
@@ -78,7 +78,7 @@
android:layout_height=
"wrap_content"
android:layout_weight=
"5"
android:paddingLeft=
"@dimen/all_padding"
android:text=
"
按会员类别发券
"
android:text=
"
@string/ticket_tv_vipType
"
android:textColor=
"@color/black_baozheng"
android:textSize=
"@dimen/text_three_title"
/>
...
...
app/src/main/res/layout/item_vip_group.xml
View file @
adbe680c
...
...
@@ -28,13 +28,13 @@
android:maxLength=
"4"
android:padding=
"@dimen/all_padding"
android:singleLine=
"true"
android:text=
"
全部会员
"
android:text=
"
@string/ticket_title_allVip
"
android:textColor=
"@color/black_likui"
android:textSize=
"@dimen/et_textsize"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
app:layout_constraintTop_toTopOf=
"parent"
/>
<TextView
android:id=
"@+id/tv_item_select"
...
...
@@ -46,7 +46,7 @@
android:maxLength=
"4"
android:padding=
"@dimen/all_padding"
android:singleLine=
"true"
android:text=
"
全部会员
"
android:text=
"
@string/ticket_title_allVip
"
android:textColor=
"@color/red_guanyu"
android:textSize=
"@dimen/et_textsize"
android:visibility=
"gone"
...
...
app/src/main/res/values/strings_chen.xml
View file @
adbe680c
...
...
@@ -51,6 +51,25 @@
<string
name=
"statistics_toast_noPrint"
>
无法打印
</string>
<string
name=
"statistics_toast_refundSuc"
>
退货成功
</string>
<!--发券-->
<string
name=
"ticket_default_noDiscount"
>
无折扣
</string>
<string
name=
"ticket_title_allVip"
>
全部会员
</string>
<string
name=
"ticket_tv_noTicket"
>
没有优惠券~
</string>
<string
name=
"ticket_toast_selectVipOrTicket"
>
请选择会员或优惠券
</string>
<string
name=
"ticket_toast_selectTicket"
>
请选择优惠券
</string>
<string
name=
"ticket_tv_ticket"
>
优惠券:
</string>
<string
name=
"ticket_tv_sendTo"
>
发送对象:
</string>
<string
name=
"ticket_tv_sendCnt"
>
发送张数:
</string>
<string
name=
"ticket_tv_sendDate"
>
发送时间:
</string>
<string
name=
"ticket_tv_pleaseSelecter"
>
请选择发放对象
</string>
<string
name=
"ticket_tv_pleaseSelectTicket"
>
请选择要发送的优惠券
</string>
<string
name=
"ticket_tv_vipOnly"
>
按单独会员发券
</string>
<string
name=
"ticket_tv_vipType"
>
按会员类别发券
</string>
<string
name=
"ticket_tv_sendSuc"
>
发券成功
</string>
<string
name=
"ticket_default_allVip"
>
全部会员
</string>
<string
name=
"ticket_default_monthBirthday"
>
本月生日
</string>
<string
name=
"ticket_default_nextMonthBirthday"
>
下月生日
</string>
<string
name=
"ticket_default_lostVip"
>
流失会员
</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