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
d0dab3f5
Commit
d0dab3f5
authored
Dec 23, 2017
by
王海
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改很多代码
parent
14e44b61
Changes
27
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
27 changed files
with
1327 additions
and
719 deletions
+1327
-719
app/src/main/AndroidManifest.xml
app/src/main/AndroidManifest.xml
+5
-0
app/src/main/java/com/xingdata/zzdpos/ui/login/LoginActivity.java
...main/java/com/xingdata/zzdpos/ui/login/LoginActivity.java
+2
-1
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/ReturnTicketActivity.java
...data/zzdpos/ui/marketing/ticket/ReturnTicketActivity.java
+15
-83
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/ReturnTicketPresenter.java
...ata/zzdpos/ui/marketing/ticket/ReturnTicketPresenter.java
+4
-3
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/adapter/ReturnTicketAdapter.java
...dpos/ui/marketing/ticket/adapter/ReturnTicketAdapter.java
+16
-12
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/dialog/TicketAddDialog.java
...ta/zzdpos/ui/marketing/ticket/dialog/TicketAddDialog.java
+238
-238
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/fragment/TickerAddFragment.java
...zdpos/ui/marketing/ticket/fragment/TickerAddFragment.java
+226
-0
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/fragment/TickerIndexFragment.java
...pos/ui/marketing/ticket/fragment/TickerIndexFragment.java
+93
-0
app/src/main/java/com/xingdata/zzdpos/ui/sendTicke/SendTicketActivity.java
.../com/xingdata/zzdpos/ui/sendTicke/SendTicketActivity.java
+39
-0
app/src/main/java/com/xingdata/zzdpos/ui/sendTicke/SendTicketContract.java
.../com/xingdata/zzdpos/ui/sendTicke/SendTicketContract.java
+22
-0
app/src/main/java/com/xingdata/zzdpos/ui/sendTicke/SendTicketPresenter.java
...com/xingdata/zzdpos/ui/sendTicke/SendTicketPresenter.java
+17
-0
app/src/main/java/com/xingdata/zzdpos/ui/sendTicke/fragment/SendTickerIndexFragment.java
...zzdpos/ui/sendTicke/fragment/SendTickerIndexFragment.java
+39
-0
app/src/main/res/layout/activity_return_ticket.xml
app/src/main/res/layout/activity_return_ticket.xml
+4
-87
app/src/main/res/layout/activity_send_ticket.xml
app/src/main/res/layout/activity_send_ticket.xml
+31
-0
app/src/main/res/layout/dialog_integral_exchange_setting.xml
app/src/main/res/layout/dialog_integral_exchange_setting.xml
+4
-4
app/src/main/res/layout/dialog_integral_get_setting.xml
app/src/main/res/layout/dialog_integral_get_setting.xml
+9
-9
app/src/main/res/layout/dialog_ticket_add_setting.xml
app/src/main/res/layout/dialog_ticket_add_setting.xml
+272
-236
app/src/main/res/layout/fragment_send_ticker_main.xml
app/src/main/res/layout/fragment_send_ticker_main.xml
+91
-0
app/src/main/res/layout/fragment_ticker_main.xml
app/src/main/res/layout/fragment_ticker_main.xml
+136
-0
app/src/main/res/layout/item_return_ticket.xml
app/src/main/res/layout/item_return_ticket.xml
+57
-42
app/src/main/res/mipmap-hdpi/bg_return_ticker_logo.png
app/src/main/res/mipmap-hdpi/bg_return_ticker_logo.png
+0
-0
app/src/main/res/mipmap-hdpi/return_ticket_one.png
app/src/main/res/mipmap-hdpi/return_ticket_one.png
+0
-0
app/src/main/res/mipmap-hdpi/return_ticket_two.png
app/src/main/res/mipmap-hdpi/return_ticket_two.png
+0
-0
app/src/main/res/mipmap-hdpi/right.png
app/src/main/res/mipmap-hdpi/right.png
+0
-0
app/src/main/res/values/colors.xml
app/src/main/res/values/colors.xml
+1
-1
app/src/main/res/values/dimens.xml
app/src/main/res/values/dimens.xml
+2
-0
app/src/main/res/values/strings.xml
app/src/main/res/values/strings.xml
+4
-3
No files found.
app/src/main/AndroidManifest.xml
View file @
d0dab3f5
...
...
@@ -60,6 +60,11 @@
android:configChanges=
"keyboard|orientation|screenSize|keyboardHidden"
android:label=
"@string/title_activity_ticket"
android:theme=
"@style/AppTheme"
/>
<activity
android:name=
".ui.sendTicke.SendTicketActivity"
android:configChanges=
"keyboard|orientation|screenSize|keyboardHidden"
android:label=
"@string/title_activity_ticket"
android:theme=
"@style/AppTheme"
/>
<activity
android:name=
".ui.settle.SettleActivity"
android:configChanges=
"keyboard|orientation|screenSize|keyboardHidden"
...
...
app/src/main/java/com/xingdata/zzdpos/ui/login/LoginActivity.java
View file @
d0dab3f5
...
...
@@ -25,6 +25,7 @@ import com.xingdata.zzdpos.ui.login.fragment.bean.StoreTypeJsonBean;
import
com.xingdata.zzdpos.ui.marketing.integral.IntegralActivity
;
import
com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketActivity
;
import
com.xingdata.zzdpos.ui.payment.PaymentActivity
;
import
com.xingdata.zzdpos.ui.sendTicke.SendTicketActivity
;
import
com.xingdata.zzdpos.ui.splash.SplashActivity
;
import
com.xingdata.zzdpos.view.PopupWindowDownList
;
...
...
@@ -139,7 +140,7 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin
promptDialog
.
dismiss
();
//如果sn已经绑定款台,则直接跳转主页
if
(
loginReturnBean
.
getBindSN
())
{
startActivity
(
new
Intent
(
LoginActivity
.
this
,
Return
TicketActivity
.
class
));
startActivity
(
new
Intent
(
LoginActivity
.
this
,
Send
TicketActivity
.
class
));
LoginActivity
.
this
.
finish
();
return
;
}
...
...
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/ReturnTicketActivity.java
View file @
d0dab3f5
package
com
.
xingdata
.
zzdpos
.
ui
.
marketing
.
ticket
;
import
android.support.v7.widget.GridLayoutManager
;
import
android.text.Html
;
import
android.view.View
;
import
com.blankj.utilcode.util.ActivityUtils
;
import
com.blankj.utilcode.util.LogUtils
;
import
com.blankj.utilcode.util.ToastUtils
;
import
com.xingdata.zzdpos.R
;
...
...
@@ -13,18 +8,10 @@ import com.xingdata.zzdpos.databinding.ActivityReturnTicketBinding;
import
com.xingdata.zzdpos.model.Pager
;
import
com.xingdata.zzdpos.model.Trule
;
import
com.xingdata.zzdpos.ui.dialog.LoadingDialog
;
import
com.xingdata.zzdpos.ui.marketing.ticket.adapter.ReturnTicketAdapter
;
import
com.xingdata.zzdpos.ui.marketing.ticket.dialog.TicketAddDialog
;
import
com.xingdata.zzdpos.util.OnClickListener
;
import
com.xingdata.zzdpos.util.RecyclerViewUtil
;
import
java.util.ArrayList
;
public
class
ReturnTicketActivity
extends
BaseActivity
<
ReturnTicketPresenter
,
ActivityReturnTicketBinding
>
implements
ReturnTicketContract
.
View
{
ReturnTicketAdapter
returnTicketAdapter
;
LoadingDialog
loadingDialog
=
new
LoadingDialog
();
@Override
...
...
@@ -34,49 +21,7 @@ public class ReturnTicketActivity extends BaseActivity<ReturnTicketPresenter,
@Override
public
void
initView
()
{
mViewBinding
.
icTitle
.
tvTitle
.
setText
(
"优惠券规则"
);
mViewBinding
.
icTitle
.
setOnClickListener
(
new
OnClickListener
()
{
@Override
protected
void
myOnClickListener
(
View
v
)
{
ActivityUtils
.
finishActivity
(
ReturnTicketActivity
.
class
);
}
});
mViewBinding
.
btnGroup
.
setText
(
Html
.
fromHtml
(
getResources
().
getString
(
R
.
string
.
tv_ticket_count
,
"<font color='#1f7bdb'><big> "
+
"0"
+
" "
+
"</big></font>"
)));
final
int
SPACING
=
mContext
.
getResources
().
getDimensionPixelOffset
(
R
.
dimen
.
vip_message_item_spacing
);
returnTicketAdapter
=
new
ReturnTicketAdapter
(
new
ArrayList
<>(),
mPresenter
);
mViewBinding
.
rcTicket
.
setAdapter
(
returnTicketAdapter
);
mViewBinding
.
rcTicket
.
setLayoutManager
(
new
GridLayoutManager
(
ReturnTicketActivity
.
this
,
4
));
mViewBinding
.
rcTicket
.
addItemDecoration
(
new
RecyclerViewUtil
.
GridSpacingItemDecoration
(
4
,
SPACING
,
true
));
mViewBinding
.
setOnClickListener
(
view
->
{
switch
(
view
.
getId
())
{
case
R
.
id
.
btn_add
:
{
mPresenter
.
ticketAddDialog
=
new
TicketAddDialog
();
mPresenter
.
ticketAddDialog
.
show
(
this
);
}
break
;
default
:
{
}
break
;
}
});
loadRootFragment
(
R
.
id
.
frg
,
mPresenter
.
tickerIndexFragment
);
}
...
...
@@ -89,45 +34,27 @@ public class ReturnTicketActivity extends BaseActivity<ReturnTicketPresenter,
@Override
public
void
addSucc
(
LoadingDialog
loadingDialog
)
{
if
(
mPresenter
.
ticketAddDialog
!=
null
&&
mPresenter
.
ticketAddDialog
.
isShowing
)
{
mPresenter
.
ticketAddDialog
.
dismiss
();
}
// if (mPresenter.ticketAddDialog != null && mPresenter.ticketAddDialog.isShowing) {
// mPresenter.ticketAddDialog.dismiss();
// }
pop
();
mPresenter
.
truleQuery
(
loadingDialog
);
}
@Override
public
void
truleQuerySucc
(
Pager
<
Trule
>
trulePager
,
LoadingDialog
loadingDialog
)
{
closeLoading
(
loadingDialog
);
if
(
trulePager
==
null
||
trulePager
.
getList
()
==
null
||
trulePager
.
getList
().
size
()
<=
0
)
{
mViewBinding
.
tvEmpty
.
setVisibility
(
View
.
VISIBLE
);
}
if
(
trulePager
!=
null
&&
trulePager
.
getList
()
!=
null
)
{
mViewBinding
.
tvEmpty
.
setVisibility
(
View
.
GONE
);
returnTicketAdapter
.
setNewData
(
trulePager
.
getList
());
mViewBinding
.
btnGroup
.
setText
(
Html
.
fromHtml
(
getResources
().
getString
(
R
.
string
.
tv_ticket_count
,
"<font color='#1f7bdb'><big> "
+
trulePager
.
getList
().
size
()
+
" "
+
"</big></font>"
)));
}
mPresenter
.
tickerIndexFragment
.
truleQuerySucc
(
trulePager
,
loadingDialog
);
}
@Override
public
void
truleUpdateSucc
(
LoadingDialog
loadingDialog
)
{
if
(
mPresenter
.
ticketAddDialog
!=
null
&&
mPresenter
.
ticketAddDialog
.
isShowing
)
{
mPresenter
.
ticketAddDialog
.
dismiss
();
}
// if (mPresenter.ticketAddDialog != null && mPresenter.ticketAddDialog.isShowing) {
// mPresenter.ticketAddDialog.dismiss();
// }
pop
();
mPresenter
.
truleQuery
(
loadingDialog
);
}
private
void
closeLoading
(
LoadingDialog
loadingDialog
)
{
if
(
loadingDialog
!=
null
)
{
loadingDialog
.
dismiss
();
}
}
@Override
protected
void
onResume
()
{
...
...
@@ -136,4 +63,9 @@ public class ReturnTicketActivity extends BaseActivity<ReturnTicketPresenter,
mPresenter
.
truleQuery
(
loadingDialog
);
}
private
void
closeLoading
(
LoadingDialog
loadingDialog
)
{
if
(
loadingDialog
!=
null
)
{
loadingDialog
.
dismiss
();
}
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/ReturnTicketPresenter.java
View file @
d0dab3f5
...
...
@@ -5,7 +5,8 @@ import android.support.annotation.Nullable;
import
com.xingdata.zzdpos.api.ApiFactory
;
import
com.xingdata.zzdpos.model.Trule
;
import
com.xingdata.zzdpos.ui.dialog.LoadingDialog
;
import
com.xingdata.zzdpos.ui.marketing.ticket.dialog.TicketAddDialog
;
import
com.xingdata.zzdpos.ui.marketing.ticket.fragment.TickerAddFragment
;
import
com.xingdata.zzdpos.ui.marketing.ticket.fragment.TickerIndexFragment
;
/**
...
...
@@ -13,8 +14,8 @@ import com.xingdata.zzdpos.ui.marketing.ticket.dialog.TicketAddDialog;
*/
public
class
ReturnTicketPresenter
extends
ReturnTicketContract
.
Presenter
{
public
Ticke
tAddDialog
ticketAddDialog
;
public
Ticke
rIndexFragment
tickerIndexFragment
=
new
TickerIndexFragment
()
;
public
TickerAddFragment
tickerAddFragment
=
new
TickerAddFragment
();
@Override
public
void
onAttached
()
{
...
...
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/adapter/ReturnTicketAdapter.java
View file @
d0dab3f5
...
...
@@ -4,14 +4,13 @@ import android.support.annotation.Nullable;
import
android.view.View
;
import
com.blankj.utilcode.util.TimeUtils
;
import
com.blankj.utilcode.util.ToastUtils
;
import
com.xingdata.zzdpos.R
;
import
com.xingdata.zzdpos.base.BaseActivity
;
import
com.xingdata.zzdpos.base.BaseAdapter
;
import
com.xingdata.zzdpos.databinding.ItemReturnTicketBinding
;
import
com.xingdata.zzdpos.model.Trule
;
import
com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketActivity
;
import
com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketPresenter
;
import
com.xingdata.zzdpos.ui.marketing.ticket.
dialog.TicketAddDialog
;
import
com.xingdata.zzdpos.ui.marketing.ticket.
fragment.TickerAddFragment
;
import
com.xingdata.zzdpos.util.ConvertUtil
;
import
java.text.SimpleDateFormat
;
...
...
@@ -19,19 +18,24 @@ import java.util.List;
public
class
ReturnTicketAdapter
extends
BaseAdapter
<
Trule
,
ItemReturnTicketBinding
>
{
ReturnTicketPresenter
mPersenter
;
ReturnTicketActivity
returnTicketActivity
;
public
ReturnTicketAdapter
(
@Nullable
List
<
Trule
>
data
,
ReturnTicketPresenter
mPersenter
)
{
public
ReturnTicketAdapter
(
@Nullable
List
<
Trule
>
data
,
ReturnTicketPresenter
mPersenter
,
ReturnTicketActivity
returnTicketActivity
)
{
super
(
R
.
layout
.
item_return_ticket
,
data
);
this
.
mPersenter
=
mPersenter
;
this
.
returnTicketActivity
=
returnTicketActivity
;
}
@Override
protected
void
convert
(
ItemReturnTicketBinding
mViewBinding
,
Trule
item
)
{
mViewBinding
.
tvTicket
.
setText
(
"优\n惠\n券"
);
// mViewBinding.tvSend.setText("发\n券");
mViewBinding
.
tvSend
.
setText
(
"\n"
);
mViewBinding
.
tvTicketMoney
.
setText
(
ConvertUtil
.
fenToYuanNoPoint
(
item
.
getTruleValAmt
()));
// mViewBinding.tvSend.setText("\n");
mViewBinding
.
tvTicketMoney
.
setText
(
mContext
.
getResources
().
getString
(
R
.
string
.
tv_money
,
ConvertUtil
.
fenToYuanNoPoint
(
item
.
getTruleValAmt
())));
mViewBinding
.
tvTicketMoneys
.
setText
(
mContext
.
getResources
().
getString
(
R
.
string
.
money
,
ConvertUtil
.
fenToYuanNoPoint
(
item
.
getTruleValAmt
())));
mViewBinding
.
tvRule
.
setText
(
mContext
.
getResources
().
getString
(
R
.
string
.
tv_rule
,
ConvertUtil
.
fenToYuanNoPoint
(
item
.
getTruleOrderAmt
())));
mViewBinding
.
tvDate
.
setText
(
mContext
.
getResources
().
getString
(
R
.
string
.
tv_date
,
...
...
@@ -39,16 +43,16 @@ public class ReturnTicketAdapter extends BaseAdapter<Trule, ItemReturnTicketBind
mViewBinding
.
clSend
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
public
void
onClick
(
View
view
)
{
ToastUtils
.
showLong
(
"发券"
);
//
ToastUtils.showLong("发券");
}
});
mViewBinding
.
clItem
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
public
void
onClick
(
View
view
)
{
mPersenter
.
ticke
tAddDialog
=
new
TicketAddDialog
();
mPersenter
.
ticke
tAddDialog
.
setNowType
(
2
);
mPersenter
.
ticke
tAddDialog
.
editTicketData
(
item
);
mPersenter
.
ticketAddDialog
.
show
((
BaseActivity
)
mContex
t
);
mPersenter
.
ticke
rAddFragment
=
new
TickerAddFragment
();
mPersenter
.
ticke
rAddFragment
.
setNowType
(
2
);
mPersenter
.
ticke
rAddFragment
.
editTicketData
(
item
);
returnTicketActivity
.
start
(
mPersenter
.
tickerAddFragmen
t
);
}
});
...
...
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/dialog/TicketAddDialog.java
View file @
d0dab3f5
This diff is collapsed.
Click to expand it.
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/fragment/TickerAddFragment.java
0 → 100644
View file @
d0dab3f5
package
com
.
xingdata
.
zzdpos
.
ui
.
marketing
.
ticket
.
fragment
;
import
android.app.DatePickerDialog
;
import
android.content.Context
;
import
android.text.Editable
;
import
android.text.TextUtils
;
import
android.text.TextWatcher
;
import
android.view.View
;
import
android.view.inputmethod.InputMethodManager
;
import
android.widget.DatePicker
;
import
android.widget.TextView
;
import
com.blankj.utilcode.util.TimeUtils
;
import
com.blankj.utilcode.util.ToastUtils
;
import
com.xingdata.zzdpos.R
;
import
com.xingdata.zzdpos.base.BaseActivity
;
import
com.xingdata.zzdpos.base.BaseFragment
;
import
com.xingdata.zzdpos.databinding.DialogTicketAddSettingBinding
;
import
com.xingdata.zzdpos.model.Trule
;
import
com.xingdata.zzdpos.ui.dialog.LoadingDialog
;
import
com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketPresenter
;
import
com.xingdata.zzdpos.util.ConvertUtil
;
import
com.xingdata.zzdpos.util.OnClickListener
;
import
java.text.SimpleDateFormat
;
import
java.util.Calendar
;
public
class
TickerAddFragment
extends
BaseFragment
<
ReturnTicketPresenter
,
DialogTicketAddSettingBinding
>
{
LoadingDialog
loadingDialog
=
new
LoadingDialog
();
//0:正常 1暂停
private
byte
nowStatus
=
1
;
//当前编辑的对象
private
Trule
trule
=
new
Trule
();
//1为新增,2为更新
private
int
nowType
=
1
;
@Override
public
int
getLayoutId
()
{
return
R
.
layout
.
dialog_ticket_add_setting
;
}
@Override
public
void
initView
()
{
mViewBinding
.
icTitles
.
tvTitle
.
setText
(
"新增优惠券"
);
mViewBinding
.
icTitles
.
setOnClickListener
(
new
OnClickListener
()
{
@Override
protected
void
myOnClickListener
(
View
v
)
{
pop
();
}
});
hintKbTwo
();
mViewBinding
.
etTicketMoney
.
addTextChangedListener
(
mTextWatcher
);
mViewBinding
.
etRuleMoney
.
addTextChangedListener
(
mTextWatcher
);
mViewBinding
.
etTicketCount
.
addTextChangedListener
(
mTextWatcher
);
if
(
nowType
==
2
)
{
mViewBinding
.
icTitles
.
tvTitle
.
setText
(
"编辑优惠券"
);
mViewBinding
.
tvIntegralRuleName
.
setText
(
trule
.
getTruleName
());
if
(
trule
.
getTruleStatus
()
==
1
)
{
mViewBinding
.
rbSuspended
.
setChecked
(
true
);
}
else
if
(
trule
.
getTruleStatus
()
==
0
)
{
mViewBinding
.
rbStart
.
setChecked
(
true
);
}
mViewBinding
.
etTicketMoney
.
setText
(
ConvertUtil
.
fenToYuanNoPoint
(
trule
.
getTruleValAmt
()));
mViewBinding
.
tvDate
.
setText
(
TimeUtils
.
millis2String
(
trule
.
getTruleExp
(),
new
SimpleDateFormat
(
"yyyy-mm-dd"
)));
mViewBinding
.
etRuleMoney
.
setText
(
ConvertUtil
.
fenToYuanNoPoint
(
trule
.
getTruleOrderAmt
()));
mViewBinding
.
etTicketCount
.
setText
(
trule
.
getTruleUseNum
()
+
""
);
}
mViewBinding
.
setOnClickListener
(
new
OnClickListener
()
{
@Override
protected
void
myOnClickListener
(
View
view
)
{
hintKbTwo
();
switch
(
view
.
getId
())
{
case
R
.
id
.
tv_date
:
{
showDialogPick
(
mViewBinding
.
tvDate
);
}
break
;
case
R
.
id
.
rb_suspended
:
{
//暂停
nowStatus
=
1
;
}
break
;
case
R
.
id
.
rb_start
:
{
//启用
nowStatus
=
0
;
}
break
;
case
R
.
id
.
btn_add
:{
if
(
isNull
())
{
if
(
Integer
.
parseInt
(
mViewBinding
.
etRuleMoney
.
getText
().
toString
())
<=
Integer
.
parseInt
(
mViewBinding
.
etTicketMoney
.
getText
().
toString
()))
{
ToastUtils
.
showLong
(
"可用金额需大于优惠券面值 "
);
return
;
}
loadingDialog
.
show
((
BaseActivity
)
mContext
);
if
(
nowType
==
1
)
{
mPresenter
.
add
(
getUiData
(),
loadingDialog
);
}
else
if
(
nowType
==
2
)
{
mPresenter
.
truleUpdate
(
getUiData
(),
loadingDialog
);
}
}
else
{
ToastUtils
.
showLong
(
"输入数据不能null"
);
}
}
break
;
default
:
{
}
break
;
}
}
});
}
public
void
editTicketData
(
Trule
trule
)
{
this
.
trule
=
trule
;
}
private
Trule
getUiData
()
{
mViewBinding
.
tvIntegralRuleName
.
setText
(
mViewBinding
.
etTicketMoney
.
getText
().
toString
()
+
"元优惠券"
);
trule
.
setTruleName
(
mViewBinding
.
tvIntegralRuleName
.
getText
().
toString
());
//0:正常 1暂停 默认0
trule
.
setTruleStatus
(
nowStatus
);
trule
.
setTruleValAmt
(
ConvertUtil
.
yuanToFen
(
mViewBinding
.
etTicketMoney
.
getText
().
toString
()));
trule
.
setTruleExp
(
TimeUtils
.
string2Millis
(
mViewBinding
.
tvDate
.
getText
().
toString
(),
new
SimpleDateFormat
(
"yyyy-mm-dd"
)));
trule
.
setTruleOrderAmt
(
ConvertUtil
.
yuanToFen
(
mViewBinding
.
etRuleMoney
.
getText
().
toString
()));
if
(!
mViewBinding
.
etTicketCount
.
getText
().
toString
().
equals
(
""
))
{
trule
.
setTruleUseNum
(
Byte
.
parseByte
(
mViewBinding
.
etTicketCount
.
getText
().
toString
()));
}
else
{
trule
.
setTruleUseNum
((
byte
)
1
);
}
return
trule
;
}
/**
* 判断用户输入数据是否为null
*
* @return 输入为null返回false 反之返回true
*/
private
boolean
isNull
()
{
return
!(
TextUtils
.
isEmpty
(
mViewBinding
.
etTicketMoney
.
getText
().
toString
())
||
TextUtils
.
isEmpty
(
mViewBinding
.
tvDate
.
getText
().
toString
())
||
TextUtils
.
isEmpty
(
mViewBinding
.
etRuleMoney
.
getText
().
toString
())
||
TextUtils
.
isEmpty
(
mViewBinding
.
etTicketCount
.
getText
().
toString
()));
}
//将两个选择时间的dialog放在该函数中
private
void
showDialogPick
(
final
View
btn
)
{
//获取Calendar对象,用于获取当前时间
final
Calendar
calendar
=
Calendar
.
getInstance
();
int
year
=
calendar
.
get
(
Calendar
.
YEAR
);
int
month
=
calendar
.
get
(
Calendar
.
MONTH
);
int
day
=
calendar
.
get
(
Calendar
.
DAY_OF_MONTH
);
//实例化DatePickerDialog对象
DatePickerDialog
datePickerDialog
=
new
DatePickerDialog
(
mContext
,
new
DatePickerDialog
.
OnDateSetListener
()
{
//选择完日期后会调用该回调函数
@Override
public
void
onDateSet
(
DatePicker
view
,
int
year
,
int
monthOfYear
,
int
dayOfMonth
)
{
//因为monthOfYear会比实际月份少一月所以这边要加1
((
TextView
)
btn
).
setText
(
year
+
"-"
+
(
monthOfYear
+
1
)
+
"-"
+
dayOfMonth
);
}
},
year
,
month
,
day
);
//弹出选择日期对话框
datePickerDialog
.
show
();
}
/**
* 显示软键盘,Dialog使用
*/
public
void
hintKbTwo
()
{
View
view
=
getActivity
().
getCurrentFocus
();
if
(
view
==
null
)
{
return
;
}
if
(
view
instanceof
TextView
)
{
InputMethodManager
mInputMethodManager
=
(
InputMethodManager
)
getContext
()
.
getSystemService
(
Context
.
INPUT_METHOD_SERVICE
);
mInputMethodManager
.
hideSoftInputFromWindow
(
view
.
getWindowToken
(),
InputMethodManager
.
RESULT_UNCHANGED_SHOWN
);
}
}
private
TextWatcher
mTextWatcher
=
new
TextWatcher
()
{
@Override
public
void
onTextChanged
(
CharSequence
s
,
int
start
,
int
before
,
int
count
)
{
}
@Override
public
void
beforeTextChanged
(
CharSequence
s
,
int
start
,
int
count
,
int
after
)
{
}
@Override
public
void
afterTextChanged
(
Editable
s
)
{
String
text
=
s
.
toString
();
int
len
=
s
.
toString
().
length
();
if
(
len
==
1
&&
text
.
equals
(
"0"
))
{
s
.
clear
();
}
}
};
public
void
setNowType
(
int
type
)
{
trule
=
new
Trule
();
this
.
nowType
=
type
;
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/fragment/TickerIndexFragment.java
0 → 100644
View file @
d0dab3f5
package
com
.
xingdata
.
zzdpos
.
ui
.
marketing
.
ticket
.
fragment
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.text.Html
;
import
android.view.View
;
import
com.blankj.utilcode.util.ActivityUtils
;
import
com.xingdata.zzdpos.R
;
import
com.xingdata.zzdpos.base.BaseFragment
;
import
com.xingdata.zzdpos.databinding.FragmentTickerMainBinding
;
import
com.xingdata.zzdpos.model.Pager
;
import
com.xingdata.zzdpos.model.Trule
;
import
com.xingdata.zzdpos.ui.dialog.LoadingDialog
;
import
com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketActivity
;
import
com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketPresenter
;
import
com.xingdata.zzdpos.ui.marketing.ticket.adapter.ReturnTicketAdapter
;
import
com.xingdata.zzdpos.util.OnClickListener
;
import
java.util.ArrayList
;
public
class
TickerIndexFragment
extends
BaseFragment
<
ReturnTicketPresenter
,
FragmentTickerMainBinding
>
{
ReturnTicketAdapter
returnTicketAdapter
;
LoadingDialog
loadingDialog
=
new
LoadingDialog
();
@Override
public
int
getLayoutId
()
{
return
R
.
layout
.
fragment_ticker_main
;
}
@Override
public
void
initView
()
{
mViewBinding
.
icTitle
.
tvTitle
.
setText
(
"优惠券规则"
);
mViewBinding
.
icTitle
.
setOnClickListener
(
new
OnClickListener
()
{
@Override
protected
void
myOnClickListener
(
View
v
)
{
ActivityUtils
.
finishActivity
(
ReturnTicketActivity
.
class
);
}
});
mViewBinding
.
btnGroup
.
setText
(
Html
.
fromHtml
(
getResources
().
getString
(
R
.
string
.
tv_ticket_count
,
"<font color='#1f7bdb'><big> "
+
"0"
+
" "
+
"</big></font>"
)));
returnTicketAdapter
=
new
ReturnTicketAdapter
(
new
ArrayList
<>(),
mPresenter
,
(
ReturnTicketActivity
)
getActivity
());
mViewBinding
.
rcTicket
.
setAdapter
(
returnTicketAdapter
);
LinearLayoutManager
linearLayoutManager
=
new
LinearLayoutManager
(
getActivity
());
linearLayoutManager
.
setOrientation
(
LinearLayoutManager
.
VERTICAL
);
mViewBinding
.
rcTicket
.
setLayoutManager
(
linearLayoutManager
);
mViewBinding
.
setOnClickListener
(
new
OnClickListener
()
{
@Override
protected
void
myOnClickListener
(
View
view
)
{
switch
(
view
.
getId
())
{
case
R
.
id
.
btn_add
:
{
// mPresenter.ticketAddDialog = new TicketAddDialog();
// mPresenter.ticketAddDialog.show(this);
mPresenter
.
tickerAddFragment
=
new
TickerAddFragment
();
start
(
mPresenter
.
tickerAddFragment
);
}
break
;
default
:
{
}
break
;
}
}
});
}
public
void
truleQuerySucc
(
Pager
<
Trule
>
trulePager
,
LoadingDialog
loadingDialog
)
{
closeLoading
(
loadingDialog
);
if
(
trulePager
==
null
||
trulePager
.
getList
()
==
null
||
trulePager
.
getList
().
size
()
<=
0
)
{
mViewBinding
.
tvEmpty
.
setVisibility
(
View
.
VISIBLE
);
}
if
(
trulePager
!=
null
&&
trulePager
.
getList
()
!=
null
)
{
mViewBinding
.
tvEmpty
.
setVisibility
(
View
.
GONE
);
returnTicketAdapter
.
setNewData
(
trulePager
.
getList
());
mViewBinding
.
btnGroup
.
setText
(
Html
.
fromHtml
(
getResources
().
getString
(
R
.
string
.
tv_ticket_count
,
"<font color='#1f7bdb'><big> "
+
trulePager
.
getList
().
size
()
+
" "
+
"</big></font>"
)));
}
}
private
void
closeLoading
(
LoadingDialog
loadingDialog
)
{
if
(
loadingDialog
!=
null
)
{
loadingDialog
.
dismiss
();
}
}
}
app/src/main/java/com/xingdata/zzdpos/ui/sendTicke/SendTicketActivity.java
0 → 100644
View file @
d0dab3f5
package
com
.
xingdata
.
zzdpos
.
ui
.
sendTicke
;
import
com.blankj.utilcode.util.LogUtils
;
import
com.blankj.utilcode.util.ToastUtils
;
import
com.xingdata.zzdpos.R
;
import
com.xingdata.zzdpos.base.BaseActivity
;
import
com.xingdata.zzdpos.databinding.ActivitySendTicketBinding
;
import
com.xingdata.zzdpos.ui.dialog.LoadingDialog
;
public
class
SendTicketActivity
extends
BaseActivity
<
SendTicketPresenter
,
ActivitySendTicketBinding
>
implements
SendTicketContract
.
View
{
LoadingDialog
loadingDialog
=
new
LoadingDialog
();
@Override
public
int
getLayoutId
()
{
return
R
.
layout
.
activity_send_ticket
;
}
@Override
public
void
initView
()
{
loadRootFragment
(
R
.
id
.
fragment
,
mPresenter
.
sendTickerIndexFragment
);
}
@Override
public
void
error
(
String
errorMsg
,
LoadingDialog
loadingDialog
)
{
closeLoading
(
loadingDialog
);
LogUtils
.
e
(
errorMsg
);
ToastUtils
.
showLong
(
errorMsg
);
}
private
void
closeLoading
(
LoadingDialog
loadingDialog
)
{
if
(
loadingDialog
!=
null
)
{
loadingDialog
.
dismiss
();
}
}
}
app/src/main/java/com/xingdata/zzdpos/ui/sendTicke/SendTicketContract.java
0 → 100644
View file @
d0dab3f5
package
com
.
xingdata
.
zzdpos
.
ui
.
sendTicke
;
import
com.xingdata.zzdpos.base.BasePresenter
;
import
com.xingdata.zzdpos.base.BaseView
;
import
com.xingdata.zzdpos.ui.dialog.LoadingDialog
;
/**
* Created by Administrator on 2017/11/24.
*/
public
interface
SendTicketContract
{
interface
View
extends
BaseView
{
void
error
(
String
errorMsg
,
LoadingDialog
loadingDialog
);
}
abstract
class
Presenter
extends
BasePresenter
<
View
>
{
}
}
app/src/main/java/com/xingdata/zzdpos/ui/sendTicke/SendTicketPresenter.java
0 → 100644
View file @
d0dab3f5
package
com
.
xingdata
.
zzdpos
.
ui
.
sendTicke
;
import
com.xingdata.zzdpos.ui.sendTicke.fragment.SendTickerIndexFragment
;
/**
* Created by Administrator on 2017/11/24.
*/
public
class
SendTicketPresenter
extends
SendTicketContract
.
Presenter
{
public
SendTickerIndexFragment
sendTickerIndexFragment
=
new
SendTickerIndexFragment
();
@Override
public
void
onAttached
()
{
}
}
app/src/main/java/com/xingdata/zzdpos/ui/sendTicke/fragment/SendTickerIndexFragment.java
0 → 100644
View file @
d0dab3f5
package
com
.
xingdata
.
zzdpos
.
ui
.
sendTicke
.
fragment
;
import
android.view.View
;
import
com.blankj.utilcode.util.ActivityUtils
;
import
com.xingdata.zzdpos.R
;
import
com.xingdata.zzdpos.base.BaseFragment
;
import
com.xingdata.zzdpos.databinding.FragmentSendTickerMainBinding
;
import
com.xingdata.zzdpos.ui.dialog.LoadingDialog
;
import
com.xingdata.zzdpos.ui.marketing.integral.IntegralActivity
;
import
com.xingdata.zzdpos.ui.sendTicke.SendTicketPresenter
;
import
com.xingdata.zzdpos.util.OnClickListener
;
public
class
SendTickerIndexFragment
extends
BaseFragment
<
SendTicketPresenter
,
FragmentSendTickerMainBinding
>
{
@Override
public
int
getLayoutId
()
{
return
R
.
layout
.
fragment_send_ticker_main
;
}
@Override
public
void
initView
()
{
mViewBinding
.
icTitle
.
tvTitle
.
setText
(
"积分规则"
);
mViewBinding
.
icTitle
.
setOnClickListener
(
new
OnClickListener
()
{
@Override
protected
void
myOnClickListener
(
View
v
)
{
ActivityUtils
.
finishActivity
(
IntegralActivity
.
class
);
}
});
}
private
void
closeLoading
(
LoadingDialog
loadingDialog
)
{
if
(
loadingDialog
!=
null
)
{
loadingDialog
.
dismiss
();
}
}
}
app/src/main/res/layout/activity_return_ticket.xml
View file @
d0dab3f5
...
...
@@ -15,98 +15,15 @@
android:layout_height=
"match_parent"
android:background=
"@color/appBack"
tools:context=
"com.xingdata.zzdhd.ui.manager.ticket.ReturnTicketActivity"
>
<include
android:id=
"@+id/ic_title"
layout=
"@layout/title_appback"
android:layout_width=
"0dp"
android:layout_height=
"0dp"
app:layout_constraintBottom_toTopOf=
"@id/ll_menu"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintVertical_weight=
"@integer/all_top_weight"
/>
<LinearLayout
android:id=
"@+id/ll_menu"
<FrameLayout
android:id=
"@+id/frg"
android:layout_width=
"0dp"
android:layout_height=
"0dp"
android:background=
"@color/white"
android:gravity=
"center"
android:orientation=
"horizontal"
android:paddingLeft=
"@dimen/all_margin"
android:paddingRight=
"@dimen/all_margin"
app:layout_constraintBottom_toBottomOf=
"@id/rc_ticket"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/ic_title"
app:layout_constraintVertical_weight=
"2.5"
>
<TextView
android:id=
"@+id/btn_group"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/all_spacing"
android:layout_weight=
"1.2"
android:background=
"@color/transparent"
android:drawablePadding=
"@dimen/all_spacing"
android:drawableStart=
"@mipmap/login_phone"
android:foreground=
"?android:attr/selectableItemBackground"
android:padding=
"@dimen/fragment_store_item_spacing"
android:text=
"共 2 种优惠券"
android:textColor=
"@color/menu_back"
android:textSize=
"@dimen/all_text_size"
/>
<TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"7.5"
/>
<Button
android:id=
"@+id/btn_add"
android:layout_width=
"0dp"
android:layout_height=
"@dimen/fragment_store_et_height"
android:layout_weight=
"1"
android:background=
"@drawable/selector_navy_blue"
android:drawableLeft=
"@mipmap/bindingcounter_addcounter_befor"
android:onClick=
"@{OnClickListener}"
android:paddingLeft=
"5dp"
android:text=
"添加优惠券"
android:textColor=
"@color/white"
android:textSize=
"@dimen/et_textsize"
/>
</LinearLayout>
<android.support.v7.widget.RecyclerView
android:id=
"@+id/rc_ticket"
android:layout_width=
"0dp"
android:layout_height=
"0dp"
android:padding=
"@dimen/all_margin_big"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintHorizontal_bias=
"0.0"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/ll_menu"
app:layout_constraintVertical_weight=
"22"
>
</android.support.v7.widget.RecyclerView>
app:layout_constraintTop_toTopOf=
"parent"
></FrameLayout>
<TextView
android:id=
"@+id/tv_empty"
android:layout_width=
"0dp"
android:layout_height=
"0dp"
android:background=
"@color/appBack"
android:drawableTop=
"@mipmap/icon_things_null"
android:gravity=
"center"
android:padding=
"100dp"
android:text=
"@string/empty_other_select"
android:textColor=
"@color/white_half"
android:textSize=
"@dimen/all_text_size_big"
android:visibility=
"gone"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintHorizontal_bias=
"0.0"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/ll_menu"
app:layout_constraintVertical_weight=
"22"
/>
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/activity_send_ticket.xml
0 → 100644
View file @
d0dab3f5
<?xml version="1.0" encoding="utf-8"?>
<layout>
<data>
<variable
name=
"onClickListener"
type=
"android.view.View.OnClickListener"
/>
</data>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"@color/appBack"
android:orientation=
"vertical"
>
<FrameLayout
android:id=
"@+id/fragment"
style=
"@style/xuline_margin"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_gravity=
"center"
android:background=
"@color/appBack"
/>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/dialog_integral_exchange_setting.xml
View file @
d0dab3f5
...
...
@@ -37,7 +37,7 @@
<View
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/all_line_width"
android:background=
"@color/g
ar
y1"
android:background=
"@color/g
ra
y1"
android:paddingLeft=
"@dimen/all_margin"
android:paddingRight=
"@dimen/all_margin"
></View>
...
...
@@ -100,7 +100,7 @@
android:layout_height=
"@dimen/all_line_width"
android:layout_marginLeft=
"@dimen/all_padding"
android:layout_marginRight=
"@dimen/all_padding"
android:background=
"@color/g
ar
y1"
></View>
android:background=
"@color/g
ra
y1"
></View>
<LinearLayout
...
...
@@ -207,7 +207,7 @@
android:layout_height=
"@dimen/all_line_width"
android:layout_marginLeft=
"@dimen/all_padding"
android:layout_marginRight=
"@dimen/all_padding"
android:background=
"@color/g
ar
y1"
></View>
android:background=
"@color/g
ra
y1"
></View>
<LinearLayout
android:layout_width=
"match_parent"
...
...
@@ -253,7 +253,7 @@
<View
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/all_line_width"
android:background=
"@color/g
ar
y1"
></View>
android:background=
"@color/g
ra
y1"
></View>
</LinearLayout>
...
...
app/src/main/res/layout/dialog_integral_get_setting.xml
View file @
d0dab3f5
...
...
@@ -85,7 +85,7 @@
android:layout_height=
"@dimen/all_line_width"
android:layout_marginLeft=
"@dimen/all_padding"
android:layout_marginRight=
"@dimen/all_padding"
android:background=
"@color/g
ar
y1"
></View>
android:background=
"@color/g
ra
y1"
></View>
<LinearLayout
...
...
@@ -147,7 +147,7 @@
android:layout_height=
"@dimen/all_line_width"
android:layout_marginLeft=
"@dimen/all_padding"
android:layout_marginRight=
"@dimen/all_padding"
android:background=
"@color/g
ar
y1"
></View>
android:background=
"@color/g
ra
y1"
></View>
<TextView
android:layout_width=
"match_parent"
...
...
@@ -220,7 +220,7 @@
android:layout_height=
"@dimen/all_line_width"
android:layout_marginLeft=
"@dimen/all_padding"
android:layout_marginRight=
"@dimen/all_padding"
android:background=
"@color/g
ar
y1"
></View>
android:background=
"@color/g
ra
y1"
></View>
<LinearLayout
android:layout_width=
"match_parent"
...
...
@@ -291,7 +291,7 @@
android:layout_height=
"@dimen/all_line_width"
android:layout_marginLeft=
"@dimen/all_padding"
android:layout_marginRight=
"@dimen/all_padding"
android:background=
"@color/g
ar
y1"
></View>
android:background=
"@color/g
ra
y1"
></View>
<LinearLayout
...
...
@@ -347,7 +347,7 @@
android:layout_height=
"@dimen/all_line_width"
android:layout_marginLeft=
"@dimen/all_padding"
android:layout_marginRight=
"@dimen/all_padding"
android:background=
"@color/g
ar
y1"
></View>
android:background=
"@color/g
ra
y1"
></View>
<LinearLayout
...
...
@@ -396,7 +396,7 @@
android:layout_height=
"@dimen/all_line_width"
android:layout_marginLeft=
"@dimen/all_padding"
android:layout_marginRight=
"@dimen/all_padding"
android:background=
"@color/g
ar
y1"
></View>
android:background=
"@color/g
ra
y1"
></View>
<LinearLayout
...
...
@@ -508,7 +508,7 @@
android:layout_height=
"@dimen/all_line_width"
android:layout_marginLeft=
"@dimen/all_padding"
android:layout_marginRight=
"@dimen/all_padding"
android:background=
"@color/g
ar
y1"
></View>
android:background=
"@color/g
ra
y1"
></View>
<LinearLayout
android:layout_width=
"match_parent"
...
...
@@ -554,7 +554,7 @@
android:layout_height=
"@dimen/all_line_width"
android:layout_marginLeft=
"@dimen/all_padding"
android:layout_marginRight=
"@dimen/all_padding"
android:background=
"@color/g
ar
y1"
></View>
android:background=
"@color/g
ra
y1"
></View>
<LinearLayout
android:layout_width=
"match_parent"
...
...
@@ -646,7 +646,7 @@
<View
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/all_line_width"
android:background=
"@color/g
ar
y1"
></View>
android:background=
"@color/g
ra
y1"
></View>
</LinearLayout>
...
...
app/src/main/res/layout/dialog_ticket_add_setting.xml
View file @
d0dab3f5
This diff is collapsed.
Click to expand it.
app/src/main/res/layout/fragment_send_ticker_main.xml
0 → 100644
View file @
d0dab3f5
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:app=
"http://schemas.android.com/apk/res-auto"
>
<data>
<variable
name=
"OnClickListener"
type=
"com.xingdata.zzdpos.util.OnClickListener"
></variable>
</data>
<android.support.constraint.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"@color/gray_zhouyu"
>
<include
android:id=
"@+id/ic_title"
layout=
"@layout/title"
/>
<LinearLayout
android:id=
"@+id/ll_one"
android:layout_width=
"match_parent"
android:layout_height=
"?attr/actionBarSize"
android:layout_marginTop=
"@dimen/all_padding"
android:background=
"@color/white"
android:gravity=
"center"
android:orientation=
"horizontal"
android:paddingLeft=
"@dimen/all_margin"
app:layout_constraintTop_toBottomOf=
"@+id/ic_title"
>
<ImageView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:src=
"@mipmap/bg_return_ticker_logo"
/>
<TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"5"
android:paddingLeft=
"@dimen/all_padding"
android:text=
"按单独会员发券"
android:textColor=
"@color/black_baozheng"
android:textSize=
"@dimen/text_three_title"
/>
<ImageView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:src=
"@mipmap/right"
/>
</LinearLayout>
<LinearLayout
android:id=
"@+id/ll_all"
android:layout_width=
"match_parent"
android:layout_height=
"?attr/actionBarSize"
android:layout_marginTop=
"@dimen/all_padding"
android:background=
"@color/white"
android:gravity=
"center"
android:orientation=
"horizontal"
android:paddingLeft=
"@dimen/all_margin"
app:layout_constraintTop_toBottomOf=
"@+id/ll_one"
>
<ImageView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:src=
"@mipmap/bg_return_ticker_logo"
/>
<TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"5"
android:paddingLeft=
"@dimen/all_padding"
android:text=
"按会员类别发券"
android:textColor=
"@color/black_baozheng"
android:textSize=
"@dimen/text_three_title"
/>
<ImageView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:src=
"@mipmap/right"
/>
</LinearLayout>
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_ticker_main.xml
0 → 100644
View file @
d0dab3f5
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
>
<data>
<variable
name=
"OnClickListener"
type=
"com.xingdata.zzdpos.util.OnClickListener"
></variable>
</data>
<android.support.constraint.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"@color/white"
>
<include
android:id=
"@+id/ic_title"
layout=
"@layout/title"
/>
<LinearLayout
android:id=
"@+id/btn_add"
android:layout_width=
"match_parent"
android:layout_height=
"?attr/actionBarSize"
android:background=
"@drawable/singleline_white_gray"
android:gravity=
"center"
android:onClick=
"@{OnClickListener}"
android:orientation=
"horizontal"
app:layout_constraintBottom_toTopOf=
"@id/ll_menu"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/ic_title"
>
<ImageView
android:id=
"@+id/iv"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:src=
"@mipmap/but_add"
/>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/all_padding"
android:text=
"添加获取规则"
android:textColor=
"@color/red_guanyu"
android:textSize=
"@dimen/text_three_title"
/>
</LinearLayout>
<LinearLayout
android:id=
"@+id/ll_menu"
android:layout_width=
"0dp"
android:layout_height=
"6dp"
android:background=
"@color/white"
android:gravity=
"center"
android:orientation=
"horizontal"
android:paddingLeft=
"@dimen/all_margin"
android:paddingRight=
"@dimen/all_margin"
android:visibility=
"gone"
app:layout_constraintBottom_toBottomOf=
"@id/rc_ticket"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/btn_add"
app:layout_constraintVertical_weight=
"2.5"
>
<TextView
android:id=
"@+id/btn_group"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/all_spacing"
android:layout_weight=
"1.2"
android:background=
"@color/transparent"
android:drawablePadding=
"@dimen/all_spacing"
android:drawableStart=
"@mipmap/login_phone"
android:foreground=
"?android:attr/selectableItemBackground"
android:padding=
"@dimen/fragment_store_item_spacing"
android:text=
"共 2 种优惠券"
android:textColor=
"@color/menu_back"
android:textSize=
"@dimen/all_text_size"
/>
<TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"7.5"
/>
<Button
android:layout_width=
"0dp"
android:layout_height=
"@dimen/fragment_store_et_height"
android:layout_weight=
"1"
android:background=
"@drawable/selector_navy_blue"
android:drawableLeft=
"@mipmap/bindingcounter_addcounter_befor"
android:onClick=
"@{OnClickListener}"
android:paddingLeft=
"5dp"
android:text=
"添加优惠券"
android:textColor=
"@color/white"
android:textSize=
"@dimen/et_textsize"
/>
</LinearLayout>
<android.support.v7.widget.RecyclerView
android:id=
"@+id/rc_ticket"
android:layout_width=
"0dp"
android:layout_height=
"0dp"
android:padding=
"@dimen/all_padding"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintHorizontal_bias=
"0.0"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/ll_menu"
app:layout_constraintVertical_weight=
"22"
>
</android.support.v7.widget.RecyclerView>
<TextView
android:id=
"@+id/tv_empty"
android:layout_width=
"0dp"
android:layout_height=
"0dp"
android:background=
"@color/appBack"
android:drawableTop=
"@mipmap/icon_things_null"
android:gravity=
"center"
android:padding=
"100dp"
android:text=
"@string/empty_other_select"
android:textColor=
"@color/white_half"
android:textSize=
"@dimen/all_text_size_big"
android:visibility=
"gone"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintHorizontal_bias=
"0.0"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/ll_menu"
app:layout_constraintVertical_weight=
"22"
/>
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/item_return_ticket.xml
View file @
d0dab3f5
...
...
@@ -12,18 +12,20 @@
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/all_margin"
android:orientation=
"horizontal"
>
<android.support.constraint.ConstraintLayout
android:id=
"@+id/cl_item"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
>
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"2.3"
>
<ImageView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:
src
=
"@mipmap/return_ticket_one"
/>
android:
background
=
"@mipmap/return_ticket_one"
/>
<LinearLayout
android:id=
"@+id/ll_top"
...
...
@@ -36,41 +38,32 @@
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintVertical_weight=
"
2.5
"
>
app:layout_constraintVertical_weight=
"
4
"
>
<
Text
View
android:layout_width=
"
wrap_content
"
<
Image
View
android:layout_width=
"
0dp
"
android:layout_height=
"match_parent"
android:
text=
"¥
"
android:
textColor=
"@color/white
"
android:
textSize=
"@dimen/et_textsize
"
/>
android:
layout_gravity=
"right
"
android:
layout_weight=
"1.8
"
android:
src=
"@mipmap/bg_return_ticker_logo
"
/>
<TextView
android:id=
"@+id/tv_ticket_money"
android:layout_width=
"
wrap_content
"
android:layout_width=
"
0dp
"
android:layout_height=
"match_parent"
android:layout_
marginLeft=
"@dimen/all_padding
"
android:layout_
weight=
"5
"
android:gravity=
"center"
android:text=
"
20
"
android:text=
"
@string/tv_money
"
android:textColor=
"@color/white"
android:textSize=
"
45sp
"
android:textSize=
"
@dimen/text_secondary_title
"
android:textStyle=
"bold"
/>
<TextView
android:id=
"@+id/tv_ticket"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:layout_marginLeft=
"@dimen/all_padding"
android:text=
"优惠券"
android:textColor=
"@color/white"
android:textSize=
"@dimen/et_textsize"
/>
</LinearLayout>
<LinearLayout
android:id=
"@+id/ll_bottom"
android:layout_width=
"0dp"
android:layout_height=
"0dp"
android:gravity=
"center"
android:orientation=
"vertical"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
...
...
@@ -78,48 +71,70 @@
app:layout_constraintTop_toBottomOf=
"@id/ll_top"
app:layout_constraintVertical_weight=
"2"
>
<TextView
android:id=
"@+id/tv_rule"
android:layout_width=
"wrap_content"
android:layout_height=
"0dp"
android:layout_weight=
"1"
android:text=
"@string/tv_rule"
android:textColor=
"@color/white"
android:textSize=
"@dimen/et_textsize"
/>
<TextView
android:id=
"@+id/tv_date"
android:layout_width=
"
wrap_cont
ent"
android:layout_width=
"
match_par
ent"
android:layout_height=
"0dp"
android:layout_marginTop=
"@dimen/all_padding"
android:layout_weight=
"1"
android:gravity=
"center_vertical"
android:paddingLeft=
"@dimen/all_margin"
android:text=
"@string/tv_date"
android:textColor=
"@color/white"
android:textSize=
"@dimen/et_text
_mini
"
/>
android:textSize=
"@dimen/et_text
size
"
/>
</LinearLayout>
</android.support.constraint.ConstraintLayout>
<android.support.constraint.ConstraintLayout
android:id=
"@+id/cl_send"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
>
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
>
<ImageView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:src=
"@mipmap/return_ticket_two"
/>
android:layout_height=
"match_parent"
android:background=
"@mipmap/return_ticket_two"
/>
<TextView
android:id=
"@+id/tv_send"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"发券"
android:id=
"@+id/tv_ticket_moneys"
android:layout_width=
"0dp"
android:layout_height=
"0dp"
android:gravity=
"center"
android:text=
"@string/money"
android:textColor=
"@color/white"
android:textSize=
"@dimen/text_primary_title_smile"
android:textStyle=
"bold"
app:layout_constraintBottom_toTopOf=
"@+id/vw_line"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<View
android:id=
"@+id/vw_line"
android:layout_width=
"0dp"
android:layout_height=
"@dimen/all_line_width"
android:layout_marginLeft=
"@dimen/all_padding"
android:layout_marginRight=
"@dimen/all_padding"
android:background=
"@color/gray1"
app:layout_constraintBottom_toTopOf=
"@id/tv_rule"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/tv_ticket_moneys"
></View>
<TextView
android:id=
"@+id/tv_rule"
android:layout_width=
"0dp"
android:layout_height=
"0dp"
android:gravity=
"center"
android:text=
"@string/tv_rule"
android:textColor=
"@color/white"
android:textSize=
"@dimen/et_textsize"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_to
TopOf=
"parent
"
/>
app:layout_constraintTop_to
BottomOf=
"@+id/vw_line
"
/>
</android.support.constraint.ConstraintLayout>
</LinearLayout>
...
...
app/src/main/res/mipmap-hdpi/bg_return_ticker_logo.png
0 → 100644
View file @
d0dab3f5
2.93 KB
app/src/main/res/mipmap-hdpi/return_ticket_one.png
View replaced file @
14e44b61
View file @
d0dab3f5
8.72 KB
|
W:
|
H:
4.24 KB
|
W:
|
H:
2-up
Swipe
Onion skin
app/src/main/res/mipmap-hdpi/return_ticket_two.png
View replaced file @
14e44b61
View file @
d0dab3f5
6.91 KB
|
W:
|
H:
3.27 KB
|
W:
|
H:
2-up
Swipe
Onion skin
app/src/main/res/mipmap-hdpi/right.png
0 → 100644
View file @
d0dab3f5
1.3 KB
app/src/main/res/values/colors.xml
View file @
d0dab3f5
...
...
@@ -51,7 +51,7 @@
<color
name=
"taobao_black"
>
#333333
</color>
<color
name=
"offline_down_size"
>
#777777
</color>
<color
name=
"gary"
>
#898989
</color>
<color
name=
"g
ary1"
>
#B1B1B1
</color>
<color
name=
"g
ray1"
>
#e6e6e6
</color>
<color
name=
"gray_lite"
>
#c5c5c5
</color>
<color
name=
"title"
>
#233142
</color>
<color
name=
"title1"
>
#223852
</color>
...
...
app/src/main/res/values/dimens.xml
View file @
d0dab3f5
...
...
@@ -31,6 +31,8 @@
<dimen
name=
"edit_border"
>
0.5dp
</dimen>
<!--一级标题-->
<dimen
name=
"text_primary_title"
>
28sp
</dimen>
<!--一级标题-->
<dimen
name=
"text_primary_title_smile"
>
25sp
</dimen>
<!--二级标题-->
<dimen
name=
"text_secondary_title"
>
20sp
</dimen>
<!--三级标题-->
...
...
app/src/main/res/values/strings.xml
View file @
d0dab3f5
...
...
@@ -413,15 +413,16 @@
<string
name=
"integral_exchange_title"
>
积分兑换规则
</string>
<!--优惠券-->
<string
name=
"return_ticket_title"
>
新增优惠券
</string>
<string
name=
"tv_rule"
>
全场满%s元可用
</string>
<string
name=
"tv_date"
>
有效期:%s
</string>
<string
name=
"tv_rule"
>
满%s可用
</string>
<string
name=
"tv_money"
>
%s 元优惠券
</string>
<string
name=
"tv_date"
>
有效期至: %s
</string>
<string
name=
"tv_ticket_count"
>
共 %s 种优惠券
</string>
<!--商品组合-->
<string
name=
"bale_select_title"
>
请选择商品
</string>
<string
name=
"bale_title"
>
新增优惠券
</string>
<string
name=
"tv_bale_count"
>
共 %s 个组合
</string>
<string
name=
"tv_bale_edit_count"
>
共 %s 件
</string>
<string
name=
"money"
>
¥ %s
</string>
<string
name=
"money"
>
¥ %s
</string>
<!--会员管理-->
<string
name=
"adv_plan"
>
晋级标准:消费金额满 %s
</string>
<string
name=
"level_Number"
>
共有 %s个会员等级
</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