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
aa4dfbdd
Commit
aa4dfbdd
authored
Feb 02, 2018
by
zhang_z
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
无码商品;
parent
e26eafe0
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
44 additions
and
3 deletions
+44
-3
app/src/main/java/com/xingdata/zzdpos/ui/payment/PaymentActivity.java
.../java/com/xingdata/zzdpos/ui/payment/PaymentActivity.java
+5
-0
app/src/main/java/com/xingdata/zzdpos/ui/payment/PaymentContract.java
.../java/com/xingdata/zzdpos/ui/payment/PaymentContract.java
+7
-0
app/src/main/java/com/xingdata/zzdpos/ui/payment/PaymentPresenter.java
...java/com/xingdata/zzdpos/ui/payment/PaymentPresenter.java
+1
-0
app/src/main/java/com/xingdata/zzdpos/ui/payment/fragment/PaymentFragment.java
.../xingdata/zzdpos/ui/payment/fragment/PaymentFragment.java
+9
-0
app/src/main/java/com/xingdata/zzdpos/ui/payment/view/CalculatorView.java
...a/com/xingdata/zzdpos/ui/payment/view/CalculatorView.java
+15
-0
app/src/main/res/layout/view_calculator.xml
app/src/main/res/layout/view_calculator.xml
+6
-1
app/src/main/res/values/strings.xml
app/src/main/res/values/strings.xml
+1
-2
No files found.
app/src/main/java/com/xingdata/zzdpos/ui/payment/PaymentActivity.java
View file @
aa4dfbdd
...
...
@@ -35,6 +35,11 @@ public class PaymentActivity extends BaseActivity<PaymentPresenter, ActivityPaym
ToastUtils
.
showShort
(
msg
);
}
@Override
public
void
setSettleMode
(
int
settleMode
)
{
mPaymentFragment
.
setSettleMode
(
settleMode
);
}
@Override
public
void
showSettle
(
Long
amt
)
{
Intent
intent
=
new
Intent
(
PaymentActivity
.
this
,
SettleActivity
.
class
);
...
...
app/src/main/java/com/xingdata/zzdpos/ui/payment/PaymentContract.java
View file @
aa4dfbdd
...
...
@@ -15,6 +15,13 @@ interface PaymentContract {
*/
void
showMsg
(
String
msg
);
/**
* 根据收款模式设置页面
*
* @param settleMode 收款模式
*/
void
setSettleMode
(
int
settleMode
);
/**
* 显示结算页面
*
...
...
app/src/main/java/com/xingdata/zzdpos/ui/payment/PaymentPresenter.java
View file @
aa4dfbdd
...
...
@@ -10,6 +10,7 @@ public class PaymentPresenter extends PaymentContract.Presenter {
@Override
public
void
onAttached
()
{
mSettleMode
=
getIntent
().
getIntExtra
(
C
.
SP_KEY
.
SETTLE_MODE
,
C
.
SETTLE_MODE
.
PAYMENT
);
mView
.
setSettleMode
(
mSettleMode
);
}
@Override
...
...
app/src/main/java/com/xingdata/zzdpos/ui/payment/fragment/PaymentFragment.java
View file @
aa4dfbdd
...
...
@@ -29,4 +29,13 @@ public class PaymentFragment extends BaseFragment<PaymentPresenter, FragmentPaym
if
(
result
>
0
)
mPresenter
.
clickSettle
(
result
);
});
}
/**
* 根据收款模式设置页面
*
* @param settleMode 收款模式
*/
public
void
setSettleMode
(
int
settleMode
)
{
mCalculatorView
.
setSettleMode
(
settleMode
);
}
}
app/src/main/java/com/xingdata/zzdpos/ui/payment/view/CalculatorView.java
View file @
aa4dfbdd
...
...
@@ -4,6 +4,7 @@ package com.xingdata.zzdpos.ui.payment.view;
import
android.view.View
;
import
android.widget.TextView
;
import
com.xingdata.zzdpos.C
;
import
com.xingdata.zzdpos.R
;
import
com.xingdata.zzdpos.base.BaseFragment
;
import
com.xingdata.zzdpos.base.BasePresenter
;
...
...
@@ -20,6 +21,8 @@ public class CalculatorView<P extends BasePresenter> extends BaseFragment<P, Vie
private
String
mValue
;
private
String
mLast
;
private
int
mSettleMode
;
private
OnResultChangeListener
mOnResultChangeListener
;
private
onSettleClickListener
mOnSettleClickListener
;
...
...
@@ -38,6 +41,10 @@ public class CalculatorView<P extends BasePresenter> extends BaseFragment<P, Vie
void
onSettleClick
(
Long
result
);
}
public
void
setSettleMode
(
int
settleMode
)
{
this
.
mSettleMode
=
settleMode
;
}
@Override
public
int
getLayoutId
()
{
return
R
.
layout
.
view_calculator
;
...
...
@@ -85,6 +92,14 @@ public class CalculatorView<P extends BasePresenter> extends BaseFragment<P, Vie
}
};
mViewBinding
.
setOnClick
(
mOnClickListener
);
switch
(
mSettleMode
)
{
case
C
.
SETTLE_MODE
.
PAYMENT
:
mViewBinding
.
setText
(
getString
(
R
.
string
.
inputer_settle
));
break
;
case
C
.
SETTLE_MODE
.
STORE
:
mViewBinding
.
setText
(
getString
(
R
.
string
.
inputer_confirm
));
break
;
}
}
/**
...
...
app/src/main/res/layout/view_calculator.xml
View file @
aa4dfbdd
...
...
@@ -6,6 +6,11 @@
<variable
name=
"onClick"
type=
"android.view.View.OnClickListener"
/>
<variable
name=
"text"
type=
"String"
/>
</data>
<android.support.constraint.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
...
...
@@ -277,7 +282,7 @@
android:foreground=
"?android:attr/selectableItemBackground"
android:gravity=
"center"
android:onClickListener=
"@{onClick}"
android:text=
"@
string/inputer_settle
"
android:text=
"@
{text}
"
android:textColor=
"@color/white_caocao"
android:textSize=
"@dimen/all_sub_title_size"
app:layout_constraintBottom_toBottomOf=
"@id/tv_0"
...
...
app/src/main/res/values/strings.xml
View file @
aa4dfbdd
...
...
@@ -539,6 +539,7 @@
<string
name=
"inputer_del"
>
退格
</string>
<string
name=
"inputer_clear"
>
清空
</string>
<string
name=
"inputer_settle"
>
收\n款
</string>
<string
name=
"inputer_confirm"
>
确\n认
</string>
<string
name=
"inputer_add"
>
+
</string>
<string
name=
"inputer_sub"
>
-
</string>
<string
name=
"inputer_mul"
>
×
</string>
...
...
@@ -741,6 +742,4 @@
<string
name=
"search_clear"
>
清空
</string>
</resources>
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