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
749d5efb
提交
749d5efb
authored
5月 09, 2020
作者:
lgd
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.mes列表页整改,新增登录跳转逻辑
2.//TODO ,质检接口数据无对应问题,内部交易订单审核,审核规则,领用申请列表/退件列表/参数,坩埚下单,mes其他页面,mes质量反馈,编辑任务担当无法修改.支数参数
上级
256172eb
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
21 个修改的文件
包含
446 行增加
和
170 行删除
+446
-170
WorkApp.java
app/src/main/java/com/wd/workoffice/app/WorkApp.java
+51
-4
FeedbackBean.java
...ain/java/com/wd/workoffice/bean/mesBean/FeedbackBean.java
+0
-0
MesLoginActivity.java
...a/com/wd/workoffice/ui/activity/mes/MesLoginActivity.java
+3
-0
MesQualityActivity.java
...orkoffice/ui/activity/mes/quality/MesQualityActivity.java
+1
-1
MesSearchActivity.java
.../workoffice/ui/activity/mes/search/MesSearchActivity.java
+5
-2
MesSearchConditionActivity.java
...ce/ui/activity/mes/search/MesSearchConditionActivity.java
+2
-0
MesTicketListActivity.java
...koffice/ui/activity/mes/ticket/MesTicketListActivity.java
+11
-7
MesTicketListTakeOnActivity.java
...e/ui/activity/mes/ticket/MesTicketListTakeOnActivity.java
+1
-1
MesUserDataListActivity.java
...koffice/ui/activity/mes/user/MesUserDataListActivity.java
+6
-2
MesUserDataListCheckActivity.java
...ce/ui/activity/mes/user/MesUserDataListCheckActivity.java
+1
-1
UserSettingActivity.java
...m/wd/workoffice/ui/activity/user/UserSettingActivity.java
+32
-27
MesQualityAdapter.java
.../java/com/wd/workoffice/ui/adapter/MesQualityAdapter.java
+13
-1
MesTicketAdapter.java
...n/java/com/wd/workoffice/ui/adapter/MesTicketAdapter.java
+1
-1
UserKeeper.java
app/src/main/java/com/wd/workoffice/util/UserKeeper.java
+31
-0
activity_mes_quality.xml
app/src/main/res/layout/activity_mes_quality.xml
+130
-55
activity_mes_ticket_list.xml
app/src/main/res/layout/activity_mes_ticket_list.xml
+3
-4
activity_mes_user_data_list.xml
app/src/main/res/layout/activity_mes_user_data_list.xml
+7
-6
item_mes_quality.xml
app/src/main/res/layout/item_mes_quality.xml
+124
-44
item_mes_ticket.xml
app/src/main/res/layout/item_mes_ticket.xml
+5
-6
item_mes_user_data.xml
app/src/main/res/layout/item_mes_user_data.xml
+10
-8
menu_mes_search.xml
app/src/main/res/menu/menu_mes_search.xml
+9
-0
没有找到文件。
app/src/main/java/com/wd/workoffice/app/WorkApp.java
浏览文件 @
749d5efb
package
com
.
wd
.
workoffice
.
app
;
package
com
.
wd
.
workoffice
.
app
;
import
android.app.Application
;
import
android.app.Application
;
import
android.content.Context
;
import
android.content.SharedPreferences
;
import
android.text.TextUtils
;
import
android.util.Log
;
import
com.scwang.smartrefresh.header.BezierCircleHeader
;
import
com.scwang.smartrefresh.header.BezierCircleHeader
;
import
com.scwang.smartrefresh.layout.SmartRefreshLayout
;
import
com.scwang.smartrefresh.layout.SmartRefreshLayout
;
...
@@ -11,6 +15,9 @@ import com.wd.workoffice.retrofit.MesApiService;
...
@@ -11,6 +15,9 @@ import com.wd.workoffice.retrofit.MesApiService;
import
com.wd.workoffice.retrofit.RtfMesHelper
;
import
com.wd.workoffice.retrofit.RtfMesHelper
;
import
com.wd.workoffice.util.UserKeeper
;
import
com.wd.workoffice.util.UserKeeper
;
import
java.io.IOException
;
import
java.util.HashMap
;
import
cn.jpush.android.api.JPushInterface
;
import
cn.jpush.android.api.JPushInterface
;
import
flexible.xd.android_base.base.BaseApp
;
import
flexible.xd.android_base.base.BaseApp
;
import
flexible.xd.android_base.network.rtfhttp.RtfHelper
;
import
flexible.xd.android_base.network.rtfhttp.RtfHelper
;
...
@@ -18,6 +25,7 @@ import flexible.xd.android_base.utils.Utils;
...
@@ -18,6 +25,7 @@ import flexible.xd.android_base.utils.Utils;
import
me.jessyan.autosize.AutoSizeConfig
;
import
me.jessyan.autosize.AutoSizeConfig
;
import
me.jessyan.autosize.unit.Subunits
;
import
me.jessyan.autosize.unit.Subunits
;
import
okhttp3.Request
;
import
okhttp3.Request
;
import
okhttp3.Response
;
/**
/**
...
@@ -26,6 +34,7 @@ import okhttp3.Request;
...
@@ -26,6 +34,7 @@ import okhttp3.Request;
public
class
WorkApp
extends
BaseApp
{
public
class
WorkApp
extends
BaseApp
{
private
static
Application
instance
;
private
static
Application
instance
;
private
HashMap
<
String
,
String
>
cookies
;
@Override
@Override
public
void
onCreate
()
{
public
void
onCreate
()
{
...
@@ -48,13 +57,51 @@ public class WorkApp extends BaseApp {
...
@@ -48,13 +57,51 @@ public class WorkApp extends BaseApp {
return
chain
.
proceed
(
request
);
return
chain
.
proceed
(
request
);
});
});
cookies
=
new
HashMap
<>();
RtfMesHelper
.
getInstance
().
init
(
MesApiService
.
DOMAIN
,
chain
->
{
RtfMesHelper
.
getInstance
().
init
(
MesApiService
.
DOMAIN
,
chain
->
{
Request
original
=
chain
.
request
();
//获取请求链接
Request
request
=
original
.
newBuilder
()
Request
originalRequest
=
chain
.
request
();
.
method
(
original
.
method
(),
original
.
body
())
//获取url的主机地址
String
hostString
=
originalRequest
.
url
().
host
();
if
(!
cookies
.
containsKey
(
hostString
))
{
//获取磁盘里面的spCookie字符串
String
spCookie
=
UserKeeper
.
getInstance
().
getCookie
();
if
(!
TextUtils
.
isEmpty
(
spCookie
))
{
//获取spCookie解密放到内存中
cookies
.
put
(
hostString
,
spCookie
);
}
}
//获取内存中的Cookie
String
memoryCookie
=
cookies
.
get
(
hostString
);
//拦截网络请求数据
Request
request
=
originalRequest
.
newBuilder
()
//设置请求头Cookie值
.
addHeader
(
"Cookie"
,
memoryCookie
==
null
?
""
:
memoryCookie
)
.
build
();
.
build
();
return
chain
.
proceed
(
request
);
//拦截返回数据
Response
originalResponse
=
chain
.
proceed
(
request
);
//判断请求头里面是否有Set-Cookie值,更新Cookie
if
(!
originalResponse
.
headers
(
"Set-Cookie"
).
isEmpty
())
{
//字符串集
StringBuilder
stringBuilder
=
new
StringBuilder
();
for
(
String
header
:
originalResponse
.
headers
(
"Set-Cookie"
))
{
stringBuilder
.
append
(
header
);
stringBuilder
.
append
(
";"
);
}
//拼接Cookie成字符串
String
cookie
=
stringBuilder
.
toString
();
//更新内存中Cookies值
cookies
.
put
(
hostString
,
cookie
);
//存储到本地磁盘中
UserKeeper
.
getInstance
().
keepCookie
(
cookie
);
Log
.
e
(
"Set-Cookie"
,
"cookies: "
+
cookie
+
" host: "
+
hostString
);
}
return
originalResponse
;
});
});
smartInit
();
smartInit
();
JPushInterface
.
setDebugMode
(
true
);
JPushInterface
.
setDebugMode
(
true
);
...
...
app/src/main/java/com/wd/workoffice/bean/mesBean/FeedbackBean.java
浏览文件 @
749d5efb
差异被折叠。
点击展开。
app/src/main/java/com/wd/workoffice/ui/activity/mes/MesLoginActivity.java
浏览文件 @
749d5efb
...
@@ -9,6 +9,7 @@ import android.widget.EditText;
...
@@ -9,6 +9,7 @@ import android.widget.EditText;
import
android.widget.LinearLayout
;
import
android.widget.LinearLayout
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.app.BaseMesBean
;
import
com.wd.workoffice.app.BaseMesBean
;
import
com.wd.workoffice.app.WorkBaseActivity
;
import
com.wd.workoffice.app.WorkBaseActivity
;
...
@@ -137,6 +138,8 @@ public class MesLoginActivity extends WorkToolBarActivity {
...
@@ -137,6 +138,8 @@ public class MesLoginActivity extends WorkToolBarActivity {
}
}
toast
(
"登录成功"
);
toast
(
"登录成功"
);
UserKeeper
.
getInstance
().
keepMesLogin
(
true
);
UserKeeper
.
getInstance
().
keepMesLogin
(
true
);
JSONObject
userData
=
JSON
.
parseObject
(
data
.
getData
().
toString
());
UserKeeper
.
getInstance
().
keepMesUid
(
userData
.
getString
(
"userId"
));
Intent
intent
=
new
Intent
(
MesLoginActivity
.
this
,
MainActivity
.
class
);
Intent
intent
=
new
Intent
(
MesLoginActivity
.
this
,
MainActivity
.
class
);
intent
.
addFlags
(
Intent
.
FLAG_ACTIVITY_CLEAR_TASK
);
intent
.
addFlags
(
Intent
.
FLAG_ACTIVITY_CLEAR_TASK
);
startActivity
(
intent
);
startActivity
(
intent
);
...
...
app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityActivity.java
浏览文件 @
749d5efb
...
@@ -153,7 +153,7 @@ public class MesQualityActivity extends WorkToolBarActivity {
...
@@ -153,7 +153,7 @@ public class MesQualityActivity extends WorkToolBarActivity {
@Override
@Override
public
boolean
onCreateOptionsMenu
(
Menu
menu
)
{
public
boolean
onCreateOptionsMenu
(
Menu
menu
)
{
getMenuInflater
().
inflate
(
R
.
menu
.
menu_search
,
menu
);
getMenuInflater
().
inflate
(
R
.
menu
.
menu_
mes_
search
,
menu
);
return
super
.
onCreateOptionsMenu
(
menu
);
return
super
.
onCreateOptionsMenu
(
menu
);
}
}
...
...
app/src/main/java/com/wd/workoffice/ui/activity/mes/search/MesSearchActivity.java
浏览文件 @
749d5efb
...
@@ -59,8 +59,11 @@ public class MesSearchActivity extends WorkToolBarActivity {
...
@@ -59,8 +59,11 @@ public class MesSearchActivity extends WorkToolBarActivity {
dataAdapter
=
new
MesSearchAdapter
(
R
.
layout
.
item_mes_search
,
dataList
);
dataAdapter
=
new
MesSearchAdapter
(
R
.
layout
.
item_mes_search
,
dataList
);
dataAdapter
.
bindToRecyclerView
(
rvData
);
dataAdapter
.
bindToRecyclerView
(
rvData
);
dataAdapter
.
setEmptyView
(
R
.
layout
.
view_empty_content
,
rvData
);
dataAdapter
.
setEmptyView
(
R
.
layout
.
view_empty_content
,
rvData
);
param
=
WorkUtils
.
pageKey
();
param
=
WorkUtils
.
pageMesKey
();
Map
<
String
,
Object
>
paramMap
=
WorkUtils
.
simpleParam
();
paramMap
.
put
(
"materialCode"
,
"306"
);
param
.
put
(
"pageNum"
,
page
);
param
.
put
(
"pageNum"
,
page
);
param
.
put
(
"paramMap"
,
paramMap
);
getData
();
getData
();
}
}
...
@@ -130,7 +133,7 @@ public class MesSearchActivity extends WorkToolBarActivity {
...
@@ -130,7 +133,7 @@ public class MesSearchActivity extends WorkToolBarActivity {
@Override
@Override
public
boolean
onCreateOptionsMenu
(
Menu
menu
)
{
public
boolean
onCreateOptionsMenu
(
Menu
menu
)
{
getMenuInflater
().
inflate
(
R
.
menu
.
menu_search
,
menu
);
getMenuInflater
().
inflate
(
R
.
menu
.
menu_
mes_
search
,
menu
);
return
super
.
onCreateOptionsMenu
(
menu
);
return
super
.
onCreateOptionsMenu
(
menu
);
}
}
...
...
app/src/main/java/com/wd/workoffice/ui/activity/mes/search/MesSearchConditionActivity.java
浏览文件 @
749d5efb
...
@@ -47,6 +47,7 @@ public class MesSearchConditionActivity extends WorkToolBarActivity {
...
@@ -47,6 +47,7 @@ public class MesSearchConditionActivity extends WorkToolBarActivity {
@BindView
(
R
.
id
.
et_steel
)
@BindView
(
R
.
id
.
et_steel
)
EditText
etSteel
;
EditText
etSteel
;
private
Map
<
String
,
Object
>
param
;
private
Map
<
String
,
Object
>
param
;
@Override
@Override
protected
void
initView
()
{
protected
void
initView
()
{
ButterKnife
.
bind
(
this
);
ButterKnife
.
bind
(
this
);
...
@@ -111,6 +112,7 @@ public class MesSearchConditionActivity extends WorkToolBarActivity {
...
@@ -111,6 +112,7 @@ public class MesSearchConditionActivity extends WorkToolBarActivity {
if
(!
TextUtils
.
isEmpty
(
etYears
.
getText
().
toString
()))
{
if
(!
TextUtils
.
isEmpty
(
etYears
.
getText
().
toString
()))
{
param
.
put
(
"designedLife"
,
etYears
.
getText
().
toString
());
param
.
put
(
"designedLife"
,
etYears
.
getText
().
toString
());
}
}
param
.
put
(
"materialCode"
,
"306"
);
Intent
intent
=
new
Intent
();
Intent
intent
=
new
Intent
();
intent
.
putExtra
(
"param"
,
JSON
.
toJSONString
(
param
));
intent
.
putExtra
(
"param"
,
JSON
.
toJSONString
(
param
));
setResult
(
10001
,
intent
);
setResult
(
10001
,
intent
);
...
...
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketListActivity.java
浏览文件 @
749d5efb
package
com
.
wd
.
workoffice
.
ui
.
activity
.
mes
.
ticket
;
package
com
.
wd
.
workoffice
.
ui
.
activity
.
mes
.
ticket
;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.text.TextUtils
;
import
android.view.Menu
;
import
android.view.Menu
;
import
android.view.MenuItem
;
import
android.view.MenuItem
;
import
android.view.View
;
import
android.view.View
;
...
@@ -18,6 +19,7 @@ import com.wd.workoffice.bean.mesBean.TicketBean;
...
@@ -18,6 +19,7 @@ import com.wd.workoffice.bean.mesBean.TicketBean;
import
com.wd.workoffice.retrofit.RtfUtils
;
import
com.wd.workoffice.retrofit.RtfUtils
;
import
com.wd.workoffice.retrofit.WorkObserver
;
import
com.wd.workoffice.retrofit.WorkObserver
;
import
com.wd.workoffice.ui.adapter.MesTicketAdapter
;
import
com.wd.workoffice.ui.adapter.MesTicketAdapter
;
import
com.wd.workoffice.util.UserKeeper
;
import
com.wd.workoffice.util.WorkUtils
;
import
com.wd.workoffice.util.WorkUtils
;
import
org.greenrobot.eventbus.EventBus
;
import
org.greenrobot.eventbus.EventBus
;
...
@@ -62,6 +64,7 @@ public class MesTicketListActivity extends WorkToolBarActivity {
...
@@ -62,6 +64,7 @@ public class MesTicketListActivity extends WorkToolBarActivity {
ButterKnife
.
bind
(
this
);
ButterKnife
.
bind
(
this
);
tvGo
.
setText
(
"任务担当\n"
+
tvGo
.
setText
(
"任务担当\n"
+
"页面"
);
"页面"
);
tvGo
.
setVisibility
(
View
.
GONE
);
rvData
.
setLayoutManager
(
new
LinearLayoutManager
(
this
,
RecyclerView
.
VERTICAL
,
false
));
rvData
.
setLayoutManager
(
new
LinearLayoutManager
(
this
,
RecyclerView
.
VERTICAL
,
false
));
}
}
...
@@ -131,21 +134,22 @@ public class MesTicketListActivity extends WorkToolBarActivity {
...
@@ -131,21 +134,22 @@ public class MesTicketListActivity extends WorkToolBarActivity {
dataAdapter
.
setOnItemClickListener
(
new
BaseQuickAdapter
.
OnItemClickListener
()
{
dataAdapter
.
setOnItemClickListener
(
new
BaseQuickAdapter
.
OnItemClickListener
()
{
@Override
@Override
public
void
onItemClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
public
void
onItemClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
boolean
isJob
=
TextUtils
.
equals
(
UserKeeper
.
getInstance
().
getMesUid
(),
dataList
.
get
(
position
).
getJobUserId
());
switch
(
dataList
.
get
(
position
).
getJobStatus
())
{
switch
(
dataList
.
get
(
position
).
getJobStatus
())
{
case
0
:
case
0
:
startActivity
(
MesTicketAddActivity
.
class
,
"data"
,
JSON
.
toJSONString
(
dataList
.
get
(
position
)));
startActivity
(
MesTicketAddActivity
.
class
,
"from"
,
isJob
?
"1"
:
"0"
,
"data"
,
JSON
.
toJSONString
(
dataList
.
get
(
position
)));
break
;
break
;
case
1
:
case
1
:
startActivity
(
MesTicketDetailActivity
.
class
,
"
data"
,
JSON
.
toJSONString
(
dataList
.
get
(
position
)));
startActivity
(
MesTicketDetailActivity
.
class
,
"
from"
,
isJob
?
"1"
:
"0"
,
"data"
,
JSON
.
toJSONString
(
dataList
.
get
(
position
)));
break
;
break
;
case
2
:
case
2
:
startActivity
(
MesTicketDetailActivity
.
class
,
"data"
,
JSON
.
toJSONString
(
dataList
.
get
(
position
)));
startActivity
(
MesTicketDetailActivity
.
class
,
"
from"
,
isJob
?
"1"
:
"0"
,
"
data"
,
JSON
.
toJSONString
(
dataList
.
get
(
position
)));
break
;
break
;
case
3
:
case
3
:
startActivity
(
MesTicketDetailFinishActivity
.
class
,
"data"
,
JSON
.
toJSONString
(
dataList
.
get
(
position
)));
startActivity
(
MesTicketDetailFinishActivity
.
class
,
"
from"
,
isJob
?
"1"
:
"0"
,
"
data"
,
JSON
.
toJSONString
(
dataList
.
get
(
position
)));
break
;
break
;
case
4
:
case
4
:
startActivity
(
MesTicketDetailReviewActivity
.
class
,
"data"
,
JSON
.
toJSONString
(
dataList
.
get
(
position
)));
startActivity
(
MesTicketDetailReviewActivity
.
class
,
"
from"
,
isJob
?
"1"
:
"0"
,
"
data"
,
JSON
.
toJSONString
(
dataList
.
get
(
position
)));
break
;
break
;
}
}
}
}
...
@@ -160,7 +164,7 @@ public class MesTicketListActivity extends WorkToolBarActivity {
...
@@ -160,7 +164,7 @@ public class MesTicketListActivity extends WorkToolBarActivity {
@Override
@Override
public
boolean
onCreateOptionsMenu
(
Menu
menu
)
{
public
boolean
onCreateOptionsMenu
(
Menu
menu
)
{
getMenuInflater
().
inflate
(
R
.
menu
.
menu_search
,
menu
);
getMenuInflater
().
inflate
(
R
.
menu
.
menu_
mes_
search
,
menu
);
return
super
.
onCreateOptionsMenu
(
menu
);
return
super
.
onCreateOptionsMenu
(
menu
);
}
}
...
@@ -212,7 +216,7 @@ public class MesTicketListActivity extends WorkToolBarActivity {
...
@@ -212,7 +216,7 @@ public class MesTicketListActivity extends WorkToolBarActivity {
super
.
onActivityResult
(
requestCode
,
resultCode
,
data
);
super
.
onActivityResult
(
requestCode
,
resultCode
,
data
);
if
(
requestCode
==
10001
&&
resultCode
==
10001
)
{
if
(
requestCode
==
10001
&&
resultCode
==
10001
)
{
String
returnParam
=
data
.
getStringExtra
(
"param"
);
String
returnParam
=
data
.
getStringExtra
(
"param"
);
param
.
put
(
"paramMap"
,
JSON
.
parseObject
(
returnParam
,
Map
.
class
));
param
.
put
(
"paramMap"
,
JSON
.
parseObject
(
returnParam
,
Map
.
class
));
page
=
1
;
page
=
1
;
param
.
put
(
"pageNum"
,
page
);
param
.
put
(
"pageNum"
,
page
);
getData
();
getData
();
...
...
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketListTakeOnActivity.java
浏览文件 @
749d5efb
...
@@ -172,7 +172,7 @@ public class MesTicketListTakeOnActivity extends WorkToolBarActivity {
...
@@ -172,7 +172,7 @@ public class MesTicketListTakeOnActivity extends WorkToolBarActivity {
@Override
@Override
public
boolean
onCreateOptionsMenu
(
Menu
menu
)
{
public
boolean
onCreateOptionsMenu
(
Menu
menu
)
{
getMenuInflater
().
inflate
(
R
.
menu
.
menu_search
,
menu
);
getMenuInflater
().
inflate
(
R
.
menu
.
menu_
mes_
search
,
menu
);
return
super
.
onCreateOptionsMenu
(
menu
);
return
super
.
onCreateOptionsMenu
(
menu
);
}
}
...
...
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataListActivity.java
浏览文件 @
749d5efb
package
com
.
wd
.
workoffice
.
ui
.
activity
.
mes
.
user
;
package
com
.
wd
.
workoffice
.
ui
.
activity
.
mes
.
user
;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.text.TextUtils
;
import
android.view.Menu
;
import
android.view.Menu
;
import
android.view.MenuItem
;
import
android.view.MenuItem
;
import
android.view.View
;
import
android.view.View
;
...
@@ -18,6 +19,7 @@ import com.wd.workoffice.bean.mesBean.UserDataBean;
...
@@ -18,6 +19,7 @@ import com.wd.workoffice.bean.mesBean.UserDataBean;
import
com.wd.workoffice.retrofit.RtfUtils
;
import
com.wd.workoffice.retrofit.RtfUtils
;
import
com.wd.workoffice.retrofit.WorkObserver
;
import
com.wd.workoffice.retrofit.WorkObserver
;
import
com.wd.workoffice.ui.adapter.MesUserDataAdapter
;
import
com.wd.workoffice.ui.adapter.MesUserDataAdapter
;
import
com.wd.workoffice.util.UserKeeper
;
import
com.wd.workoffice.util.WorkUtils
;
import
com.wd.workoffice.util.WorkUtils
;
import
org.greenrobot.eventbus.EventBus
;
import
org.greenrobot.eventbus.EventBus
;
...
@@ -63,6 +65,7 @@ public class MesUserDataListActivity extends WorkToolBarActivity {
...
@@ -63,6 +65,7 @@ public class MesUserDataListActivity extends WorkToolBarActivity {
rvData
.
setLayoutManager
(
new
LinearLayoutManager
(
this
,
RecyclerView
.
VERTICAL
,
false
));
rvData
.
setLayoutManager
(
new
LinearLayoutManager
(
this
,
RecyclerView
.
VERTICAL
,
false
));
tvGo
.
setText
(
"市场服务\n"
+
tvGo
.
setText
(
"市场服务\n"
+
"审核"
);
"审核"
);
tvGo
.
setVisibility
(
View
.
GONE
);
}
}
...
@@ -131,7 +134,8 @@ public class MesUserDataListActivity extends WorkToolBarActivity {
...
@@ -131,7 +134,8 @@ public class MesUserDataListActivity extends WorkToolBarActivity {
dataAdapter
.
setOnItemClickListener
(
new
BaseQuickAdapter
.
OnItemClickListener
()
{
dataAdapter
.
setOnItemClickListener
(
new
BaseQuickAdapter
.
OnItemClickListener
()
{
@Override
@Override
public
void
onItemClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
public
void
onItemClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
startActivity
(
MesUserDataDetailActivity
.
class
,
"from"
,
"0"
,
"id"
,
boolean
isJob
=
TextUtils
.
equals
(
UserKeeper
.
getInstance
().
getMesUid
(),
dataList
.
get
(
position
).
getApprovalUserId
());
startActivity
(
MesUserDataDetailActivity
.
class
,
"from"
,
isJob
?
"1"
:
"0"
,
"id"
,
dataList
.
get
(
position
).
getId
(),
"status"
,
dataList
.
get
(
position
).
getId
(),
"status"
,
dataList
.
get
(
position
).
getApprovalStatus
()+
""
);
dataList
.
get
(
position
).
getApprovalStatus
()+
""
);
}
}
...
@@ -146,7 +150,7 @@ public class MesUserDataListActivity extends WorkToolBarActivity {
...
@@ -146,7 +150,7 @@ public class MesUserDataListActivity extends WorkToolBarActivity {
@Override
@Override
public
boolean
onCreateOptionsMenu
(
Menu
menu
)
{
public
boolean
onCreateOptionsMenu
(
Menu
menu
)
{
getMenuInflater
().
inflate
(
R
.
menu
.
menu_search
,
menu
);
getMenuInflater
().
inflate
(
R
.
menu
.
menu_
mes_
search
,
menu
);
return
super
.
onCreateOptionsMenu
(
menu
);
return
super
.
onCreateOptionsMenu
(
menu
);
}
}
...
...
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataListCheckActivity.java
浏览文件 @
749d5efb
...
@@ -147,7 +147,7 @@ public class MesUserDataListCheckActivity extends WorkToolBarActivity {
...
@@ -147,7 +147,7 @@ public class MesUserDataListCheckActivity extends WorkToolBarActivity {
@Override
@Override
public
boolean
onCreateOptionsMenu
(
Menu
menu
)
{
public
boolean
onCreateOptionsMenu
(
Menu
menu
)
{
getMenuInflater
().
inflate
(
R
.
menu
.
menu_search
,
menu
);
getMenuInflater
().
inflate
(
R
.
menu
.
menu_
mes_
search
,
menu
);
return
super
.
onCreateOptionsMenu
(
menu
);
return
super
.
onCreateOptionsMenu
(
menu
);
}
}
...
...
app/src/main/java/com/wd/workoffice/ui/activity/user/UserSettingActivity.java
浏览文件 @
749d5efb
...
@@ -92,32 +92,37 @@ public class UserSettingActivity extends WorkToolBarActivity {
...
@@ -92,32 +92,37 @@ public class UserSettingActivity extends WorkToolBarActivity {
}
}
private
void
logout
()
{
private
void
logout
()
{
RtfUtils
.
getRtf
().
logout
().
compose
(
Transformer
.
schedule
()).
subscribe
(
new
WorkObserver
<
BaseBean
>()
{
toast
(
"退出成功"
);
Intent
intent
=
new
Intent
(
UserSettingActivity
.
this
,
MainLoginActivity
.
class
);
intent
.
addFlags
(
Intent
.
FLAG_ACTIVITY_CLEAR_TASK
);
@Override
UserKeeper
.
getInstance
().
clearAll
();
public
void
doOnSubscribe
(
Disposable
d
)
{
startActivity
(
intent
);
}
// RtfUtils.getRtf().logout().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
//
@Override
//
public
void
onFail
(
String
errorMsg
)
{
// @Override
hideLoading
();
// public void doOnSubscribe(Disposable d) {
toast
(
errorMsg
);
// }
}
//
// @Override
@Override
// public void onFail(String errorMsg) {
public
void
onSuccess
(
BaseBean
data
)
{
// hideLoading();
hideLoading
();
// toast(errorMsg);
if
(
data
.
getCode
()
!=
0
)
{
// }
toast
(
data
.
getMessage
());
//
return
;
// @Override
}
// public void onSuccess(BaseBean data) {
toast
(
"退出成功"
);
// hideLoading();
Intent
intent
=
new
Intent
(
UserSettingActivity
.
this
,
MainLoginActivity
.
class
);
// if (data.getCode() != 0) {
intent
.
addFlags
(
Intent
.
FLAG_ACTIVITY_CLEAR_TASK
);
// toast(data.getMessage());
UserKeeper
.
getInstance
().
clearAll
();
// return;
startActivity
(
intent
);
// }
}
// toast("退出成功");
});
// Intent intent = new Intent(UserSettingActivity.this, MainLoginActivity.class);
// intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
// UserKeeper.getInstance().clearAll();
// startActivity(intent);
// }
// });
}
}
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/MesQualityAdapter.java
浏览文件 @
749d5efb
...
@@ -26,7 +26,19 @@ public class MesQualityAdapter extends BaseQuickAdapter<FeedbackBean.ListBean, B
...
@@ -26,7 +26,19 @@ public class MesQualityAdapter extends BaseQuickAdapter<FeedbackBean.ListBean, B
helper
.
setText
(
R
.
id
.
tv_manager
,
item
.
getSaleUserName
());
helper
.
setText
(
R
.
id
.
tv_manager
,
item
.
getSaleUserName
());
helper
.
setText
(
R
.
id
.
tv_name
,
item
.
getCustomerName
());
helper
.
setText
(
R
.
id
.
tv_name
,
item
.
getCustomerName
());
helper
.
setText
(
R
.
id
.
tv_phone
,
item
.
getPhoneNumber
());
helper
.
setText
(
R
.
id
.
tv_phone
,
item
.
getPhoneNumber
());
helper
.
setText
(
R
.
id
.
tv_pro
,
item
.
getProductName
());
helper
.
setText
(
R
.
id
.
tv_pro
,
item
.
getProductCode
());
helper
.
setText
(
R
.
id
.
tv_pro_name
,
item
.
getProductName
());
helper
.
setText
(
R
.
id
.
tv_spec
,
item
.
getSpecification
());
helper
.
setText
(
R
.
id
.
tv_img_code
,
item
.
getDrawingNumber
());
helper
.
setText
(
R
.
id
.
tv_box
,
item
.
getBoxCode
());
helper
.
setText
(
R
.
id
.
tv_num
,
item
.
getDefectCount
()+
""
);
helper
.
setText
(
R
.
id
.
tv_mark_code
,
item
.
getSerialNumber
());
helper
.
setText
(
R
.
id
.
tv_machine
,
item
.
getCasterName
());
helper
.
setText
(
R
.
id
.
tv_steel
,
item
.
getSteelTypeId
());
helper
.
setText
(
R
.
id
.
tv_defect
,
item
.
getDefectName
());
}
}
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/MesTicketAdapter.java
浏览文件 @
749d5efb
...
@@ -26,7 +26,7 @@ public class MesTicketAdapter extends BaseQuickAdapter<TicketBean.ListBean, Base
...
@@ -26,7 +26,7 @@ public class MesTicketAdapter extends BaseQuickAdapter<TicketBean.ListBean, Base
@Override
@Override
protected
void
convert
(
BaseViewHolder
helper
,
TicketBean
.
ListBean
item
)
{
protected
void
convert
(
BaseViewHolder
helper
,
TicketBean
.
ListBean
item
)
{
helper
.
setText
(
R
.
id
.
tv_name
,
item
.
getCustomerUserName
());
helper
.
setText
(
R
.
id
.
tv_name
,
item
.
getCustomerUserName
());
helper
.
setText
(
R
.
id
.
tv_pro_name
,
item
.
get
JobType
Name
());
helper
.
setText
(
R
.
id
.
tv_pro_name
,
item
.
get
SalesManager
Name
());
helper
.
setText
(
R
.
id
.
tv_status
,
WorkUtils
.
getTicketStatus
(
item
.
getJobStatus
()));
helper
.
setText
(
R
.
id
.
tv_status
,
WorkUtils
.
getTicketStatus
(
item
.
getJobStatus
()));
helper
.
setText
(
R
.
id
.
tv_time
,
item
.
getCreateDateTime
());
helper
.
setText
(
R
.
id
.
tv_time
,
item
.
getCreateDateTime
());
}
}
...
...
app/src/main/java/com/wd/workoffice/util/UserKeeper.java
浏览文件 @
749d5efb
...
@@ -21,6 +21,9 @@ public class UserKeeper {
...
@@ -21,6 +21,9 @@ public class UserKeeper {
private
final
String
LOGIN_INFO
=
"_LOGIN_INFO"
;
private
final
String
LOGIN_INFO
=
"_LOGIN_INFO"
;
private
final
String
USER_INFO
=
"_USER_INFO"
;
private
final
String
USER_INFO
=
"_USER_INFO"
;
private
final
String
MES_LOGIN
=
"_MES_LOGIN"
;
private
final
String
MES_LOGIN
=
"_MES_LOGIN"
;
private
final
String
MES_UID
=
"_MES_UID"
;
private
final
String
COOKIE
=
"_COOKIE"
;
private
UserKeeper
()
{
private
UserKeeper
()
{
}
}
...
@@ -35,8 +38,21 @@ public class UserKeeper {
...
@@ -35,8 +38,21 @@ public class UserKeeper {
return
keeper
;
return
keeper
;
}
}
public
void
keepCookie
(
String
info
)
{
sp
.
put
(
COOKIE
,
info
);
}
public
String
getCookie
()
{
return
sp
.
getString
(
COOKIE
);
}
public
void
clearCookie
()
{
sp
.
put
(
COOKIE
,
""
);
}
/**
/**
* mes登录状态
* mes登录状态
*
* @param info
* @param info
*/
*/
public
void
keepMesLogin
(
Boolean
info
)
{
public
void
keepMesLogin
(
Boolean
info
)
{
...
@@ -51,6 +67,17 @@ public class UserKeeper {
...
@@ -51,6 +67,17 @@ public class UserKeeper {
sp
.
put
(
MES_LOGIN
,
false
);
sp
.
put
(
MES_LOGIN
,
false
);
}
}
public
void
keepMesUid
(
String
info
)
{
sp
.
put
(
MES_UID
,
info
);
}
public
String
getMesUid
()
{
return
sp
.
getString
(
MES_UID
);
}
public
void
clearMesUid
()
{
sp
.
put
(
MES_UID
,
""
);
}
public
void
keepLoginInfo
(
String
info
)
{
public
void
keepLoginInfo
(
String
info
)
{
sp
.
put
(
LOGIN_INFO
,
info
);
sp
.
put
(
LOGIN_INFO
,
info
);
...
@@ -74,6 +101,7 @@ public class UserKeeper {
...
@@ -74,6 +101,7 @@ public class UserKeeper {
}
}
return
tokenBean
.
getAccess_token
();
return
tokenBean
.
getAccess_token
();
}
}
public
String
getRefreshToken
()
{
public
String
getRefreshToken
()
{
if
(
TextUtils
.
isEmpty
(
sp
.
getString
(
LOGIN_INFO
)))
{
if
(
TextUtils
.
isEmpty
(
sp
.
getString
(
LOGIN_INFO
)))
{
return
""
;
return
""
;
...
@@ -84,6 +112,7 @@ public class UserKeeper {
...
@@ -84,6 +112,7 @@ public class UserKeeper {
}
}
return
tokenBean
.
getRefresh_token
();
return
tokenBean
.
getRefresh_token
();
}
}
public
String
getUserId
()
{
public
String
getUserId
()
{
if
(
TextUtils
.
isEmpty
(
sp
.
getString
(
LOGIN_INFO
)))
{
if
(
TextUtils
.
isEmpty
(
sp
.
getString
(
LOGIN_INFO
)))
{
return
""
;
return
""
;
...
@@ -150,9 +179,11 @@ public class UserKeeper {
...
@@ -150,9 +179,11 @@ public class UserKeeper {
}
}
return
infoBean
.
getNickName
();
return
infoBean
.
getNickName
();
}
}
public
void
clearAll
()
{
public
void
clearAll
()
{
clearLoginInfo
();
clearLoginInfo
();
clearUserInfo
();
clearUserInfo
();
clearMesLogin
();
clearMesLogin
();
clearMesUid
();
}
}
}
}
app/src/main/res/layout/activity_mes_quality.xml
浏览文件 @
749d5efb
...
@@ -8,61 +8,7 @@
...
@@ -8,61 +8,7 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"vertical"
>
android:orientation=
"vertical"
>
<LinearLayout
android:layout_width=
"match_parent"
android:orientation=
"vertical"
android:layout_height=
"match_parent"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:paddingVertical=
"16mm"
>
<TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:gravity=
"center"
android:text=
"反馈单号"
android:textSize=
"12sp"
/>
<TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:gravity=
"center"
android:text=
"客户名称"
android:textSize=
"12sp"
/>
<TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:gravity=
"center"
android:text=
"销售经理"
android:textSize=
"12sp"
/>
<TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:gravity=
"center"
android:text=
"联系电话"
android:textSize=
"12sp"
/>
<TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:gravity=
"center"
android:text=
"产品"
android:textSize=
"12sp"
/>
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_data"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"@android:color/white"
/>
</LinearLayout>
<Button
<Button
android:id=
"@+id/btn_add"
android:id=
"@+id/btn_add"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
...
@@ -73,5 +19,133 @@
...
@@ -73,5 +19,133 @@
android:background=
"@color/blue_btn"
android:background=
"@color/blue_btn"
android:text=
"新建"
android:text=
"新建"
android:textColor=
"@color/white"
/>
android:textColor=
"@color/white"
/>
<HorizontalScrollView
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:layout_above=
"@id/btn_add"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"vertical"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:paddingVertical=
"16mm"
>
<TextView
android:layout_width=
"80mm"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:text=
"反馈单号"
android:textSize=
"12sp"
/>
<TextView
android:layout_width=
"80mm"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:text=
"客户名称"
android:textSize=
"12sp"
/>
<TextView
android:layout_width=
"80mm"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:text=
"销售经理"
android:textSize=
"12sp"
/>
<TextView
android:layout_width=
"80mm"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:text=
"联系电话"
android:textSize=
"12sp"
/>
<TextView
android:layout_width=
"80mm"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:text=
"产品编码"
android:textSize=
"12sp"
/>
<TextView
android:layout_width=
"80mm"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:text=
"产品名称"
android:textSize=
"12sp"
/>
<TextView
android:layout_width=
"80mm"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:text=
"规格型号"
android:textSize=
"12sp"
/>
<TextView
android:layout_width=
"80mm"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:text=
"图号"
android:textSize=
"12sp"
/>
<TextView
android:layout_width=
"80mm"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:text=
"箱号"
android:textSize=
"12sp"
/>
<TextView
android:layout_width=
"80mm"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:text=
"支数"
android:textSize=
"12sp"
/>
<TextView
android:layout_width=
"80mm"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:text=
"单指标记码"
android:textSize=
"12sp"
/>
<TextView
android:layout_width=
"80mm"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:text=
"对应连铸机"
android:textSize=
"12sp"
/>
<TextView
android:layout_width=
"80mm"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:text=
"对应钢种"
android:textSize=
"12sp"
/>
<TextView
android:layout_width=
"80mm"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:text=
"缺陷名称"
android:textSize=
"12sp"
/>
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_data"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"@android:color/white"
/>
</LinearLayout>
</HorizontalScrollView>
</RelativeLayout>
</RelativeLayout>
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
\ No newline at end of file
app/src/main/res/layout/activity_mes_ticket_list.xml
浏览文件 @
749d5efb
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:layout_weight=
"1"
android:gravity=
"center"
android:gravity=
"center"
android:text=
"
产品名称
"
android:text=
"
销售公司
"
android:textColor=
"@color/flexible_text_sup"
android:textColor=
"@color/flexible_text_sup"
android:textSize=
"12sp"
/>
android:textSize=
"12sp"
/>
...
@@ -43,16 +43,15 @@
...
@@ -43,16 +43,15 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:layout_weight=
"1"
android:gravity=
"center"
android:gravity=
"center"
android:text=
"
制单日期
"
android:text=
"
任务状态
"
android:textColor=
"@color/flexible_text_sup"
android:textColor=
"@color/flexible_text_sup"
android:textSize=
"12sp"
/>
android:textSize=
"12sp"
/>
<TextView
<TextView
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:layout_weight=
"1"
android:gravity=
"center"
android:gravity=
"center"
android:text=
"
任务状态
"
android:text=
"
制单日期
"
android:textColor=
"@color/flexible_text_sup"
android:textColor=
"@color/flexible_text_sup"
android:textSize=
"12sp"
/>
android:textSize=
"12sp"
/>
</LinearLayout>
</LinearLayout>
...
...
app/src/main/res/layout/activity_mes_user_data_list.xml
浏览文件 @
749d5efb
...
@@ -19,12 +19,14 @@
...
@@ -19,12 +19,14 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:paddingVertical=
"16mm"
>
android:paddingVertical=
"16mm"
>
<TextView
<TextView
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:layout_weight=
"1"
android:gravity=
"center"
android:gravity=
"center"
android:text=
"
反馈日期
"
android:text=
"
客户信息
"
android:textColor=
"@color/flexible_text_sup"
android:textColor=
"@color/flexible_text_sup"
android:textSize=
"12sp"
/>
android:textSize=
"12sp"
/>
...
@@ -33,7 +35,7 @@
...
@@ -33,7 +35,7 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:layout_weight=
"1"
android:gravity=
"center"
android:gravity=
"center"
android:text=
"
客户信息
"
android:text=
"
炼钢厂
"
android:textColor=
"@color/flexible_text_sup"
android:textColor=
"@color/flexible_text_sup"
android:textSize=
"12sp"
/>
android:textSize=
"12sp"
/>
...
@@ -42,7 +44,7 @@
...
@@ -42,7 +44,7 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:layout_weight=
"1"
android:gravity=
"center"
android:gravity=
"center"
android:text=
"
炼钢厂
"
android:text=
"
连铸机
"
android:textColor=
"@color/flexible_text_sup"
android:textColor=
"@color/flexible_text_sup"
android:textSize=
"12sp"
/>
android:textSize=
"12sp"
/>
...
@@ -51,16 +53,15 @@
...
@@ -51,16 +53,15 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:layout_weight=
"1"
android:gravity=
"center"
android:gravity=
"center"
android:text=
"
连铸机
"
android:text=
"
状态
"
android:textColor=
"@color/flexible_text_sup"
android:textColor=
"@color/flexible_text_sup"
android:textSize=
"12sp"
/>
android:textSize=
"12sp"
/>
<TextView
<TextView
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:layout_weight=
"1"
android:gravity=
"center"
android:gravity=
"center"
android:text=
"
状态
"
android:text=
"
反馈日期
"
android:textColor=
"@color/flexible_text_sup"
android:textColor=
"@color/flexible_text_sup"
android:textSize=
"12sp"
/>
android:textSize=
"12sp"
/>
</LinearLayout>
</LinearLayout>
...
...
app/src/main/res/layout/item_mes_quality.xml
浏览文件 @
749d5efb
...
@@ -3,50 +3,129 @@
...
@@ -3,50 +3,129 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:background=
"@color/white"
android:background=
"@color/white"
android:
padding=
"10mm
"
>
android:
orientation=
"vertical
"
>
<LinearLayout
<TextView
android:layout_width=
"match_parent"
android:id=
"@+id/tv_no"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:gravity=
"center"
android:text=
"反馈单号"
android:textSize=
"12sp"
/>
<TextView
android:id=
"@+id/tv_name"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:gravity=
"center"
android:text=
"客户名称"
android:textSize=
"12sp"
/>
<TextView
android:id=
"@+id/tv_manager"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:paddingVertical=
"16mm"
>
android:gravity=
"center"
android:text=
"销售经理"
android:textSize=
"12sp"
/>
<TextView
android:id=
"@+id/tv_no"
<TextView
android:layout_width=
"80mm"
android:id=
"@+id/tv_phone"
android:layout_height=
"wrap_content"
android:layout_width=
"0dp"
android:gravity=
"center"
android:layout_height=
"wrap_content"
android:text=
"反馈单号"
android:layout_weight=
"1"
android:textSize=
"12sp"
/>
android:gravity=
"center"
android:text=
"联系电话"
<TextView
android:textSize=
"12sp"
/>
android:id=
"@+id/tv_name"
<TextView
android:layout_width=
"80mm"
android:id=
"@+id/tv_pro"
android:layout_height=
"wrap_content"
android:layout_width=
"0dp"
android:gravity=
"center"
android:layout_height=
"wrap_content"
android:text=
"客户名称"
android:layout_weight=
"1"
android:textSize=
"12sp"
/>
android:gravity=
"center"
android:text=
"产品"
<TextView
android:textSize=
"12sp"
/>
android:id=
"@+id/tv_manager"
android:layout_width=
"80mm"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:text=
"销售经理"
android:textSize=
"12sp"
/>
<TextView
android:id=
"@+id/tv_phone"
android:layout_width=
"80mm"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:text=
"联系电话"
android:textSize=
"12sp"
/>
<TextView
android:id=
"@+id/tv_pro"
android:layout_width=
"80mm"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:text=
"产品编码"
android:textSize=
"12sp"
/>
<TextView
android:id=
"@+id/tv_pro_name"
android:layout_width=
"80mm"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:text=
"产品名称"
android:textSize=
"12sp"
/>
<TextView
android:id=
"@+id/tv_spec"
android:layout_width=
"80mm"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:text=
"规格型号"
android:textSize=
"12sp"
/>
<TextView
android:id=
"@+id/tv_img_code"
android:layout_width=
"80mm"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:text=
"图号"
android:textSize=
"12sp"
/>
<TextView
android:id=
"@+id/tv_box"
android:layout_width=
"80mm"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:text=
"箱号"
android:textSize=
"12sp"
/>
<TextView
android:id=
"@+id/tv_num"
android:layout_width=
"80mm"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:text=
"支数"
android:textSize=
"12sp"
/>
<TextView
android:id=
"@+id/tv_mark_code"
android:layout_width=
"80mm"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:text=
"单指标记码"
android:textSize=
"12sp"
/>
<TextView
android:id=
"@+id/tv_machine"
android:layout_width=
"80mm"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:text=
"对应连铸机"
android:textSize=
"12sp"
/>
<TextView
android:id=
"@+id/tv_steel"
android:layout_width=
"80mm"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:text=
"对应钢种"
android:textSize=
"12sp"
/>
<TextView
android:id=
"@+id/tv_defect"
android:layout_width=
"80mm"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:text=
"缺陷名称"
android:textSize=
"12sp"
/>
</LinearLayout>
<View
style=
"@style/dividerX"
android:background=
"#FF86A0BC"
/>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/item_mes_ticket.xml
浏览文件 @
749d5efb
...
@@ -24,21 +24,19 @@
...
@@ -24,21 +24,19 @@
android:textSize=
"12sp"
/>
android:textSize=
"12sp"
/>
<TextView
<TextView
android:id=
"@+id/tv_
time
"
android:id=
"@+id/tv_
status
"
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:layout_weight=
"1"
android:gravity=
"center"
android:gravity=
"center"
android:text=
"
制单日期
"
android:text=
"
任务状态
"
android:textSize=
"12sp"
/>
android:textSize=
"12sp"
/>
<TextView
<TextView
android:id=
"@+id/tv_
status
"
android:id=
"@+id/tv_
time
"
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:layout_weight=
"1"
android:gravity=
"center"
android:gravity=
"center"
android:textColor=
"@color/red"
android:text=
"制单日期"
android:text=
"任务状态"
android:textSize=
"12sp"
/>
android:textSize=
"12sp"
/>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/item_mes_user_data.xml
浏览文件 @
749d5efb
...
@@ -5,14 +5,6 @@
...
@@ -5,14 +5,6 @@
android:background=
"@color/white"
android:background=
"@color/white"
android:paddingVertical=
"13mm"
>
android:paddingVertical=
"13mm"
>
<TextView
android:id=
"@+id/tv_time"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:gravity=
"center"
android:text=
"反馈日期"
android:textSize=
"12sp"
/>
<TextView
<TextView
android:id=
"@+id/tv_client"
android:id=
"@+id/tv_client"
...
@@ -50,4 +42,13 @@
...
@@ -50,4 +42,13 @@
android:text=
"状态"
android:text=
"状态"
android:textColor=
"@color/red"
android:textColor=
"@color/red"
android:textSize=
"12sp"
/>
android:textSize=
"12sp"
/>
<TextView
android:id=
"@+id/tv_time"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:gravity=
"center"
android:text=
"反馈日期"
android:textSize=
"12sp"
/>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/menu/menu_mes_search.xml
0 → 100644
浏览文件 @
749d5efb
<?xml version="1.0" encoding="utf-8"?>
<menu
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
>
<item
android:id=
"@+id/search"
android:title=
"筛选"
app:showAsAction=
"always"
/>
</menu>
\ No newline at end of file
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论