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
d7095f41
提交
d7095f41
authored
3月 21, 2020
作者:
lgd
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.历史价格,产品详情页,
2.//TODO erp用户激活,忘记密码测试,产品详情数据调整,搜索具体调试,产品下单,产品两个弹窗详情,bat,mes,消息,我的,刷新token
上级
9ede3504
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
13 个修改的文件
包含
671 行增加
和
18 行删除
+671
-18
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+16
-0
ProDetail.java
app/src/main/java/com/wd/workoffice/bean/ProDetail.java
+0
-0
ProPriceBean.java
app/src/main/java/com/wd/workoffice/bean/ProPriceBean.java
+212
-0
ProductBean.java
app/src/main/java/com/wd/workoffice/bean/ProductBean.java
+6
-6
ApiService.java
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
+37
-6
WorkProDetailActivity.java
...orkoffice/ui/activity/bat/work/WorkProDetailActivity.java
+154
-0
WorkProPriceActivity.java
...workoffice/ui/activity/bat/work/WorkProPriceActivity.java
+138
-0
WorkProPriceAdapter.java
...ava/com/wd/workoffice/ui/adapter/WorkProPriceAdapter.java
+31
-0
WorkProFragment.java
...rc/main/java/com/wd/workoffice/ui/fg/WorkProFragment.java
+11
-1
activity_pro_price.xml
app/src/main/res/layout/activity_pro_price.xml
+14
-0
activity_work_pro_details.xml
app/src/main/res/layout/activity_work_pro_details.xml
+0
-2
fg_order.xml
app/src/main/res/layout/fg_order.xml
+4
-3
item_pro_price.xml
app/src/main/res/layout/item_pro_price.xml
+48
-0
没有找到文件。
app/src/main/AndroidManifest.xml
浏览文件 @
d7095f41
...
...
@@ -281,6 +281,22 @@
android:screenOrientation=
"portrait"
android:theme=
"@style/Work.Base"
android:windowSoftInputMode=
"adjustPan"
/>
<activity
android:name=
".ui.activity.bat.work.WorkProDetailActivity"
android:configChanges=
"keyboardHidden|orientation"
android:label=
"产品详情"
android:launchMode=
"singleTop"
android:screenOrientation=
"portrait"
android:theme=
"@style/Work.Base"
android:windowSoftInputMode=
"adjustPan"
/>
<activity
android:name=
".ui.activity.bat.work.WorkProPriceActivity"
android:configChanges=
"keyboardHidden|orientation"
android:label=
"产品价格"
android:launchMode=
"singleTop"
android:screenOrientation=
"portrait"
android:theme=
"@style/Work.Base"
android:windowSoftInputMode=
"adjustPan"
/>
<provider
android:name=
"androidx.core.content.FileProvider"
android:authorities=
"com.wd.workoffice.fileprovider"
...
...
app/src/main/java/com/wd/workoffice/bean/ProDetail.java
0 → 100644
浏览文件 @
d7095f41
差异被折叠。
点击展开。
app/src/main/java/com/wd/workoffice/bean/ProPriceBean.java
0 → 100644
浏览文件 @
d7095f41
package
com
.
wd
.
workoffice
.
bean
;
import
java.util.List
;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public
class
ProPriceBean
{
/**
* records : [{"createdBy":680,"createdByName":"吴同得","createdTime":"2020-03-13 15:56:02","updatedBy":null,"updatedByName":null,"updatedTime":null,"id":14,"productId":40,"productName":"产品test","originalPrice":null,"newPrice":1,"remark":"His"},{"createdBy":680,"createdByName":"吴同得","createdTime":"2020-03-13 15:57:54","updatedBy":null,"updatedByName":null,"updatedTime":null,"id":15,"productId":40,"productName":"产品test","originalPrice":1,"newPrice":12,"remark":"His"},{"createdBy":680,"createdByName":"吴同得","createdTime":"2020-03-20 21:09:11","updatedBy":null,"updatedByName":null,"updatedTime":null,"id":16,"productId":40,"productName":"产品test","originalPrice":12,"newPrice":50,"remark":"50"}]
* total : 3
* size : 10
* current : 1
* orders : []
* searchCount : true
* pages : 1
*/
private
int
total
;
private
int
size
;
private
int
current
;
private
boolean
searchCount
;
private
int
pages
;
private
List
<
RecordsBean
>
records
;
private
List
<?>
orders
;
public
int
getTotal
()
{
return
total
;
}
public
void
setTotal
(
int
total
)
{
this
.
total
=
total
;
}
public
int
getSize
()
{
return
size
;
}
public
void
setSize
(
int
size
)
{
this
.
size
=
size
;
}
public
int
getCurrent
()
{
return
current
;
}
public
void
setCurrent
(
int
current
)
{
this
.
current
=
current
;
}
public
boolean
isSearchCount
()
{
return
searchCount
;
}
public
void
setSearchCount
(
boolean
searchCount
)
{
this
.
searchCount
=
searchCount
;
}
public
int
getPages
()
{
return
pages
;
}
public
void
setPages
(
int
pages
)
{
this
.
pages
=
pages
;
}
public
List
<
RecordsBean
>
getRecords
()
{
return
records
;
}
public
void
setRecords
(
List
<
RecordsBean
>
records
)
{
this
.
records
=
records
;
}
public
List
<?>
getOrders
()
{
return
orders
;
}
public
void
setOrders
(
List
<?>
orders
)
{
this
.
orders
=
orders
;
}
public
static
class
RecordsBean
{
/**
* createdBy : 680
* createdByName : 吴同得
* createdTime : 2020-03-13 15:56:02
* updatedBy : null
* updatedByName : null
* updatedTime : null
* id : 14
* productId : 40
* productName : 产品test
* originalPrice : null
* newPrice : 1.0
* remark : His
*/
private
int
createdBy
;
private
String
createdByName
;
private
String
createdTime
;
private
Object
updatedBy
;
private
Object
updatedByName
;
private
Object
updatedTime
;
private
int
id
;
private
int
productId
;
private
String
productName
;
private
Object
originalPrice
;
private
double
newPrice
;
private
String
remark
;
public
int
getCreatedBy
()
{
return
createdBy
;
}
public
void
setCreatedBy
(
int
createdBy
)
{
this
.
createdBy
=
createdBy
;
}
public
String
getCreatedByName
()
{
return
createdByName
;
}
public
void
setCreatedByName
(
String
createdByName
)
{
this
.
createdByName
=
createdByName
;
}
public
String
getCreatedTime
()
{
return
createdTime
;
}
public
void
setCreatedTime
(
String
createdTime
)
{
this
.
createdTime
=
createdTime
;
}
public
Object
getUpdatedBy
()
{
return
updatedBy
;
}
public
void
setUpdatedBy
(
Object
updatedBy
)
{
this
.
updatedBy
=
updatedBy
;
}
public
Object
getUpdatedByName
()
{
return
updatedByName
;
}
public
void
setUpdatedByName
(
Object
updatedByName
)
{
this
.
updatedByName
=
updatedByName
;
}
public
Object
getUpdatedTime
()
{
return
updatedTime
;
}
public
void
setUpdatedTime
(
Object
updatedTime
)
{
this
.
updatedTime
=
updatedTime
;
}
public
int
getId
()
{
return
id
;
}
public
void
setId
(
int
id
)
{
this
.
id
=
id
;
}
public
int
getProductId
()
{
return
productId
;
}
public
void
setProductId
(
int
productId
)
{
this
.
productId
=
productId
;
}
public
String
getProductName
()
{
return
productName
;
}
public
void
setProductName
(
String
productName
)
{
this
.
productName
=
productName
;
}
public
Object
getOriginalPrice
()
{
return
originalPrice
;
}
public
void
setOriginalPrice
(
Object
originalPrice
)
{
this
.
originalPrice
=
originalPrice
;
}
public
double
getNewPrice
()
{
return
newPrice
;
}
public
void
setNewPrice
(
double
newPrice
)
{
this
.
newPrice
=
newPrice
;
}
public
String
getRemark
()
{
return
remark
;
}
public
void
setRemark
(
String
remark
)
{
this
.
remark
=
remark
;
}
}
}
app/src/main/java/com/wd/workoffice/bean/ProductBean.java
浏览文件 @
d7095f41
...
...
@@ -158,12 +158,12 @@ public class ProductBean {
private
Object
expectOutputDeptName
;
private
Object
isExpectOut
;
private
Object
ofKindName
;
private
Object
statusName
;
private
String
statusName
;
private
Object
relList
;
private
Object
outDeptCreatedBy
;
private
Object
outDeptCreatedTime
;
private
Object
transitPartId
;
private
Object
transitPartTypeCode
;
private
String
transitPartTypeCode
;
private
Object
remark
;
private
String
carPrice
;
private
int
carNum
;
...
...
@@ -424,11 +424,11 @@ public class ProductBean {
this
.
ofKindName
=
ofKindName
;
}
public
Object
getStatusName
()
{
public
String
getStatusName
()
{
return
statusName
;
}
public
void
setStatusName
(
Object
statusName
)
{
public
void
setStatusName
(
String
statusName
)
{
this
.
statusName
=
statusName
;
}
...
...
@@ -464,11 +464,11 @@ public class ProductBean {
this
.
transitPartId
=
transitPartId
;
}
public
Object
getTransitPartTypeCode
()
{
public
String
getTransitPartTypeCode
()
{
return
transitPartTypeCode
;
}
public
void
setTransitPartTypeCode
(
Object
transitPartTypeCode
)
{
public
void
setTransitPartTypeCode
(
String
transitPartTypeCode
)
{
this
.
transitPartTypeCode
=
transitPartTypeCode
;
}
...
...
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
浏览文件 @
d7095f41
...
...
@@ -3,6 +3,7 @@ package com.wd.workoffice.retrofit;
import
com.wd.workoffice.app.BaseBean
;
import
com.wd.workoffice.app.Config
;
import
com.wd.workoffice.bean.ProDetail
;
import
org.json.JSONObject
;
...
...
@@ -334,15 +335,45 @@ public interface ApiService {
/**
* 产品列表
* <p>
* processType
* ofKind 产品种类SM:自制成品OS:外购贴牌RM:原料
* statu 冻结标记0冻结1正常
* isExpectOut 是否上架true:上架false:未上架
* searchValue 模糊搜索(图号、名称)
*
* @param processType
* @param ofKind 产品种类SM:自制成品OS:外购贴牌RM:原料
* @param statu 冻结标记0冻结1正常
* @param isExpectOut 是否上架true:上架false:未上架
* @param searchValue 模糊搜索(图号、名称)
* @return
*/
@GET
(
"product/app/page/list"
)
@GET
(
"
/
product/app/page/list"
)
Observable
<
BaseBean
>
getPro
(
@QueryMap
Map
<
String
,
Object
>
param
);
/**
* 产品详情
* transitPartRelList 往来单位关联
* partTypeCode: SUPPLIER-供应商 CUSTOMER-客户 TRANSPORTERS-运输商
* name:往来单位名称
* address:往来单位地址
* accountName:负责人
* deptName:负责部门
* outDeptRelList 上架情况
* createdTime:上架时间
* deptName:上架部门
* outByUserName:上架操作人
*
* @return
*/
@GET
(
"/product/app/detail/{productId}"
)
Observable
<
ProDetail
>
getProDetail
(
@Path
(
"productId"
)
Integer
id
);
/**
* 产品详情
* productId
* current
* size
*
* @return
*/
@GET
(
"/product-price-change/page/list"
)
Observable
<
BaseBean
>
getProHistoryPrice
(
@QueryMap
Map
<
String
,
Object
>
param
);
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkProDetailActivity.java
0 → 100644
浏览文件 @
d7095f41
package
com
.
wd
.
workoffice
.
ui
.
activity
.
bat
.
work
;
import
android.text.TextUtils
;
import
android.widget.Button
;
import
android.widget.TextView
;
import
com.alibaba.fastjson.JSON
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.app.BaseBean
;
import
com.wd.workoffice.app.WorkToolBarActivity
;
import
com.wd.workoffice.bean.ClientBean
;
import
com.wd.workoffice.bean.ProDetail
;
import
com.wd.workoffice.bean.ProductBean
;
import
com.wd.workoffice.retrofit.RtfUtils
;
import
com.wd.workoffice.retrofit.WorkObserver
;
import
java.util.List
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
import
butterknife.OnClick
;
import
flexible.xd.android_base.network.rtfhttp.Transformer
;
import
io.reactivex.disposables.Disposable
;
/**
* 工作台 - 产品 - 详情
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public
class
WorkProDetailActivity
extends
WorkToolBarActivity
{
@BindView
(
R
.
id
.
tv_card
)
TextView
tvCard
;
@BindView
(
R
.
id
.
tv_img_card
)
TextView
tvImgCard
;
@BindView
(
R
.
id
.
tv_name
)
TextView
tvName
;
@BindView
(
R
.
id
.
tv_spec
)
TextView
tvSpec
;
@BindView
(
R
.
id
.
tv_clazz
)
TextView
tvClazz
;
@BindView
(
R
.
id
.
tv_kind
)
TextView
tvKind
;
@BindView
(
R
.
id
.
tv_unit
)
TextView
tvUnit
;
@BindView
(
R
.
id
.
tv_weight
)
TextView
tvWeight
;
@BindView
(
R
.
id
.
btn_price
)
Button
btnPrice
;
@BindView
(
R
.
id
.
tv_price
)
TextView
tvPrice
;
@BindView
(
R
.
id
.
tv_status
)
TextView
tvStatus
;
@BindView
(
R
.
id
.
tv_process
)
TextView
tvProcess
;
@BindView
(
R
.
id
.
tv_dep
)
TextView
tvDep
;
@BindView
(
R
.
id
.
tv_dep_name
)
TextView
tvDepName
;
@BindView
(
R
.
id
.
tv_dep_type
)
TextView
tvDepType
;
@BindView
(
R
.
id
.
tv_dep_address
)
TextView
tvDepAddress
;
@BindView
(
R
.
id
.
tv_dep_price
)
TextView
tvDepPrice
;
@BindView
(
R
.
id
.
tv_dep_person
)
TextView
tvDepPerson
;
@BindView
(
R
.
id
.
tv_dep_person_phone
)
TextView
tvDepPersonPhone
;
@BindView
(
R
.
id
.
tv_dep_person_dep
)
TextView
tvDepPersonDep
;
private
ProductBean
.
RecordsBean
proBean
;
@Override
protected
void
initView
()
{
ButterKnife
.
bind
(
this
);
}
@Override
protected
void
initData
()
{
String
pro
=
getIntent
().
getStringExtra
(
"pro"
);
if
(!
TextUtils
.
isEmpty
(
pro
))
{
proBean
=
JSON
.
parseObject
(
pro
,
ProductBean
.
RecordsBean
.
class
);
getData
(
proBean
.
getId
());
tvCard
.
setText
(
proBean
.
getSoleCode
());
// tvImgCard.setText(proBean.get());
tvName
.
setText
(
proBean
.
getName
());
tvSpec
.
setText
(
proBean
.
getSpec
());
tvClazz
.
setText
(
proBean
.
getProcessType
());
tvKind
.
setText
(
proBean
.
getTransitPartTypeCode
());
tvUnit
.
setText
(
proBean
.
getUnit
());
tvWeight
.
setText
(
String
.
valueOf
(
proBean
.
getWeight
()));
tvPrice
.
setText
(
String
.
valueOf
(
proBean
.
getInternalPrice
()));
tvStatus
.
setText
(
proBean
.
getStatusName
());
}
}
private
void
getData
(
Integer
id
)
{
RtfUtils
.
getRtf
().
getProDetail
(
id
).
compose
(
Transformer
.
schedule
()).
subscribe
(
new
WorkObserver
<
ProDetail
>()
{
@Override
public
void
doOnSubscribe
(
Disposable
d
)
{
}
@Override
public
void
onFail
(
String
errorMsg
)
{
hideLoading
();
toast
(
errorMsg
);
}
@Override
public
void
onSuccess
(
ProDetail
data
)
{
hideLoading
();
if
(
data
.
getCode
()
!=
0
)
{
toast
(
data
.
getMessage
());
return
;
}
// ProDetail.DataBean.ProductInfoBean productInfo = data.getData().getProductInfo();
// tvDep.setText(productInfo.getdep());
// tvDepName.setText(productInfo.getName());
// tvDepType.setText("类别:"+productInfo.getTransitPartTypeCode());
// tvDepType.setText("地址:"+productInfo.get;
// tvDepType.setText(""+productInfo.getName());
// tvDepName.setText(productInfo.getName());
// transitPartRelList 往来单位关联
// * partTypeCode: SUPPLIER-供应商 CUSTOMER-客户 TRANSPORTERS-运输商
// * name:往来单位名称
// * address:往来单位地址
// * accountName:负责人
// * deptName:负责部门
// * outDeptRelList 上架情况
// * createdTime:上架时间
// * deptName:上架部门
// * outByUserName:上架操作人
}
});
}
@Override
protected
void
initEvent
()
{
}
@Override
protected
int
layoutId
()
{
return
R
.
layout
.
activity_work_pro_details
;
}
@OnClick
(
R
.
id
.
btn_price
)
public
void
onViewClicked
()
{
startActivity
(
WorkProPriceActivity
.
class
,
"id"
,
proBean
.
getId
()+
""
);
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkProPriceActivity.java
0 → 100644
浏览文件 @
d7095f41
package
com
.
wd
.
workoffice
.
ui
.
activity
.
bat
.
work
;
import
com.alibaba.fastjson.JSON
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.scwang.smartrefresh.layout.SmartRefreshLayout
;
import
com.scwang.smartrefresh.layout.api.RefreshLayout
;
import
com.scwang.smartrefresh.layout.listener.OnRefreshListener
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.app.BaseBean
;
import
com.wd.workoffice.app.WorkToolBarActivity
;
import
com.wd.workoffice.bean.ClientBean
;
import
com.wd.workoffice.bean.ProPriceBean
;
import
com.wd.workoffice.bean.SaleOrderBean
;
import
com.wd.workoffice.presenter.SaleSalePresenter
;
import
com.wd.workoffice.retrofit.RtfUtils
;
import
com.wd.workoffice.retrofit.WorkObserver
;
import
com.wd.workoffice.ui.adapter.SaleInsideAdapter
;
import
com.wd.workoffice.ui.adapter.WorkProPriceAdapter
;
import
com.wd.workoffice.util.WorkUtils
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Map
;
import
androidx.annotation.NonNull
;
import
androidx.recyclerview.widget.LinearLayoutManager
;
import
androidx.recyclerview.widget.RecyclerView
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
import
flexible.xd.android_base.network.rtfhttp.Transformer
;
import
io.reactivex.disposables.Disposable
;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public
class
WorkProPriceActivity
extends
WorkToolBarActivity
{
@BindView
(
R
.
id
.
rv_data
)
RecyclerView
rvData
;
@BindView
(
R
.
id
.
srl_refresh
)
SmartRefreshLayout
srlRefresh
;
private
String
state
;
private
SaleSalePresenter
saleSalePresenter
;
private
Map
<
String
,
Object
>
param
;
private
List
<
ProPriceBean
.
RecordsBean
>
dataList
;
private
WorkProPriceAdapter
dataAdapter
;
private
int
page
=
1
;
@Override
protected
void
initView
()
{
ButterKnife
.
bind
(
this
);
// saleSalePresenter = new SaleSalePresenter();
// saleSalePresenter.onAttach(this);
rvData
.
setLayoutManager
(
new
LinearLayoutManager
(
this
,
RecyclerView
.
VERTICAL
,
false
));
}
@Override
protected
void
initData
()
{
dataList
=
new
ArrayList
<>();
dataAdapter
=
new
WorkProPriceAdapter
(
R
.
layout
.
item_pro_price
,
dataList
);
dataAdapter
.
bindToRecyclerView
(
rvData
);
param
=
WorkUtils
.
pageKey
();
param
.
put
(
"productId"
,
getIntent
().
getStringExtra
(
"id"
));
param
.
put
(
"current"
,
page
);
getData
();
}
private
void
getData
()
{
RtfUtils
.
getRtf
().
getProHistoryPrice
(
param
).
compose
(
Transformer
.
schedule
()).
subscribe
(
new
WorkObserver
<
BaseBean
>()
{
@Override
public
void
doOnSubscribe
(
Disposable
d
)
{
}
@Override
public
void
onFail
(
String
errorMsg
)
{
hideLoading
();
toast
(
errorMsg
);
}
@Override
public
void
onSuccess
(
BaseBean
data
)
{
hideLoading
();
if
(
data
.
getCode
()
!=
0
)
{
toast
(
data
.
getMessage
());
return
;
}
List
<
ProPriceBean
.
RecordsBean
>
getList
=
JSON
.
parseObject
(
data
.
getData
().
toString
(),
ProPriceBean
.
class
).
getRecords
();
if
(
page
==
1
)
{
srlRefresh
.
finishRefresh
();
dataList
.
clear
();
dataList
.
addAll
(
getList
);
dataAdapter
.
notifyDataSetChanged
();
dataAdapter
.
loadMoreComplete
();
}
else
{
dataAdapter
.
loadMoreComplete
();
dataList
.
addAll
(
getList
);
dataAdapter
.
notifyDataSetChanged
();
}
if
(
getList
.
size
()
==
0
)
{
dataAdapter
.
loadMoreEnd
();
}
else
{
page
++;
}
}
});
}
@Override
protected
void
initEvent
()
{
srlRefresh
.
setOnRefreshListener
(
new
OnRefreshListener
()
{
@Override
public
void
onRefresh
(
@NonNull
RefreshLayout
refreshLayout
)
{
page
=
1
;
param
.
put
(
"current"
,
page
);
getData
();
}
});
dataAdapter
.
setOnLoadMoreListener
(
new
BaseQuickAdapter
.
RequestLoadMoreListener
()
{
@Override
public
void
onLoadMoreRequested
()
{
param
.
put
(
"current"
,
page
);
getData
();
}
},
rvData
);
}
@Override
protected
int
layoutId
()
{
return
R
.
layout
.
activity_pro_price
;
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/WorkProPriceAdapter.java
0 → 100644
浏览文件 @
d7095f41
package
com
.
wd
.
workoffice
.
ui
.
adapter
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.chad.library.adapter.base.BaseViewHolder
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.bean.ProPriceBean
;
import
com.wd.workoffice.bean.SaleOrderBean
;
import
java.util.List
;
/**
* Created by flexible on 2018/8/13.
*/
public
class
WorkProPriceAdapter
extends
BaseQuickAdapter
<
ProPriceBean
.
RecordsBean
,
BaseViewHolder
>
{
public
WorkProPriceAdapter
(
int
layoutResId
,
List
data
)
{
super
(
layoutResId
,
data
);
}
@Override
protected
void
convert
(
BaseViewHolder
helper
,
ProPriceBean
.
RecordsBean
item
)
{
helper
.
setText
(
R
.
id
.
tv_price
,
String
.
valueOf
(
item
.
getNewPrice
()));
helper
.
setText
(
R
.
id
.
tv_time
,
item
.
getCreatedTime
());
helper
.
setText
(
R
.
id
.
tv_person
,
"提交人:"
.
concat
(
item
.
getCreatedByName
()));
helper
.
setText
(
R
.
id
.
tv_remark
,
"备注:"
.
concat
(
item
.
getRemark
()));
}
}
app/src/main/java/com/wd/workoffice/ui/fg/WorkProFragment.java
浏览文件 @
d7095f41
...
...
@@ -2,7 +2,10 @@ package com.wd.workoffice.ui.fg;
import
android.os.Bundle
;
import
android.text.TextUtils
;
import
android.view.View
;
import
com.alibaba.fastjson.JSON
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.scwang.smartrefresh.layout.SmartRefreshLayout
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.app.WorkBaseFg
;
...
...
@@ -11,6 +14,7 @@ import com.wd.workoffice.bean.StockBean;
import
com.wd.workoffice.bean.listener.ProFilterClickListener
;
import
com.wd.workoffice.contract.WorkProContract
;
import
com.wd.workoffice.presenter.WorkProPresenter
;
import
com.wd.workoffice.ui.activity.bat.work.WorkProDetailActivity
;
import
com.wd.workoffice.ui.adapter.WorkProductAdapter
;
import
com.wd.workoffice.util.ProFilterData
;
import
com.wd.workoffice.util.WorkUtils
;
...
...
@@ -104,7 +108,7 @@ public class WorkProFragment extends WorkBaseFg implements WorkProContract.View
dataList
=
new
ArrayList
<>();
workProductAdapter
=
new
WorkProductAdapter
(
R
.
layout
.
item_work_product
,
dataList
);
workProductAdapter
.
bindToRecyclerView
(
rvData
);
workProductAdapter
.
setEmptyView
(
R
.
layout
.
view_empty_content
,
rvData
);
workProductAdapter
.
setEmptyView
(
R
.
layout
.
view_empty_content
,
rvData
);
workProPresenter
.
getPro
(
param
);
}
...
...
@@ -128,6 +132,12 @@ public class WorkProFragment extends WorkBaseFg implements WorkProContract.View
param
.
put
(
"current"
,
page
);
workProPresenter
.
getPro
(
param
);
},
rvData
);
workProductAdapter
.
setOnItemClickListener
(
new
BaseQuickAdapter
.
OnItemClickListener
()
{
@Override
public
void
onItemClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
startActivity
(
WorkProDetailActivity
.
class
,
"pro"
,
JSON
.
toJSONString
(
dataList
.
get
(
position
)));
}
});
}
@Override
...
...
app/src/main/res/layout/activity_pro_price.xml
0 → 100644
浏览文件 @
d7095f41
<?xml version="1.0" encoding="utf-8"?>
<com.scwang.smartrefresh.layout.SmartRefreshLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:id=
"@+id/srl_refresh"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"vertical"
>
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_data"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
/>
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
\ No newline at end of file
app/src/main/res/layout/activity_work_pro_details.xml
浏览文件 @
d7095f41
...
...
@@ -339,7 +339,6 @@
android:layout_marginLeft=
"20mm"
android:layout_marginTop=
"10mm"
android:layout_marginBottom=
"10mm"
android:text=
"上架信息"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"16sp"
/>
...
...
@@ -360,7 +359,6 @@
android:layout_marginLeft=
"20mm"
android:layout_marginTop=
"10mm"
android:layout_marginBottom=
"10mm"
android:text=
"上架信息"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"16sp"
/>
</LinearLayout>
...
...
app/src/main/res/layout/fg_order.xml
浏览文件 @
d7095f41
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<com.scwang.smartrefresh.layout.SmartRefreshLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:id=
"@+id/srl_refresh"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"vertical"
>
...
...
@@ -9,4 +10,4 @@
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
/>
</LinearLayout>
\ No newline at end of file
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
\ No newline at end of file
app/src/main/res/layout/item_pro_price.xml
0 → 100644
浏览文件 @
d7095f41
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"10mm"
android:background=
"@color/white"
android:orientation=
"vertical"
android:padding=
"10mm"
>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
>
<TextView
android:id=
"@+id/tv_price"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"zzzz"
/>
<TextView
android:id=
"@+id/tv_time"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:text=
"zzzz"
android:textColor=
"@color/flexible_text_sup"
/>
</RelativeLayout>
<TextView
android:id=
"@+id/tv_remark"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginTop=
"5mm"
android:text=
"zzzz"
android:textColor=
"@color/flexible_text_sup"
/>
<TextView
android:id=
"@+id/tv_person"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_gravity=
"right"
android:text=
"zzzz"
android:textColor=
"@color/flexible_text_sup"
/>
</LinearLayout>
\ No newline at end of file
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论