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
eccd9d5f
Commit
eccd9d5f
authored
Dec 27, 2017
by
zhang_z
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BaseSheetDialog修改;
parent
5fa32895
Changes
14
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
390 additions
and
231 deletions
+390
-231
app/src/main/java/com/xingdata/zzdpos/base/BaseDialog.java
app/src/main/java/com/xingdata/zzdpos/base/BaseDialog.java
+1
-0
app/src/main/java/com/xingdata/zzdpos/base/BaseSheetDialog.java
...c/main/java/com/xingdata/zzdpos/base/BaseSheetDialog.java
+7
-1
app/src/main/java/com/xingdata/zzdpos/ui/dialog/LoadingDialog.java
...ain/java/com/xingdata/zzdpos/ui/dialog/LoadingDialog.java
+3
-53
app/src/main/java/com/xingdata/zzdpos/ui/store/StoreActivity.java
...main/java/com/xingdata/zzdpos/ui/store/StoreActivity.java
+3
-0
app/src/main/java/com/xingdata/zzdpos/ui/store/StoreContract.java
...main/java/com/xingdata/zzdpos/ui/store/StoreContract.java
+2
-10
app/src/main/java/com/xingdata/zzdpos/ui/store/StorePresenter.java
...ain/java/com/xingdata/zzdpos/ui/store/StorePresenter.java
+1
-32
app/src/main/java/com/xingdata/zzdpos/ui/store/adapter/SaledetailAdapter.java
...m/xingdata/zzdpos/ui/store/adapter/SaledetailAdapter.java
+53
-1
app/src/main/java/com/xingdata/zzdpos/ui/store/adapter/SkuAdapter.java
...java/com/xingdata/zzdpos/ui/store/adapter/SkuAdapter.java
+19
-4
app/src/main/java/com/xingdata/zzdpos/ui/store/dialog/CartDialog.java
.../java/com/xingdata/zzdpos/ui/store/dialog/CartDialog.java
+45
-0
app/src/main/java/com/xingdata/zzdpos/ui/store/fragment/StoreFragment.java
.../com/xingdata/zzdpos/ui/store/fragment/StoreFragment.java
+1
-1
app/src/main/res/layout/dialog_store_cart.xml
app/src/main/res/layout/dialog_store_cart.xml
+158
-9
app/src/main/res/layout/item_store_saledatail.xml
app/src/main/res/layout/item_store_saledatail.xml
+0
-118
app/src/main/res/layout/item_store_saledetail.xml
app/src/main/res/layout/item_store_saledetail.xml
+94
-0
app/src/main/res/layout/item_store_sku.xml
app/src/main/res/layout/item_store_sku.xml
+3
-2
No files found.
app/src/main/java/com/xingdata/zzdpos/base/BaseDialog.java
View file @
eccd9d5f
...
...
@@ -14,6 +14,7 @@ import android.view.ViewGroup;
import
android.view.Window
;
import
android.view.WindowManager
;
import
com.blankj.utilcode.util.ActivityUtils
;
import
com.blankj.utilcode.util.KeyboardUtils
;
import
com.blankj.utilcode.util.LogUtils
;
import
com.blankj.utilcode.util.ScreenUtils
;
...
...
app/src/main/java/com/xingdata/zzdpos/base/BaseSheetDialog.java
View file @
eccd9d5f
...
...
@@ -17,6 +17,7 @@ import android.view.WindowManager;
public
abstract
class
BaseSheetDialog
<
P
extends
BasePresenter
,
B
extends
ViewDataBinding
>
extends
BaseDialog
<
P
,
B
>
{
public
BottomSheetBehavior
mBehavior
;
@NonNull
@Override
public
Dialog
onCreateDialog
(
Bundle
savedInstanceState
)
{
...
...
@@ -27,12 +28,17 @@ public abstract class BaseSheetDialog<P extends BasePresenter, B extends ViewDat
MyBottomSheetDialog
dialog
=
new
MyBottomSheetDialog
(
mContext
);
mViewBinding
=
DataBindingUtil
.
inflate
(
LayoutInflater
.
from
(
mContext
),
getLayoutId
(),
null
,
false
);
dialog
.
setContentView
(
mViewBinding
.
getRoot
());
if
(
isTransparentBackground
())
{
((
View
)
mViewBinding
.
getRoot
().
getParent
()).
setBackgroundColor
(
getResources
().
getColor
(
android
.
R
.
color
.
transparent
));
}
mBehavior
=
BottomSheetBehavior
.
from
((
View
)
mViewBinding
.
getRoot
().
getParent
());
this
.
initView
();
return
dialog
;
}
protected
boolean
isTransparentBackground
()
{
return
false
;
}
@Override
public
View
onCreateView
(
@NonNull
LayoutInflater
inflater
,
ViewGroup
container
,
Bundle
savedInstanceState
)
{
...
...
app/src/main/java/com/xingdata/zzdpos/ui/dialog/LoadingDialog.java
View file @
eccd9d5f
...
...
@@ -4,24 +4,14 @@ package com.xingdata.zzdpos.ui.dialog;
import
android.content.DialogInterface
;
import
android.os.Bundle
;
import
com.blankj.utilcode.util.LogUtils
;
import
java.util.concurrent.TimeUnit
;
import
io.reactivex.Observable
;
import
io.reactivex.Observer
;
import
io.reactivex.android.schedulers.AndroidSchedulers
;
import
io.reactivex.annotations.NonNull
;
import
io.reactivex.disposables.Disposable
;
import
io.reactivex.functions.Consumer
;
import
io.reactivex.functions.Function
;
import
com.xingdata.zzdpos.R
;
import
com.xingdata.zzdpos.base.BaseActivity
;
import
com.xingdata.zzdpos.base.BaseDialog
;
import
com.xingdata.zzdpos.base.BasePresenter
;
import
com.xingdata.zzdpos.databinding.DialogLoadingBinding
;
import
io.reactivex.disposables.Disposable
;
public
class
LoadingDialog
extends
BaseDialog
<
BasePresenter
,
DialogLoadingBinding
>
{
Disposable
disp
;
boolean
isClose
=
true
;
...
...
@@ -55,49 +45,9 @@ public class LoadingDialog extends BaseDialog<BasePresenter, DialogLoadingBindin
@Override
public
void
show
(
BaseActivity
activity
)
{
super
.
show
(
activity
);
if
(
isClose
)
{
int
recLen
=
20
;
Observable
.
interval
(
0
,
1
,
TimeUnit
.
SECONDS
).
take
(
recLen
+
1
).
map
(
new
Function
<
Long
,
Long
>
()
{
@Override
public
Long
apply
(
@NonNull
Long
aLong
)
throws
Exception
{
return
recLen
-
aLong
;
}
}).
observeOn
(
AndroidSchedulers
.
mainThread
()).
doOnSubscribe
(
new
Consumer
<
Disposable
>()
{
@Override
public
void
accept
(
Disposable
disposable
)
throws
Exception
{
disp
=
disposable
;
}
}).
subscribe
(
new
Observer
<
Long
>()
{
@Override
public
void
onSubscribe
(
@NonNull
Disposable
d
)
{
disp
=
d
;
}
@Override
public
void
onNext
(
@NonNull
Long
aLong
)
{
LogUtils
.
e
(
"对话框将在"
+
aLong
+
"S后关闭"
);
super
.
show
(
activity
,
20
);
}
@Override
public
void
onError
(
@NonNull
Throwable
e
)
{
}
@Override
public
void
onComplete
()
{
dismiss
();
if
(
null
!=
disp
)
{
disp
.
dispose
();
}
}
});
}
}
@Override
public
void
onDismiss
(
DialogInterface
dialog
)
{
super
.
onDismiss
(
dialog
);
...
...
app/src/main/java/com/xingdata/zzdpos/ui/store/StoreActivity.java
View file @
eccd9d5f
...
...
@@ -53,6 +53,7 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
});
}
@Override
public
<
Sku
extends
BaseSku
>
void
loadSkus
(
List
<
Sku
>
skus
,
boolean
isRefresh
)
{
mStoreFragment
.
loadSkus
(
skus
,
isRefresh
);
...
...
@@ -83,6 +84,8 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
mViewBinding
.
setCartCount
(
saleorder
.
getOrderCnt
());
mViewBinding
.
setOrderPayAmt
(
saleorder
.
getOrderPayAmt
());
mViewBinding
.
setMsDisAmt
(
saleorder
.
getMsDisAmt
());
if
(
mCartDialog
.
isShowing
)
mCartDialog
.
loadSaleorder
(
saleorder
);
}
@Override
...
...
app/src/main/java/com/xingdata/zzdpos/ui/store/StoreContract.java
View file @
eccd9d5f
...
...
@@ -148,18 +148,10 @@ interface StoreContract {
public
abstract
<
Sku
extends
BaseSku
>
void
clickRemoveSku
(
Sku
sku
);
/**
* 购物车页面 - 点击添加购物信息
*
* @param saledetail 购物信息
* 购物车页面 - 购物车发生变化
*/
public
abstract
void
c
lickAddSaledetail
(
Saledetail
saledetail
);
public
abstract
void
c
artChanged
(
);
/**
* 购物车页面 - 点击删除购物信息
*
* @param saledetail 购物信息
*/
public
abstract
void
clickRemoveSaledetail
(
Saledetail
saledetail
);
/**
* 购物车列表 - 关闭
...
...
app/src/main/java/com/xingdata/zzdpos/ui/store/StorePresenter.java
View file @
eccd9d5f
...
...
@@ -118,18 +118,7 @@ public class StorePresenter extends StoreContract.Presenter {
}
@Override
public
void
clickAddSaledetail
(
Saledetail
saledetail
)
{
//更新购物车信息
updateCart
(
saledetail
,
1
);
//设置订单信息
mSaleorder
.
setSaledetails
(
mSaledetails
);
//统计订单信息
this
.
reprice
();
}
@Override
public
void
clickRemoveSaledetail
(
Saledetail
saledetail
)
{
updateCart
(
saledetail
,
-
1
);
public
void
cartChanged
()
{
//设置订单信息
mSaleorder
.
setSaledetails
(
mSaledetails
);
//统计订单信息
...
...
@@ -217,26 +206,6 @@ public class StorePresenter extends StoreContract.Presenter {
}
}
/**
* 操作购物车商品
*
* @param saledetail 购物车信息
* @param value 变化的数值
*/
private
void
updateCart
(
Saledetail
saledetail
,
int
value
)
{
for
(
int
i
=
0
;
i
<
mSaledetails
.
size
();
i
++)
{
if
(
saledetail
.
getSkuId
().
longValue
()
==
mSaledetails
.
get
(
i
).
getSkuId
())
{
int
count
=
mSaledetails
.
get
(
i
).
getDetailCnt
()
+
value
;
if
(
count
>
0
)
{
mSaledetails
.
get
(
i
).
setCount
(
mSaledetails
.
get
(
i
).
getDetailCnt
()
+
value
);
}
else
{
mSaledetails
.
remove
(
i
);
}
return
;
}
}
}
/**
* 统计订单信息
*/
...
...
app/src/main/java/com/xingdata/zzdpos/ui/store/adapter/SaledetailAdapter.java
View file @
eccd9d5f
package
com
.
xingdata
.
zzdpos
.
ui
.
store
.
adapter
;
public
class
SaledetailAdapter
{
import
com.xingdata.zzdpos.R
;
import
com.xingdata.zzdpos.base.BaseAdapter
;
import
com.xingdata.zzdpos.base.BaseViewHolder
;
import
com.xingdata.zzdpos.databinding.ItemStoreSaledetailBinding
;
import
com.xingdata.zzdpos.model.Saledetail
;
import
com.xingdata.zzdpos.ui.store.dialog.CartDialog
;
import
com.xingdata.zzdpos.util.ConvertUtil
;
import
java.util.List
;
public
class
SaledetailAdapter
extends
BaseAdapter
<
Saledetail
,
ItemStoreSaledetailBinding
>
{
public
SaledetailAdapter
(
List
<
Saledetail
>
saledetails
)
{
super
(
R
.
layout
.
item_store_saledetail
,
saledetails
);
}
private
CartDialog
.
OnCountChangeListener
mOnCountChangeListener
;
public
void
setOnCountChangeListener
(
CartDialog
.
OnCountChangeListener
onCountChangeListener
)
{
this
.
mOnCountChangeListener
=
onCountChangeListener
;
}
@Override
protected
void
convert
(
ItemStoreSaledetailBinding
mViewBinding
,
Saledetail
item
)
{
mViewBinding
.
tvName
.
setText
(
item
.
getSpuName
());
mViewBinding
.
tvPrice
.
setText
(
ConvertUtil
.
fenToYuan
(
item
.
getSkuPricePay
(),
true
));
mViewBinding
.
ivIncrease
.
setOnClickListener
(
view
->
{
if
(
mViewBinding
.
getCount
()
>=
99
)
return
;
mViewBinding
.
setCount
(
mViewBinding
.
getCount
()
+
1
);
mViewBinding
.
ivIncrease
.
setImageResource
(
mViewBinding
.
getCount
()
>
0
?
R
.
mipmap
.
but_increase01
:
R
.
mipmap
.
but_increase02
);
if
(
mOnCountChangeListener
!=
null
)
{
mOnCountChangeListener
.
onCountChange
(
item
,
1
);
}
});
mViewBinding
.
ivReduce
.
setOnClickListener
(
view
->
{
mViewBinding
.
setCount
(
mViewBinding
.
getCount
()
-
1
);
mViewBinding
.
ivIncrease
.
setImageResource
(
mViewBinding
.
getCount
()
>
0
?
R
.
mipmap
.
but_increase01
:
R
.
mipmap
.
but_increase02
);
if
(
mOnCountChangeListener
!=
null
)
{
mOnCountChangeListener
.
onCountChange
(
item
,
-
1
);
}
});
mViewBinding
.
setCount
(
item
.
getDetailCnt
());
mViewBinding
.
ivIncrease
.
setImageResource
(
mViewBinding
.
getCount
()
>
0
?
R
.
mipmap
.
but_increase01
:
R
.
mipmap
.
but_increase02
);
}
@Override
protected
void
convert
(
BaseViewHolder
helper
,
Saledetail
item
)
{
super
.
convert
(
helper
,
item
);
}
}
app/src/main/java/com/xingdata/zzdpos/ui/store/adapter/SkuAdapter.java
View file @
eccd9d5f
package
com
.
xingdata
.
zzdpos
.
ui
.
store
.
adapter
;
import
android.support.annotation.Nullable
;
import
android.view.View
;
import
com.xingdata.zzdpos.R
;
import
com.xingdata.zzdpos.base.BaseAdapter
;
...
...
@@ -24,7 +25,6 @@ public class SkuAdapter<T extends BaseSku> extends BaseAdapter<T, ItemStoreSkuBi
private
StoreFragment
.
OnCountChangeListener
mOnCountChangeListener
;
public
void
setSaledetails
(
List
<
Saledetail
>
saledetails
)
{
this
.
mSaledetails
=
saledetails
;
}
...
...
@@ -39,22 +39,24 @@ public class SkuAdapter<T extends BaseSku> extends BaseAdapter<T, ItemStoreSkuBi
mViewBinding
.
tvName
.
setText
(
item
.
getSpuName
());
mViewBinding
.
tvAmt
.
setText
(
ConvertUtil
.
fenToYuan
(
item
.
getSkuRetailPrice1
()));
mViewBinding
.
ivIncrease
.
setOnClickListener
(
view
->
{
if
(
mViewBinding
.
getCount
()
>=
99
)
return
;
mViewBinding
.
setCount
(
mViewBinding
.
getCount
()
+
1
);
mViewBinding
.
ivIncrease
.
setImageResource
(
mViewBinding
.
getCount
()
>
0
?
R
.
mipmap
.
but_increase01
:
R
.
mipmap
.
but_increase02
);
setViewByCount
(
mViewBinding
);
if
(
mOnCountChangeListener
!=
null
)
{
mOnCountChangeListener
.
onCountChange
(
item
,
1
);
}
});
mViewBinding
.
ivReduce
.
setOnClickListener
(
view
->
{
mViewBinding
.
setCount
(
mViewBinding
.
getCount
()
-
1
);
mViewBinding
.
ivIncrease
.
setImageResource
(
mViewBinding
.
getCount
()
>
0
?
R
.
mipmap
.
but_increase01
:
R
.
mipmap
.
but_increase02
);
setViewByCount
(
mViewBinding
);
if
(
mOnCountChangeListener
!=
null
)
{
mOnCountChangeListener
.
onCountChange
(
item
,
-
1
);
}
});
mViewBinding
.
setCount
(
0
);
for
(
int
i
=
0
;
i
<
mSaledetails
.
size
();
i
++)
{
if
(
mSaledetails
.
get
(
i
).
getSkuId
().
longValue
()
==
item
.
getSkuId
())
{
...
...
@@ -62,7 +64,20 @@ public class SkuAdapter<T extends BaseSku> extends BaseAdapter<T, ItemStoreSkuBi
break
;
}
}
mViewBinding
.
ivIncrease
.
setImageResource
(
mViewBinding
.
getCount
()
>
0
?
R
.
mipmap
.
but_increase01
:
R
.
mipmap
.
but_increase02
);
setViewByCount
(
mViewBinding
);
}
private
void
setViewByCount
(
ItemStoreSkuBinding
mViewBinding
)
{
if
(
mViewBinding
.
getCount
()
>
0
)
{
mViewBinding
.
ivIncrease
.
setImageResource
(
R
.
mipmap
.
but_increase01
);
mViewBinding
.
ivReduce
.
setVisibility
(
View
.
VISIBLE
);
mViewBinding
.
tvCount
.
setVisibility
(
View
.
VISIBLE
);
}
else
{
mViewBinding
.
ivIncrease
.
setImageResource
(
R
.
mipmap
.
but_increase02
);
mViewBinding
.
ivReduce
.
setVisibility
(
View
.
GONE
);
mViewBinding
.
tvCount
.
setVisibility
(
View
.
GONE
);
}
}
@Override
...
...
app/src/main/java/com/xingdata/zzdpos/ui/store/dialog/CartDialog.java
View file @
eccd9d5f
package
com
.
xingdata
.
zzdpos
.
ui
.
store
.
dialog
;
import
android.content.DialogInterface
;
import
android.support.v7.widget.LinearLayoutManager
;
import
com.xingdata.zzdpos.R
;
import
com.xingdata.zzdpos.base.BaseSheetDialog
;
...
...
@@ -8,6 +9,7 @@ import com.xingdata.zzdpos.databinding.DialogStoreCartBinding;
import
com.xingdata.zzdpos.model.Saledetail
;
import
com.xingdata.zzdpos.model.Saleorder
;
import
com.xingdata.zzdpos.ui.store.StorePresenter
;
import
com.xingdata.zzdpos.ui.store.adapter.SaledetailAdapter
;
import
java.util.List
;
...
...
@@ -17,6 +19,15 @@ public class CartDialog extends BaseSheetDialog<StorePresenter, DialogStoreCartB
private
Saleorder
mSaleorder
;
private
List
<
Saledetail
>
mSaledetails
;
public
interface
OnCountChangeListener
{
void
onCountChange
(
Saledetail
saledetail
,
int
value
);
}
@Override
protected
boolean
isTransparentBackground
()
{
return
true
;
}
@Override
public
int
getLayoutId
()
{
return
R
.
layout
.
dialog_store_cart
;
...
...
@@ -24,8 +35,42 @@ public class CartDialog extends BaseSheetDialog<StorePresenter, DialogStoreCartB
@Override
public
void
initView
()
{
this
.
loadSaleorder
(
mSaleorder
);
// init C
SaledetailAdapter
mSaledetailAdapter
=
new
SaledetailAdapter
(
mSaledetails
);
mViewBinding
.
rlCart
.
setAdapter
(
mSaledetailAdapter
);
mViewBinding
.
rlCart
.
setLayoutManager
(
new
LinearLayoutManager
(
mContext
));
// set C listener
mSaledetailAdapter
.
setOnCountChangeListener
((
saledetail
,
value
)
->
{
for
(
int
i
=
0
;
i
<
mSaledetails
.
size
();
i
++)
{
if
(
mSaledetails
.
get
(
i
).
getSkuId
().
longValue
()
==
saledetail
.
getSkuId
())
{
int
count
=
mSaledetails
.
get
(
i
).
getDetailCnt
()
+
value
;
if
(
count
>
0
)
{
mSaledetails
.
get
(
i
).
setCount
(
mSaledetails
.
get
(
i
).
getDetailCnt
()
+
value
);
}
else
{
mSaledetailAdapter
.
remove
(
i
);
}
mPresenter
.
cartChanged
();
break
;
}
}
});
}
/**
* 加载订单信息
*
* @param saleorder 订单信息
*/
public
void
loadSaleorder
(
Saleorder
saleorder
)
{
mViewBinding
.
setCartCount
(
saleorder
.
getOrderCnt
());
mViewBinding
.
setOrderPayAmt
(
saleorder
.
getOrderPayAmt
());
mViewBinding
.
setMsDisAmt
(
saleorder
.
getMsDisAmt
());
if
(
saleorder
.
getOrderCnt
()
==
0
)
this
.
dismiss
();
}
public
CartDialog
setSaleorder
(
Saleorder
saleorder
)
{
...
...
app/src/main/java/com/xingdata/zzdpos/ui/store/fragment/StoreFragment.java
View file @
eccd9d5f
...
...
@@ -43,6 +43,7 @@ public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBin
mViewBinding
.
rlSkugrp
.
setAdapter
(
mSkugrpAdapter
);
mViewBinding
.
rlSkugrp
.
setLayoutManager
(
new
LinearLayoutManager
(
mContext
));
// set sku listener
mViewBinding
.
srlSku
.
setOnRefreshListener
(
this
::
refreshSku
);
mSkuAdapter
.
setOnLoadMoreListener
(
this
::
loadMoreSku
,
mViewBinding
.
rlSku
);
...
...
@@ -64,7 +65,6 @@ public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBin
mPresenter
.
initStore
();
}
/**
* 刷新商品
*/
...
...
app/src/main/res/layout/dialog_store_cart.xml
View file @
eccd9d5f
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
>
<LinearLayout
<data>
<import
type=
"android.view.View"
/>
<import
type=
"com.xingdata.zzdpos.util.ConvertUtil"
/>
<variable
name=
"cartCount"
type=
"int"
/>
<variable
name=
"orderPayAmt"
type=
"long"
/>
<variable
name=
"msDisAmt"
type=
"long"
/>
</data>
<android.support.constraint.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"
200dp
"
android:background=
"@color/
red_xishi
"
android:layout_height=
"
wrap_content
"
android:background=
"@color/
transparent
"
android:gravity=
"center"
android:orientation=
"vertical"
>
<LinearLayout
android:id=
"@+id/ll_title"
android:layout_width=
"0dp"
android:layout_height=
"?attr/actionBarSize"
android:background=
"@color/white_caocao"
android:gravity=
"center_vertical|end"
android:paddingEnd=
"@dimen/all_margin"
android:paddingStart=
"@dimen/all_margin"
app:layout_constraintBottom_toTopOf=
"@id/rl_cart"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
>
<TextView
android:id=
"@+id/tv_clear"
android:layout_width=
"wrap_content"
android:layout_height=
"50dp"
android:text=
"测试测试测试"
android:layout_height=
"wrap_content"
android:foreground=
"?android:attr/selectableItemBackground"
android:paddingBottom=
"@dimen/all_spacing"
android:paddingEnd=
"@dimen/all_margin_big"
android:paddingStart=
"@dimen/all_margin_big"
android:paddingTop=
"@dimen/all_spacing"
android:text=
"@string/store_btn_settle"
android:textColor=
"@color/white_caocao"
/>
</LinearLayout>
<View
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/all_line_width"
android:background=
"@color/gray_huanggai"
app:layout_constraintBottom_toTopOf=
"@id/rl_cart"
/>
<android.support.v7.widget.RecyclerView
android:id=
"@+id/rl_cart"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@color/white_caocao"
app:layout_constraintBottom_toTopOf=
"@id/ll_info"
/>
<View
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/all_line_width"
android:background=
"@color/gray_huanggai"
app:layout_constraintBottom_toTopOf=
"@id/ll_info"
/>
<LinearLayout
android:id=
"@+id/ll_info"
android:layout_width=
"0dp"
android:layout_height=
"?attr/actionBarSize"
android:background=
"@color/white_caocao"
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
android:paddingEnd=
"@dimen/all_margin"
android:paddingStart=
"@dimen/all_margin"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/store_pay_amt"
android:textColor=
"@color/black_baozheng"
android:textSize=
"@dimen/all_text_size"
/>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/all_spacing"
android:text=
"@string/money_rmb"
android:textColor=
"@color/red_guanyu"
android:textSize=
"@dimen/all_text_size"
/>
<TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:text=
"@{ConvertUtil.fenToYuan(orderPayAmt)}"
android:textColor=
"@color/red_guanyu"
android:textSize=
"@dimen/all_sub_title_size"
android:textStyle=
"bold"
/>
<TextView
android:id=
"@+id/tv_settle"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:background=
"@drawable/shape_red_round_rectangle_more_round"
android:foreground=
"?android:attr/actionBarItemBackground"
android:paddingBottom=
"@dimen/all_spacing"
android:paddingEnd=
"@dimen/all_margin_big"
android:paddingStart=
"@dimen/all_margin_big"
android:paddingTop=
"@dimen/all_spacing"
android:text=
"@string/store_btn_settle"
android:textColor=
"@color/white_caocao"
/>
</LinearLayout>
<FrameLayout
android:id=
"@+id/fl_logo"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginBottom=
"@dimen/all_margin"
android:layout_marginStart=
"@dimen/all_margin"
android:animateLayoutChanges=
"true"
app:layout_constraintBottom_toBottomOf=
"@id/ll_title"
app:layout_constraintLeft_toLeftOf=
"parent"
>
<ImageView
android:id=
"@+id/iv_cart"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/all_spacing"
android:contentDescription=
"@string/store_cart"
android:foreground=
"?attr/actionBarItemBackground"
android:src=
"@mipmap/shopping_cart"
/>
<TextView
android:layout_width=
"@dimen/store_cart_count"
android:layout_height=
"@dimen/store_cart_count"
android:layout_gravity=
"end"
android:background=
"@drawable/shape_white_oval"
android:gravity=
"center"
android:text=
'@{cartCount+""}'
android:textColor=
"@color/red_guanyu"
android:textSize=
"@{cartCount < 100?@dimen/all_caption_size:@dimen/all_tiny_size}"
android:textStyle=
"bold"
android:visibility=
"@{cartCount>0?View.VISIBLE:View.GONE}"
/>
</FrameLayout>
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/item_store_saledatail.xml
deleted
100644 → 0
View file @
5fa32895
<?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"
>
<data>
<import
type=
"android.view.View"
/>
<variable
name=
"count"
type=
"int"
/>
</data>
<android.support.constraint.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@color/white_caocao"
android:paddingEnd=
"@dimen/all_margin"
android:paddingStart=
"@dimen/all_margin"
android:paddingTop=
"@dimen/all_margin"
>
<com.facebook.drawee.view.SimpleDraweeView
android:id=
"@+id/iv_pic"
android:layout_width=
"80dp"
android:layout_height=
"80dp"
app:failureImage=
"@mipmap/icon_goods_default"
app:placeholderImage=
"@mipmap/icon_goods_default"
app:roundedCornerRadius=
"@dimen/all_shape_radius"
/>
<TextView
android:id=
"@+id/tv_name"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/all_margin"
android:lines=
"2"
android:textColor=
"@color/black_baozheng"
android:textSize=
"@dimen/all_text_size"
app:layout_constraintLeft_toRightOf=
"@id/iv_pic"
app:layout_constraintRight_toRightOf=
"parent"
/>
<LinearLayout
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/all_spacing"
app:layout_constraintBottom_toBottomOf=
"@id/ll_count"
app:layout_constraintLeft_toLeftOf=
"@id/tv_name"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/money_rmb"
android:textColor=
"@color/red_guanyu"
android:textSize=
"@dimen/all_caption_size"
android:textStyle=
"bold"
/>
<TextView
android:id=
"@+id/tv_amt"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:textColor=
"@color/red_guanyu"
android:textSize=
"@dimen/all_text_size"
android:textStyle=
"bold"
/>
</LinearLayout>
<LinearLayout
android:id=
"@+id/ll_count"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/all_spacing"
android:animateLayoutChanges=
"true"
android:gravity=
"center"
app:layout_constraintBottom_toBottomOf=
"@id/iv_pic"
app:layout_constraintRight_toRightOf=
"@id/tv_name"
>
<ImageView
android:id=
"@+id/iv_reduce"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:contentDescription=
"@string/store_reduce"
android:foreground=
"?android:attr/actionBarItemBackground"
android:src=
"@mipmap/but_reduce"
android:visibility=
"@{count>0?View.VISIBLE:View.INVISIBLE}"
/>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginEnd=
"@dimen/all_spacing"
android:layout_marginStart=
"@dimen/all_spacing"
android:text=
'@{count+""}'
android:textColor=
"@color/black_likui"
android:textSize=
"@dimen/all_sub_title_size"
android:visibility=
"@{count>0?View.VISIBLE:View.INVISIBLE}"
/>
<ImageView
android:id=
"@+id/iv_increase"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:contentDescription=
"@string/store_increase"
android:foreground=
"?android:attr/actionBarItemBackground"
android:src=
"@mipmap/but_increase02"
/>
</LinearLayout>
<View
android:layout_width=
"0dp"
android:layout_height=
"@dimen/all_line_width"
android:layout_marginTop=
"@dimen/all_margin"
android:background=
"@color/gray_kongming"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/iv_pic"
/>
</android.support.constraint.ConstraintLayout>
</layout>
app/src/main/res/layout/item_store_saledetail.xml
0 → 100644
View file @
eccd9d5f
<?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"
>
<data>
<import
type=
"android.view.View"
/>
<variable
name=
"count"
type=
"int"
/>
</data>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"?attr/actionBarSize"
android:background=
"@color/white_caocao"
android:gravity=
"center"
android:paddingEnd=
"@dimen/all_margin"
android:paddingStart=
"@dimen/all_margin"
>
<TextView
android:id=
"@+id/tv_name"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"2"
android:singleLine=
"true"
android:textColor=
"@color/black_baozheng"
android:textSize=
"@dimen/all_text_size"
/>
<TextView
android:id=
"@+id/tv_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:gravity=
"center"
android:textColor=
"@color/black_baozheng"
android:textSize=
"@dimen/all_text_size"
/>
<LinearLayout
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:gravity=
"end"
>
<ImageView
android:id=
"@+id/iv_reduce"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:contentDescription=
"@string/store_reduce"
android:foreground=
"?android:attr/actionBarItemBackground"
android:src=
"@mipmap/but_reduce"
android:visibility=
"@{count>0?View.VISIBLE:View.INVISIBLE}"
/>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginEnd=
"@dimen/all_spacing"
android:layout_marginStart=
"@dimen/all_spacing"
android:text=
'@{count+""}'
android:textColor=
"@color/black_likui"
android:textSize=
"@dimen/all_text_size"
android:visibility=
"@{count>0?View.VISIBLE:View.INVISIBLE}"
/>
<ImageView
android:id=
"@+id/iv_increase"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:contentDescription=
"@string/store_increase"
android:foreground=
"?android:attr/actionBarItemBackground"
android:src=
"@mipmap/but_increase02"
/>
</LinearLayout>
</LinearLayout>
<View
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/all_line_width"
android:layout_marginEnd=
"@dimen/all_margin"
android:layout_marginStart=
"@dimen/all_margin"
android:background=
"@color/gray_kongming"
/>
</LinearLayout>
</layout>
app/src/main/res/layout/item_store_sku.xml
View file @
eccd9d5f
...
...
@@ -80,9 +80,10 @@
android:contentDescription=
"@string/store_reduce"
android:foreground=
"?android:attr/actionBarItemBackground"
android:src=
"@mipmap/but_reduce"
android:visibility=
"
@{count>0?View.VISIBLE:View.INVISIBLE}
"
/>
android:visibility=
"
gone
"
/>
<TextView
android:id=
"@+id/tv_count"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginEnd=
"@dimen/all_spacing"
...
...
@@ -90,7 +91,7 @@
android:text=
'@{count+""}'
android:textColor=
"@color/black_likui"
android:textSize=
"@dimen/all_sub_title_size"
android:visibility=
"
@{count>0?View.VISIBLE:View.INVISIBLE}
"
/>
android:visibility=
"
gone
"
/>
<ImageView
android:id=
"@+id/iv_increase"
...
...
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