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
110ea964
Commit
110ea964
authored
Nov 11, 2019
by
zhang_z
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改BUG;
parent
36b28d50
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
162 additions
and
153 deletions
+162
-153
.idea/dictionaries/Eurus.xml
.idea/dictionaries/Eurus.xml
+7
-0
app/release/TangKuPos-20191111A.apk
app/release/TangKuPos-20191111A.apk
+0
-0
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuPresenter.java
...a/com/xingdata/zzdpos/ui/manage/sssku/SsskuPresenter.java
+9
-8
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/SendTickerFragment.java
...data/zzdpos/ui/sendticke/fragment/SendTickerFragment.java
+11
-11
app/src/main/res/layout/fragment_replenishement_detail.xml
app/src/main/res/layout/fragment_replenishement_detail.xml
+121
-121
app/src/main/res/values-en/strings_chen.xml
app/src/main/res/values-en/strings_chen.xml
+2
-1
app/src/main/res/values-zh/strings_chen.xml
app/src/main/res/values-zh/strings_chen.xml
+11
-12
app/src/main/res/values/strings_chen.xml
app/src/main/res/values/strings_chen.xml
+1
-0
No files found.
.idea/dictionaries/Eurus.xml
0 → 100644
View file @
110ea964
<component
name=
"ProjectDictionaryState"
>
<dictionary
name=
"Eurus"
>
<words>
<w>
baseinfo
</w>
</words>
</dictionary>
</component>
\ No newline at end of file
app/release/
app-release
.apk
→
app/release/
TangKuPos-20191111A
.apk
View file @
110ea964
No preview for this file type
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuPresenter.java
View file @
110ea964
...
@@ -304,7 +304,8 @@ public class SsskuPresenter extends SsskuContract.Presenter {
...
@@ -304,7 +304,8 @@ public class SsskuPresenter extends SsskuContract.Presenter {
mView
.
showLoadingDialog
();
mView
.
showLoadingDialog
();
mCompositeDisposable
.
add
(
mCompositeDisposable
.
add
(
ApiFactory
.
Sssku
.
querySssku
(
mPageNum
,
""
,
mSkuGrpId
)
ApiFactory
.
Sssku
.
querySssku
(
mPageNum
,
""
,
mSkuGrpId
)
.
doOnSubscribe
(
subscription
->
mView
.
dismissLoadingDialog
())
.
doOnSubscribe
(
subscription
->
mView
.
showLoadingDialog
())
.
doFinally
(()
->
mView
.
dismissLoadingDialog
())
.
subscribe
(
ssskuPager
->
{
.
subscribe
(
ssskuPager
->
{
if
(
mPageNum
==
1
&&
mSkuGrpId
==
0L
)
if
(
mPageNum
==
1
&&
mSkuGrpId
==
0L
)
mView
.
loadSsskuCount
(
ssskuPager
.
getTotalRow
());
mView
.
loadSsskuCount
(
ssskuPager
.
getTotalRow
());
...
...
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/SendTickerFragment.java
View file @
110ea964
...
@@ -101,16 +101,16 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
...
@@ -101,16 +101,16 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
mLoadingDialog
);
mLoadingDialog
);
}
else
if
(
nowtype
==
1
)
{
}
else
if
(
nowtype
==
1
)
{
Long
tempLevelId
=
levelList
.
get
(
nowVipGroupId
).
getId
();
Long
tempLevelId
=
levelList
.
get
(
nowVipGroupId
).
getId
();
if
(
tempLevelId
==
SendTickerC
.
getVipType
().
get
(
0
).
getId
())
{
if
(
tempLevelId
==
SendTickerC
.
getVipType
(
mContext
).
get
(
0
).
getId
())
{
//选择全部会员
//选择全部会员
mPresenter
.
sendTickerBefor
(
null
,
null
,
null
,
tickerId
,
mPresenter
.
sendTickerBefor
(
null
,
null
,
null
,
tickerId
,
mLoadingDialog
);
mLoadingDialog
);
return
;
return
;
}
}
for
(
int
i
=
1
;
i
<
SendTickerC
.
getVipType
().
size
();
i
++)
{
for
(
int
i
=
1
;
i
<
SendTickerC
.
getVipType
(
mContext
).
size
();
i
++)
{
long
tempServerId
=
SendTickerC
.
getServerId
(
tempLevelId
);
long
tempServerId
=
SendTickerC
.
getServerId
(
tempLevelId
);
//选择 当月下月以及流失会员
//选择 当月下月以及流失会员
if
(
tempLevelId
==
SendTickerC
.
getVipType
().
get
(
i
).
getId
()
&&
if
(
tempLevelId
==
SendTickerC
.
getVipType
(
mContext
).
get
(
i
).
getId
()
&&
tempServerId
!=
-
1
)
{
tempServerId
!=
-
1
)
{
mPresenter
.
sendTickerBefor
(
tempServerId
+
""
,
null
,
mPresenter
.
sendTickerBefor
(
tempServerId
+
""
,
null
,
null
,
tickerId
,
null
,
tickerId
,
...
@@ -203,16 +203,16 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
...
@@ -203,16 +203,16 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
mLoadingDialog
);
mLoadingDialog
);
}
else
if
(
nowtype
==
1
)
{
}
else
if
(
nowtype
==
1
)
{
Long
tempLevelId
=
levelList
.
get
(
nowVipGroupId
).
getId
();
Long
tempLevelId
=
levelList
.
get
(
nowVipGroupId
).
getId
();
if
(
tempLevelId
==
SendTickerC
.
getVipType
().
get
(
0
).
getId
())
{
if
(
tempLevelId
==
SendTickerC
.
getVipType
(
mContext
).
get
(
0
).
getId
())
{
//选择全部会员
//选择全部会员
mPresenter
.
sendTicker
(
null
,
null
,
null
,
tickerId
,
mPresenter
.
sendTicker
(
null
,
null
,
null
,
tickerId
,
mLoadingDialog
);
mLoadingDialog
);
return
;
return
;
}
}
for
(
int
i
=
1
;
i
<
SendTickerC
.
getVipType
().
size
();
i
++)
{
for
(
int
i
=
1
;
i
<
SendTickerC
.
getVipType
(
mContext
).
size
();
i
++)
{
long
tempServerId
=
SendTickerC
.
getServerId
(
tempLevelId
);
long
tempServerId
=
SendTickerC
.
getServerId
(
tempLevelId
);
//选择 当月下月以及流失会员
//选择 当月下月以及流失会员
if
(
tempLevelId
==
SendTickerC
.
getVipType
().
get
(
i
).
getId
()
&&
if
(
tempLevelId
==
SendTickerC
.
getVipType
(
mContext
).
get
(
i
).
getId
()
&&
tempServerId
!=
-
1
)
{
tempServerId
!=
-
1
)
{
mPresenter
.
sendTicker
(
tempServerId
+
""
,
null
,
mPresenter
.
sendTicker
(
tempServerId
+
""
,
null
,
null
,
tickerId
,
null
,
tickerId
,
...
@@ -234,15 +234,15 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
...
@@ -234,15 +234,15 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
mViewBinding
.
llAll
.
setVisibility
(
View
.
VISIBLE
);
mViewBinding
.
llAll
.
setVisibility
(
View
.
VISIBLE
);
RealmResults
<
Level
>
levels
=
DBFactory
.
getRealm
().
where
(
Level
.
class
).
findAll
();
RealmResults
<
Level
>
levels
=
DBFactory
.
getRealm
().
where
(
Level
.
class
).
findAll
();
levelList
=
new
ArrayList
<>();
levelList
=
new
ArrayList
<>();
SendTickerC
.
getVipType
().
get
(
0
).
setSelect
(
true
);
SendTickerC
.
getVipType
(
mContext
).
get
(
0
).
setSelect
(
true
);
levelList
.
add
(
SendTickerC
.
getVipType
().
get
(
0
));
levelList
.
add
(
SendTickerC
.
getVipType
(
mContext
).
get
(
0
));
for
(
int
i
=
0
;
i
<
levels
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
levels
.
size
();
i
++)
{
levels
.
get
(
i
).
setSelect
(
false
);
levels
.
get
(
i
).
setSelect
(
false
);
levelList
.
add
(
levels
.
get
(
i
));
levelList
.
add
(
levels
.
get
(
i
));
}
}
for
(
int
i
=
1
;
i
<
SendTickerC
.
getVipType
().
size
();
i
++)
{
for
(
int
i
=
1
;
i
<
SendTickerC
.
getVipType
(
mContext
).
size
();
i
++)
{
SendTickerC
.
getVipType
().
get
(
i
).
setSelect
(
false
);
SendTickerC
.
getVipType
(
mContext
).
get
(
i
).
setSelect
(
false
);
levelList
.
add
(
SendTickerC
.
getVipType
().
get
(
i
));
levelList
.
add
(
SendTickerC
.
getVipType
(
mContext
).
get
(
i
));
}
}
mViewBinding
.
tvSelect
.
setText
(
levelList
.
get
(
nowVipGroupId
).
getVipLevelName
());
mViewBinding
.
tvSelect
.
setText
(
levelList
.
get
(
nowVipGroupId
).
getVipLevelName
());
mViewBinding
.
vipType
.
setAdapter
(
vipGroupAdapter
);
mViewBinding
.
vipType
.
setAdapter
(
vipGroupAdapter
);
...
...
app/src/main/res/layout/fragment_replenishement_detail.xml
View file @
110ea964
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:tools=
"http://schemas.android.com/tools"
<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"
xmlns:tools=
"http://schemas.android.com/tools"
>
<data>
<data>
...
@@ -60,8 +61,7 @@
...
@@ -60,8 +61,7 @@
type=
"String"
/>
type=
"String"
/>
</data>
</data>
<RelativeLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<RelativeLayout
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"@color/white_caocao"
android:background=
"@color/white_caocao"
...
@@ -107,9 +107,9 @@
...
@@ -107,9 +107,9 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginEnd=
"@dimen/all_bounced_padding"
android:layout_marginEnd=
"@dimen/all_bounced_padding"
android:paddingBottom=
"@dimen/all_padding"
android:paddingStart=
"@dimen/all_bounced_padding"
android:paddingStart=
"@dimen/all_bounced_padding"
android:paddingTop=
"@dimen/all_padding"
android:paddingTop=
"@dimen/all_padding"
android:paddingBottom=
"@dimen/all_padding"
android:text=
"供货方"
android:text=
"供货方"
android:textColor=
"@color/black"
android:textColor=
"@color/black"
android:textSize=
"@dimen/all_text_size_low"
android:textSize=
"@dimen/all_text_size_low"
...
@@ -147,8 +147,8 @@
...
@@ -147,8 +147,8 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
android:orientation=
"vertical"
android:paddingEnd=
"@dimen/all_bounced_padding"
android:paddingStart=
"@dimen/all_bounced_padding"
android:paddingStart=
"@dimen/all_bounced_padding"
android:paddingEnd=
"@dimen/all_bounced_padding"
android:visibility=
"gone"
android:visibility=
"gone"
app:layout_constraintTop_toTopOf=
"@id/view_line_left_1"
>
app:layout_constraintTop_toTopOf=
"@id/view_line_left_1"
>
...
@@ -168,9 +168,9 @@
...
@@ -168,9 +168,9 @@
<TextView
<TextView
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:paddingBottom=
"@dimen/dp_4"
android:paddingLeft=
"@dimen/all_padding"
android:paddingLeft=
"@dimen/all_padding"
android:paddingTop=
"@dimen/dp_4"
android:paddingTop=
"@dimen/dp_4"
android:paddingBottom=
"@dimen/dp_4"
android:text=
"@{supplierName}"
android:text=
"@{supplierName}"
android:textColor=
"@color/black"
android:textColor=
"@color/black"
android:textSize=
"@dimen/all_text_size_low"
/>
android:textSize=
"@dimen/all_text_size_low"
/>
...
@@ -193,9 +193,9 @@
...
@@ -193,9 +193,9 @@
<TextView
<TextView
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:paddingBottom=
"@dimen/dp_4"
android:paddingLeft=
"@dimen/all_padding"
android:paddingLeft=
"@dimen/all_padding"
android:paddingTop=
"@dimen/dp_4"
android:paddingTop=
"@dimen/dp_4"
android:paddingBottom=
"@dimen/dp_4"
android:text=
"@{supplierAddress}"
android:text=
"@{supplierAddress}"
android:textColor=
"@color/black"
android:textColor=
"@color/black"
android:textSize=
"@dimen/all_text_size_low"
/>
android:textSize=
"@dimen/all_text_size_low"
/>
...
@@ -218,9 +218,9 @@
...
@@ -218,9 +218,9 @@
<TextView
<TextView
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:paddingBottom=
"@dimen/dp_4"
android:paddingLeft=
"@dimen/all_padding"
android:paddingLeft=
"@dimen/all_padding"
android:paddingTop=
"@dimen/dp_4"
android:paddingTop=
"@dimen/dp_4"
android:paddingBottom=
"@dimen/dp_4"
android:text=
"@{supplierTel}"
android:text=
"@{supplierTel}"
android:textColor=
"@color/black"
android:textColor=
"@color/black"
android:textSize=
"@dimen/all_text_size_low"
/>
android:textSize=
"@dimen/all_text_size_low"
/>
...
@@ -234,9 +234,9 @@
...
@@ -234,9 +234,9 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginEnd=
"@dimen/all_bounced_padding"
android:layout_marginEnd=
"@dimen/all_bounced_padding"
android:paddingBottom=
"@dimen/all_padding"
android:paddingStart=
"@dimen/all_bounced_padding"
android:paddingStart=
"@dimen/all_bounced_padding"
android:paddingTop=
"@dimen/all_padding"
android:paddingTop=
"@dimen/all_padding"
android:paddingBottom=
"@dimen/all_padding"
android:text=
"定货方"
android:text=
"定货方"
android:textColor=
"@color/black"
android:textColor=
"@color/black"
android:textSize=
"@dimen/all_text_size_low"
android:textSize=
"@dimen/all_text_size_low"
...
@@ -269,8 +269,8 @@
...
@@ -269,8 +269,8 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
android:orientation=
"vertical"
android:paddingEnd=
"@dimen/all_bounced_padding"
android:paddingStart=
"@dimen/all_bounced_padding"
android:paddingStart=
"@dimen/all_bounced_padding"
android:paddingEnd=
"@dimen/all_bounced_padding"
android:visibility=
"gone"
android:visibility=
"gone"
app:layout_constraintTop_toBottomOf=
"@id/tv_shop_title"
>
app:layout_constraintTop_toBottomOf=
"@id/tv_shop_title"
>
...
@@ -292,9 +292,9 @@
...
@@ -292,9 +292,9 @@
<TextView
<TextView
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:paddingBottom=
"@dimen/dp_4"
android:paddingLeft=
"@dimen/all_padding"
android:paddingLeft=
"@dimen/all_padding"
android:paddingTop=
"@dimen/dp_4"
android:paddingTop=
"@dimen/dp_4"
android:paddingBottom=
"@dimen/dp_4"
android:text=
"@{shopName}"
android:text=
"@{shopName}"
android:textColor=
"@color/black"
android:textColor=
"@color/black"
android:textSize=
"@dimen/all_text_size_low"
/>
android:textSize=
"@dimen/all_text_size_low"
/>
...
@@ -319,9 +319,9 @@
...
@@ -319,9 +319,9 @@
<TextView
<TextView
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:paddingBottom=
"@dimen/dp_4"
android:paddingLeft=
"@dimen/all_padding"
android:paddingLeft=
"@dimen/all_padding"
android:paddingTop=
"@dimen/dp_4"
android:paddingTop=
"@dimen/dp_4"
android:paddingBottom=
"@dimen/dp_4"
android:text=
"@{shopAddress}"
android:text=
"@{shopAddress}"
android:textColor=
"@color/black"
android:textColor=
"@color/black"
android:textSize=
"@dimen/all_text_size_low"
/>
android:textSize=
"@dimen/all_text_size_low"
/>
...
@@ -346,9 +346,9 @@
...
@@ -346,9 +346,9 @@
<TextView
<TextView
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:paddingBottom=
"@dimen/dp_4"
android:paddingLeft=
"@dimen/all_padding"
android:paddingLeft=
"@dimen/all_padding"
android:paddingTop=
"@dimen/dp_4"
android:paddingTop=
"@dimen/dp_4"
android:paddingBottom=
"@dimen/dp_4"
android:text=
"@{shopTel}"
android:text=
"@{shopTel}"
android:textColor=
"@color/black"
android:textColor=
"@color/black"
android:textSize=
"@dimen/all_text_size_low"
/>
android:textSize=
"@dimen/all_text_size_low"
/>
...
@@ -370,8 +370,8 @@
...
@@ -370,8 +370,8 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:gravity=
"center_vertical"
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
android:orientation=
"horizontal"
android:paddingEnd=
"@dimen/all_bounced_padding"
android:paddingStart=
"@dimen/all_bounced_padding"
android:paddingStart=
"@dimen/all_bounced_padding"
android:paddingEnd=
"@dimen/all_bounced_padding"
android:visibility=
"@{isShowSupplier? View.VISIBLE: View.GONE}"
android:visibility=
"@{isShowSupplier? View.VISIBLE: View.GONE}"
app:layout_constraintEnd_toEndOf=
"@id/ll_shop"
app:layout_constraintEnd_toEndOf=
"@id/ll_shop"
app:layout_constraintStart_toStartOf=
"@id/ll_shop"
app:layout_constraintStart_toStartOf=
"@id/ll_shop"
...
@@ -385,9 +385,9 @@
...
@@ -385,9 +385,9 @@
<TextView
<TextView
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:paddingBottom=
"@dimen/dp_4"
android:paddingLeft=
"@dimen/all_padding"
android:paddingLeft=
"@dimen/all_padding"
android:paddingTop=
"@dimen/dp_4"
android:paddingTop=
"@dimen/dp_4"
android:paddingBottom=
"@dimen/dp_4"
android:text=
"@{date}"
android:text=
"@{date}"
android:textColor=
"@color/black"
android:textColor=
"@color/black"
android:textSize=
"@dimen/all_text_size_low"
/>
android:textSize=
"@dimen/all_text_size_low"
/>
...
@@ -399,8 +399,8 @@
...
@@ -399,8 +399,8 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:gravity=
"center_vertical"
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
android:orientation=
"horizontal"
android:paddingEnd=
"@dimen/all_bounced_padding"
android:paddingStart=
"@dimen/all_bounced_padding"
android:paddingStart=
"@dimen/all_bounced_padding"
android:paddingEnd=
"@dimen/all_bounced_padding"
android:visibility=
"@{isShowSupplier? View.VISIBLE: View.GONE}"
android:visibility=
"@{isShowSupplier? View.VISIBLE: View.GONE}"
app:layout_constraintEnd_toEndOf=
"@id/ll_shop"
app:layout_constraintEnd_toEndOf=
"@id/ll_shop"
app:layout_constraintStart_toStartOf=
"@id/ll_shop"
app:layout_constraintStart_toStartOf=
"@id/ll_shop"
...
@@ -414,9 +414,9 @@
...
@@ -414,9 +414,9 @@
<TextView
<TextView
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:paddingBottom=
"@dimen/dp_4"
android:paddingLeft=
"@dimen/all_padding"
android:paddingLeft=
"@dimen/all_padding"
android:paddingTop=
"@dimen/dp_4"
android:paddingTop=
"@dimen/dp_4"
android:paddingBottom=
"@dimen/dp_4"
android:text=
"@{no}"
android:text=
"@{no}"
android:textColor=
"@color/black"
android:textColor=
"@color/black"
android:textSize=
"@dimen/all_text_size_low"
/>
android:textSize=
"@dimen/all_text_size_low"
/>
...
@@ -457,10 +457,10 @@
...
@@ -457,10 +457,10 @@
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:gravity=
"center"
android:paddingBottom=
"@dimen/dp_4"
android:paddingLeft=
"@dimen/all_padding"
android:paddingLeft=
"@dimen/all_padding"
android:paddingRight=
"@dimen/all_padding"
android:paddingTop=
"@dimen/all_padding"
android:paddingTop=
"@dimen/all_padding"
android:paddingRight=
"@dimen/all_padding"
android:paddingBottom=
"@dimen/dp_4"
android:text=
"@{finallyPrice}"
android:text=
"@{finallyPrice}"
android:textColor=
"@color/reddeep"
android:textColor=
"@color/reddeep"
android:textSize=
"@dimen/big_big_text_size"
/>
android:textSize=
"@dimen/big_big_text_size"
/>
...
@@ -550,10 +550,10 @@
...
@@ -550,10 +550,10 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"30dp"
android:layout_height=
"30dp"
android:layout_alignParentTop=
"true"
android:layout_alignParentTop=
"true"
android:layout_marginBottom=
"@dimen/padding_small"
android:layout_marginEnd=
"@dimen/all_bounced_padding"
android:layout_marginStart=
"@dimen/all_bounced_padding"
android:layout_marginStart=
"@dimen/all_bounced_padding"
android:layout_marginTop=
"@dimen/padding_small"
android:layout_marginTop=
"@dimen/padding_small"
android:layout_marginEnd=
"@dimen/all_bounced_padding"
android:layout_marginBottom=
"@dimen/padding_small"
android:drawablePadding=
"@dimen/all_padding"
android:drawablePadding=
"@dimen/all_padding"
android:hint=
"@string/statistics_order_edit_hint"
android:hint=
"@string/statistics_order_edit_hint"
android:inputType=
"number"
android:inputType=
"number"
...
@@ -572,8 +572,8 @@
...
@@ -572,8 +572,8 @@
android:id=
"@+id/ll_bottom"
android:id=
"@+id/ll_bottom"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/layout_statistics_bottom_height"
android:layout_height=
"@dimen/layout_statistics_bottom_height"
android:layout_alignParentBottom=
"true"
android:layout_alignParentStart=
"true"
android:layout_alignParentStart=
"true"
android:layout_alignParentBottom=
"true"
android:background=
"@color/white_caocao"
android:background=
"@color/white_caocao"
app:layout_constraintBottom_toBottomOf=
"parent"
>
app:layout_constraintBottom_toBottomOf=
"parent"
>
...
@@ -582,7 +582,7 @@
...
@@ -582,7 +582,7 @@
style=
"@style/button_passive"
style=
"@style/button_passive"
android:layout_width=
"@dimen/button1_width"
android:layout_width=
"@dimen/button1_width"
android:layout_height=
"@dimen/button1_height"
android:layout_height=
"@dimen/button1_height"
android:text=
"
取消
"
android:text=
"
@string/all_cancel
"
android:textSize=
"@dimen/all_text_size"
android:textSize=
"@dimen/all_text_size"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
...
@@ -594,7 +594,7 @@
...
@@ -594,7 +594,7 @@
style=
"@style/button_positive"
style=
"@style/button_positive"
android:layout_width=
"@dimen/button1_width"
android:layout_width=
"@dimen/button1_width"
android:layout_height=
"@dimen/button1_height"
android:layout_height=
"@dimen/button1_height"
android:text=
"
定货提交
"
android:text=
"
@string/settle_complete
"
android:textSize=
"@dimen/all_text_size"
android:textSize=
"@dimen/all_text_size"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintLeft_toRightOf=
"@id/btn_cancel"
app:layout_constraintLeft_toRightOf=
"@id/btn_cancel"
...
...
app/src/main/res/values-en/strings_chen.xml
View file @
110ea964
...
@@ -26,6 +26,7 @@
...
@@ -26,6 +26,7 @@
<string
name=
"replenishment_hint_supplierName"
>
Please enter the supplier name
</string>
<string
name=
"replenishment_hint_supplierName"
>
Please enter the supplier name
</string>
<string
name=
"replenishment_tv_replenishmentDetail"
>
Order details
</string>
<string
name=
"replenishment_tv_replenishmentDetail"
>
Order details
</string>
<string
name=
"replenishment_toast_noNeedDo"
>
Stock is normal
</string>
<string
name=
"replenishment_toast_noNeedDo"
>
Stock is normal
</string>
<string
name=
"replenishment_tv_amt"
>
Amount
</string>
<!--盘点界面-->
<!--盘点界面-->
...
@@ -68,7 +69,7 @@
...
@@ -68,7 +69,7 @@
<string
name=
"ticket_tv_sendSuc"
>
Successful issue
</string>
<string
name=
"ticket_tv_sendSuc"
>
Successful issue
</string>
<string
name=
"ticket_default_allVip"
>
All vip
</string>
<string
name=
"ticket_default_allVip"
>
All vip
</string>
<string
name=
"ticket_default_monthBirthday"
>
Birthday of this month
</string>
<string
name=
"ticket_default_monthBirthday"
>
Birthday of this month
</string>
<string
name=
"ticket_default_nextMonthBirthday"
>
Next month's birthday
</string>
<string
name=
"ticket_default_nextMonthBirthday"
>
Next month
\
's birthday
</string>
<string
name=
"ticket_default_lostVip"
>
Lost Vip
</string>
<string
name=
"ticket_default_lostVip"
>
Lost Vip
</string>
...
...
app/src/main/res/values-zh/strings_chen.xml
View file @
110ea964
...
@@ -26,6 +26,7 @@
...
@@ -26,6 +26,7 @@
<string
name=
"replenishment_hint_supplierName"
>
请输入供货商名称
</string>
<string
name=
"replenishment_hint_supplierName"
>
请输入供货商名称
</string>
<string
name=
"replenishment_tv_replenishmentDetail"
>
定货详情
</string>
<string
name=
"replenishment_tv_replenishmentDetail"
>
定货详情
</string>
<string
name=
"replenishment_toast_noNeedDo"
>
库存正常,无需补货
</string>
<string
name=
"replenishment_toast_noNeedDo"
>
库存正常,无需补货
</string>
<string
name=
"replenishment_tv_amt"
>
金额
</string>
<!--盘点界面-->
<!--盘点界面-->
...
@@ -72,6 +73,4 @@
...
@@ -72,6 +73,4 @@
<string
name=
"ticket_default_lostVip"
>
流失会员
</string>
<string
name=
"ticket_default_lostVip"
>
流失会员
</string>
</resources>
</resources>
app/src/main/res/values/strings_chen.xml
View file @
110ea964
...
@@ -26,6 +26,7 @@
...
@@ -26,6 +26,7 @@
<string
name=
"replenishment_hint_supplierName"
>
请输入供货商名称
</string>
<string
name=
"replenishment_hint_supplierName"
>
请输入供货商名称
</string>
<string
name=
"replenishment_tv_replenishmentDetail"
>
定货详情
</string>
<string
name=
"replenishment_tv_replenishmentDetail"
>
定货详情
</string>
<string
name=
"replenishment_toast_noNeedDo"
>
库存正常,无需补货
</string>
<string
name=
"replenishment_toast_noNeedDo"
>
库存正常,无需补货
</string>
<string
name=
"replenishment_tv_amt"
>
金额
</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