Skip to content
项目
Groups
代码片段
帮助
正在加载...
Sign in / Register
Toggle navigation
W
workoffice
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图表
统计图
Create a new issue
作业
提交
议题看板
Open sidebar
冷广德
workoffice
Commits
cab02543
提交
cab02543
authored
6月 21, 2020
作者:
lgd
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.添加通用购物车红点,除了废弃的内部交易
上级
35082b55
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
93 行增加
和
1 行删除
+93
-1
AddCrucibleProductActivity.java
...ice/ui/activity/bat/order/AddCrucibleProductActivity.java
+30
-0
StoreSaleProductActivity.java
...ffice/ui/activity/bat/store/StoreSaleProductActivity.java
+34
-1
DeviceBuyProductActivity.java
...office/ui/activity/bat/work/DeviceBuyProductActivity.java
+29
-0
没有找到文件。
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/AddCrucibleProductActivity.java
浏览文件 @
cab02543
...
...
@@ -21,6 +21,7 @@ import com.wd.workoffice.ui.activity.bat.store.StoreSaleCarActivity;
import
com.wd.workoffice.ui.adapter.StoreProductAdapter
;
import
com.wd.workoffice.util.WorkUtils
;
import
com.wd.workoffice.widget.AddAndReduceView
;
import
com.wd.workoffice.widget.BadgeCarProvider
;
import
org.greenrobot.eventbus.EventBus
;
import
org.greenrobot.eventbus.Subscribe
;
...
...
@@ -31,6 +32,7 @@ import java.util.List;
import
java.util.Map
;
import
androidx.appcompat.app.AlertDialog
;
import
androidx.core.view.MenuItemCompat
;
import
androidx.recyclerview.widget.LinearLayoutManager
;
import
androidx.recyclerview.widget.RecyclerView
;
import
butterknife.BindView
;
...
...
@@ -50,6 +52,7 @@ public class AddCrucibleProductActivity extends WorkToolBarActivity {
private
StoreProductAdapter
clientAdapter
;
private
List
<
ProductBean
.
RecordsBean
>
carList
=
new
ArrayList
<>();
private
String
code
;
private
BadgeCarProvider
mActionProvider
;
@Override
protected
void
initView
()
{
...
...
@@ -128,6 +131,7 @@ public class AddCrucibleProductActivity extends WorkToolBarActivity {
carList
.
add
(
chooseProduct
);
}
toast
(
"加入购物车成功"
);
changeCarBadge
();
}
@Override
...
...
@@ -181,6 +185,23 @@ public class AddCrucibleProductActivity extends WorkToolBarActivity {
@Override
public
boolean
onCreateOptionsMenu
(
Menu
menu
)
{
getMenuInflater
().
inflate
(
R
.
menu
.
menu_store_cart
,
menu
);
MenuItem
menuItem
=
menu
.
findItem
(
R
.
id
.
cart
);
mActionProvider
=
(
BadgeCarProvider
)
MenuItemCompat
.
getActionProvider
(
menuItem
);
mActionProvider
.
setOnClickListener
(
new
BadgeCarProvider
.
OnClickListener
()
{
@Override
public
void
onClick
()
{
if
(
carList
.
size
()
==
0
)
{
toast
(
"购物车没有产品"
);
return
;
}
startActivity
(
AddCrucibleCarActivity
.
class
,
"pro"
,
JSON
.
toJSONString
(
carList
),
"stockId"
,
getIntent
().
getStringExtra
(
"stockId"
),
"procedureOrderId"
,
getIntent
().
getStringExtra
(
"procedureOrderId"
),
"customerId"
,
getIntent
().
getStringExtra
(
"customerId"
),
"code"
,
getIntent
().
getStringExtra
(
"code"
));
}
});
return
super
.
onCreateOptionsMenu
(
menu
);
}
...
...
@@ -221,5 +242,14 @@ public class AddCrucibleProductActivity extends WorkToolBarActivity {
String
pro
=
event
.
getPro
();
carList
.
clear
();
carList
.
addAll
(
JSON
.
parseArray
(
pro
,
ProductBean
.
RecordsBean
.
class
));
changeCarBadge
();
}
private
void
changeCarBadge
()
{
if
(
carList
.
size
()
>
0
)
{
mActionProvider
.
setBadgeVisibility
(
View
.
VISIBLE
);
}
else
{
mActionProvider
.
setBadgeVisibility
(
View
.
GONE
);
}
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/store/StoreSaleProductActivity.java
浏览文件 @
cab02543
...
...
@@ -21,9 +21,11 @@ import com.wd.workoffice.bean.event.ModifyCarEvent;
import
com.wd.workoffice.bean.workEnum.PermissionType
;
import
com.wd.workoffice.retrofit.RtfUtils
;
import
com.wd.workoffice.retrofit.WorkObserver
;
import
com.wd.workoffice.ui.activity.bat.order.AddCrucibleCarActivity
;
import
com.wd.workoffice.ui.adapter.StoreProductAdapter
;
import
com.wd.workoffice.util.WorkUtils
;
import
com.wd.workoffice.widget.AddAndReduceView
;
import
com.wd.workoffice.widget.BadgeCarProvider
;
import
org.greenrobot.eventbus.EventBus
;
import
org.greenrobot.eventbus.Subscribe
;
...
...
@@ -34,6 +36,7 @@ import java.util.List;
import
java.util.Map
;
import
androidx.appcompat.app.AlertDialog
;
import
androidx.core.view.MenuItemCompat
;
import
androidx.recyclerview.widget.LinearLayoutManager
;
import
androidx.recyclerview.widget.RecyclerView
;
import
butterknife.BindView
;
...
...
@@ -78,6 +81,7 @@ public class StoreSaleProductActivity extends WorkToolBarActivity {
private
int
page
=
1
;
private
List
<
ProductBean
.
RecordsBean
>
carList
=
new
ArrayList
<>();
private
String
code
;
private
BadgeCarProvider
mActionProvider
;
@Override
protected
void
initView
()
{
...
...
@@ -182,6 +186,7 @@ public class StoreSaleProductActivity extends WorkToolBarActivity {
carList
.
add
(
chooseProduct
);
}
toast
(
"加入购物车成功"
);
changeCarBadge
();
}
@Override
...
...
@@ -271,6 +276,27 @@ public class StoreSaleProductActivity extends WorkToolBarActivity {
@Override
public
boolean
onCreateOptionsMenu
(
Menu
menu
)
{
getMenuInflater
().
inflate
(
R
.
menu
.
menu_store_cart
,
menu
);
MenuItem
menuItem
=
menu
.
findItem
(
R
.
id
.
cart
);
mActionProvider
=
(
BadgeCarProvider
)
MenuItemCompat
.
getActionProvider
(
menuItem
);
mActionProvider
.
setOnClickListener
(
new
BadgeCarProvider
.
OnClickListener
()
{
@Override
public
void
onClick
()
{
if
(
carList
.
size
()
==
0
)
{
toast
(
"购物车没有产品"
);
return
;
}
startActivity
(
StoreSaleCarActivity
.
class
,
"pro"
,
JSON
.
toJSONString
(
carList
),
"supplierId"
,
getIntent
().
getStringExtra
(
"supplierId"
),
"subProcess"
,
getIntent
().
getStringExtra
(
"subProcess"
),
"subProcessId"
,
getIntent
().
getStringExtra
(
"subProcessId"
),
"inStockId"
,
getIntent
().
getStringExtra
(
"inStockId"
),
"customerId"
,
getIntent
().
getStringExtra
(
"customerId"
),
"receiveDeptId"
,
getIntent
().
getStringExtra
(
"depId"
),
"code"
,
getIntent
().
getStringExtra
(
"code"
));
}
});
return
super
.
onCreateOptionsMenu
(
menu
);
}
...
...
@@ -330,6 +356,13 @@ public class StoreSaleProductActivity extends WorkToolBarActivity {
String
pro
=
event
.
getPro
();
carList
.
clear
();
carList
.
addAll
(
JSON
.
parseArray
(
pro
,
ProductBean
.
RecordsBean
.
class
));
changeCarBadge
();
}
private
void
changeCarBadge
()
{
if
(
carList
.
size
()
>
0
)
{
mActionProvider
.
setBadgeVisibility
(
View
.
VISIBLE
);
}
else
{
mActionProvider
.
setBadgeVisibility
(
View
.
GONE
);
}
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceBuyProductActivity.java
浏览文件 @
cab02543
...
...
@@ -20,9 +20,11 @@ import com.wd.workoffice.bean.event.CheckDeviceEvent;
import
com.wd.workoffice.bean.event.ModifyCarEvent
;
import
com.wd.workoffice.retrofit.RtfUtils
;
import
com.wd.workoffice.retrofit.WorkObserver
;
import
com.wd.workoffice.ui.activity.bat.order.AddCrucibleCarActivity
;
import
com.wd.workoffice.ui.adapter.DeviceProductAdapter
;
import
com.wd.workoffice.util.WorkUtils
;
import
com.wd.workoffice.widget.AddAndReduceView
;
import
com.wd.workoffice.widget.BadgeCarProvider
;
import
org.greenrobot.eventbus.EventBus
;
import
org.greenrobot.eventbus.Subscribe
;
...
...
@@ -33,6 +35,7 @@ import java.util.List;
import
java.util.Map
;
import
androidx.appcompat.app.AlertDialog
;
import
androidx.core.view.MenuItemCompat
;
import
androidx.recyclerview.widget.LinearLayoutManager
;
import
androidx.recyclerview.widget.RecyclerView
;
import
butterknife.BindView
;
...
...
@@ -54,6 +57,7 @@ public class DeviceBuyProductActivity extends WorkToolBarActivity {
private
DeviceProductAdapter
clientAdapter
;
private
int
page
=
1
;
private
List
<
DeviceBean
.
RecordsBean
>
carList
=
new
ArrayList
<>();
private
BadgeCarProvider
mActionProvider
;
@Override
protected
void
initView
()
{
...
...
@@ -122,6 +126,7 @@ public class DeviceBuyProductActivity extends WorkToolBarActivity {
carList
.
add
(
chooseProduct
);
}
toast
(
"加入购物车成功"
);
changeCarBadge
();
}
@Override
...
...
@@ -200,6 +205,21 @@ public class DeviceBuyProductActivity extends WorkToolBarActivity {
@Override
public
boolean
onCreateOptionsMenu
(
Menu
menu
)
{
getMenuInflater
().
inflate
(
R
.
menu
.
menu_store_cart
,
menu
);
MenuItem
menuItem
=
menu
.
findItem
(
R
.
id
.
cart
);
mActionProvider
=
(
BadgeCarProvider
)
MenuItemCompat
.
getActionProvider
(
menuItem
);
mActionProvider
.
setOnClickListener
(
new
BadgeCarProvider
.
OnClickListener
()
{
@Override
public
void
onClick
()
{
if
(
carList
.
size
()
==
0
)
{
toast
(
"购物车没有产品"
);
return
;
}
startActivity
(
DeviceBuyCarActivity
.
class
,
"pro"
,
JSON
.
toJSONString
(
carList
),
"depId"
,
getIntent
().
getStringExtra
(
"depId"
),
"depName"
,
getIntent
().
getStringExtra
(
"depName"
));
}
});
return
super
.
onCreateOptionsMenu
(
menu
);
}
...
...
@@ -238,10 +258,19 @@ public class DeviceBuyProductActivity extends WorkToolBarActivity {
String
pro
=
event
.
getPro
();
carList
.
clear
();
carList
.
addAll
(
JSON
.
parseArray
(
pro
,
DeviceBean
.
RecordsBean
.
class
));
changeCarBadge
();
}
@Subscribe
(
threadMode
=
ThreadMode
.
MAIN
)
public
void
onMessageEvent
(
AddDeviceEvent
event
)
{
finish
();
}
private
void
changeCarBadge
()
{
if
(
carList
.
size
()
>
0
)
{
mActionProvider
.
setBadgeVisibility
(
View
.
VISIBLE
);
}
else
{
mActionProvider
.
setBadgeVisibility
(
View
.
GONE
);
}
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论