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
fee4a851
提交
fee4a851
authored
10月 25, 2021
作者:
flexiblexd@163.com
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.工单
上级
2c98b13f
全部展开
显示空白字符变更
内嵌
并排
正在显示
25 个修改的文件
包含
1178 行增加
和
16 行删除
+1178
-16
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+10
-0
QualityWorkActivity.java
.../workoffice/ui/activity/mes/work/QualityWorkActivity.java
+23
-6
QualityWorkFragment.java
.../workoffice/ui/activity/mes/work/QualityWorkFragment.java
+0
-0
WorkOrderDetailActivity.java
...koffice/ui/activity/mes/work/WorkOrderDetailActivity.java
+21
-0
WorkOrderFacotySearchActivity.java
...e/ui/activity/mes/work/WorkOrderFacotySearchActivity.java
+148
-0
WorkOrderLocationSearchActivity.java
...ui/activity/mes/work/WorkOrderLocationSearchActivity.java
+147
-0
WorkOrderMachineSearchActivity.java
.../ui/activity/mes/work/WorkOrderMachineSearchActivity.java
+147
-0
WorkOrderNoSearchActivity.java
...ffice/ui/activity/mes/work/WorkOrderNoSearchActivity.java
+212
-0
FauliTypeAdapter.java
...n/java/com/wd/workoffice/ui/adapter/FauliTypeAdapter.java
+26
-0
MesServiceStandardAdapter.java
...m/wd/workoffice/ui/adapter/MesServiceStandardAdapter.java
+6
-2
WorkFactoryAdapter.java
...java/com/wd/workoffice/ui/adapter/WorkFactoryAdapter.java
+27
-0
WorkLinkAdapter.java
...in/java/com/wd/workoffice/ui/adapter/WorkLinkAdapter.java
+28
-0
WorkLocationAdapter.java
...ava/com/wd/workoffice/ui/adapter/WorkLocationAdapter.java
+27
-0
WorkMarchineAdapter.java
...ava/com/wd/workoffice/ui/adapter/WorkMarchineAdapter.java
+27
-0
WorkOrderTaskAdapter.java
...va/com/wd/workoffice/ui/adapter/WorkOrderTaskAdapter.java
+2
-0
PickTimeUtils.java
app/src/main/java/com/wd/workoffice/util/PickTimeUtils.java
+10
-0
activity_mes_fault_search.xml
app/src/main/res/layout/activity_mes_fault_search.xml
+69
-0
activity_mes_service_check_detail.xml
...src/main/res/layout/activity_mes_service_check_detail.xml
+4
-2
activity_mes_service_detail.xml
app/src/main/res/layout/activity_mes_service_detail.xml
+3
-2
activity_mes_service_fault.xml
app/src/main/res/layout/activity_mes_service_fault.xml
+11
-3
activity_mes_service_standard_detail.xml
.../main/res/layout/activity_mes_service_standard_detail.xml
+1
-1
activity_work_add_task.xml
app/src/main/res/layout/activity_work_add_task.xml
+177
-0
fg_work_order_detail.xml
app/src/main/res/layout/fg_work_order_detail.xml
+0
-0
fg_work_order_detail_plan.xml
app/src/main/res/layout/fg_work_order_detail_plan.xml
+12
-0
item_work_order_task.xml
app/src/main/res/layout/item_work_order_task.xml
+40
-0
没有找到文件。
app/src/main/AndroidManifest.xml
浏览文件 @
fee4a851
...
@@ -2656,6 +2656,16 @@
...
@@ -2656,6 +2656,16 @@
android:screenOrientation=
"portrait"
android:screenOrientation=
"portrait"
android:theme=
"@style/Work.Base"
android:theme=
"@style/Work.Base"
android:windowSoftInputMode=
"adjustPan"
/>
android:windowSoftInputMode=
"adjustPan"
/>
<activity
android:name=
".ui.activity.mes.work.WorkTaskActivity"
android:configChanges=
"orientation|screenSize|keyboardHidden"
android:label=
"新增"
android:launchMode=
"singleTop"
android:screenOrientation=
"portrait"
android:theme=
"@style/Work.Base"
android:windowSoftInputMode=
"adjustPan"
/>
<provider
<provider
android:name=
"androidx.core.content.FileProvider"
android:name=
"androidx.core.content.FileProvider"
android:authorities=
"com.wd.workoffice.fileprovider"
android:authorities=
"com.wd.workoffice.fileprovider"
...
...
app/src/main/java/com/wd/workoffice/ui/activity/mes/work/QualityWorkActivity.java
浏览文件 @
fee4a851
package
com
.
wd
.
workoffice
.
ui
.
activity
.
mes
.
work
;
package
com
.
wd
.
workoffice
.
ui
.
activity
.
mes
.
work
;
import
android.os.Bundle
;
import
android.view.MenuItem
;
import
android.view.View
;
import
android.view.View
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
...
@@ -9,17 +7,17 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
...
@@ -9,17 +7,17 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import
com.scwang.smartrefresh.layout.SmartRefreshLayout
;
import
com.scwang.smartrefresh.layout.SmartRefreshLayout
;
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.WorkToolBarActivity
;
import
com.wd.workoffice.app.WorkToolBarActivity
;
import
com.wd.workoffice.bean.
mesBean.QualityTraceabilityBean
;
import
com.wd.workoffice.bean.
event.ChangeStatus
;
import
com.wd.workoffice.bean.mesBean.WokrOrderBean
;
import
com.wd.workoffice.bean.mesBean.WokrOrderBean
;
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.activity.mes.QualityTraceabilityDetailActivity
;
import
com.wd.workoffice.ui.adapter.QualityTraceabilityAdapter
;
import
com.wd.workoffice.ui.adapter.QualityWorkAdapter
;
import
com.wd.workoffice.ui.adapter.QualityWorkAdapter
;
import
com.wd.workoffice.util.WorkUtils
;
import
com.wd.workoffice.util.WorkUtils
;
import
org.greenrobot.eventbus.EventBus
;
import
org.greenrobot.eventbus.Subscribe
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -137,4 +135,23 @@ public class QualityWorkActivity extends WorkToolBarActivity {
...
@@ -137,4 +135,23 @@ public class QualityWorkActivity extends WorkToolBarActivity {
}
}
@Override
public
void
onStart
()
{
super
.
onStart
();
EventBus
.
getDefault
().
register
(
this
);
}
@Override
public
void
onStop
()
{
super
.
onStop
();
EventBus
.
getDefault
().
unregister
(
this
);
}
@Subscribe
public
void
refresh
(
ChangeStatus
event
)
{
page
=
1
;
param
.
put
(
"pageNum"
,
page
);
getData
();
}
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/work/QualityWorkFragment.java
浏览文件 @
fee4a851
差异被折叠。
点击展开。
app/src/main/java/com/wd/workoffice/ui/activity/mes/work/WorkOrderDetailActivity.java
浏览文件 @
fee4a851
...
@@ -6,9 +6,13 @@ import android.text.TextUtils;
...
@@ -6,9 +6,13 @@ import android.text.TextUtils;
import
com.google.android.material.tabs.TabLayout
;
import
com.google.android.material.tabs.TabLayout
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.app.WorkToolBarActivity
;
import
com.wd.workoffice.app.WorkToolBarActivity
;
import
com.wd.workoffice.bean.event.ChangeStatus
;
import
com.wd.workoffice.ui.adapter.VpDataAdapter
;
import
com.wd.workoffice.ui.adapter.VpDataAdapter
;
import
com.wd.workoffice.ui.fg.MesOrderFragment
;
import
com.wd.workoffice.ui.fg.MesOrderFragment
;
import
org.greenrobot.eventbus.EventBus
;
import
org.greenrobot.eventbus.Subscribe
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
...
@@ -71,6 +75,7 @@ public class WorkOrderDetailActivity extends WorkToolBarActivity {
...
@@ -71,6 +75,7 @@ public class WorkOrderDetailActivity extends WorkToolBarActivity {
for
(
int
i
=
0
;
i
<
tab
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
tab
.
size
();
i
++)
{
tlTab
.
getTabAt
(
i
).
setText
(
tab
.
get
(
i
));
tlTab
.
getTabAt
(
i
).
setText
(
tab
.
get
(
i
));
}
}
vpData
.
setOffscreenPageLimit
(
data
.
size
());
}
}
@Override
@Override
...
@@ -82,4 +87,20 @@ public class WorkOrderDetailActivity extends WorkToolBarActivity {
...
@@ -82,4 +87,20 @@ public class WorkOrderDetailActivity extends WorkToolBarActivity {
return
R
.
layout
.
activity_order
;
return
R
.
layout
.
activity_order
;
}
}
@Override
public
void
onStart
()
{
super
.
onStart
();
EventBus
.
getDefault
().
register
(
this
);
}
@Override
public
void
onStop
()
{
super
.
onStop
();
EventBus
.
getDefault
().
unregister
(
this
);
}
@Subscribe
public
void
refresh
(
ChangeStatus
event
)
{
finish
();
}
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/work/WorkOrderFacotySearchActivity.java
0 → 100644
浏览文件 @
fee4a851
package
com
.
wd
.
workoffice
.
ui
.
activity
.
mes
.
work
;
import
android.content.Intent
;
import
android.view.View
;
import
android.widget.Button
;
import
android.widget.EditText
;
import
com.alibaba.fastjson.JSON
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.app.BaseMesBean
;
import
com.wd.workoffice.app.WorkToolBarActivity
;
import
com.wd.workoffice.bean.mesBean.FaultTypeBean
;
import
com.wd.workoffice.bean.mesBean.WorkFactoryBean
;
import
com.wd.workoffice.retrofit.RtfUtils
;
import
com.wd.workoffice.retrofit.WorkObserver
;
import
com.wd.workoffice.ui.adapter.FauliTypeAdapter
;
import
com.wd.workoffice.ui.adapter.WorkDepManageAdapter
;
import
com.wd.workoffice.ui.adapter.WorkFactoryAdapter
;
import
com.wd.workoffice.util.WorkUtils
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Map
;
import
androidx.recyclerview.widget.LinearLayoutManager
;
import
androidx.recyclerview.widget.RecyclerView
;
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
WorkOrderFacotySearchActivity
extends
WorkToolBarActivity
{
@BindView
(
R
.
id
.
et_key
)
EditText
etKey
;
@BindView
(
R
.
id
.
btn_search
)
Button
btnSearch
;
@BindView
(
R
.
id
.
rv_client
)
RecyclerView
rvClient
;
private
Map
<
String
,
Object
>
param
;
private
List
<
WorkFactoryBean
.
SitesBean
>
clientList
;
private
WorkFactoryAdapter
clientAdapter
;
private
int
page
=
1
;
private
Map
<
String
,
Object
>
paramMap
;
@Override
protected
void
initView
()
{
ButterKnife
.
bind
(
this
);
rvClient
.
setLayoutManager
(
new
LinearLayoutManager
(
this
,
RecyclerView
.
VERTICAL
,
false
));
}
@Override
protected
void
initData
()
{
clientList
=
new
ArrayList
<>();
clientAdapter
=
new
WorkFactoryAdapter
(
R
.
layout
.
item_fault_search
,
clientList
);
clientAdapter
.
bindToRecyclerView
(
rvClient
);
clientAdapter
.
setEmptyView
(
R
.
layout
.
view_empty_content
,
rvClient
);
param
=
WorkUtils
.
pageMesKey
();
paramMap
=
WorkUtils
.
simpleParam
();
// paramMap.put("parentId", getIntent().getStringExtra("id"));
param
.
put
(
"paramMap"
,
paramMap
);
param
.
put
(
"pageNum"
,
1
);
getData
();
}
private
void
getData
()
{
RtfUtils
.
getMesRtf
().
removes
(
"1"
,
WorkUtils
.
convertMapToBody
(
param
)).
compose
(
Transformer
.
schedule
()).
subscribe
(
new
WorkObserver
<
BaseMesBean
>()
{
@Override
public
void
doOnSubscribe
(
Disposable
d
)
{
}
@Override
public
void
onFail
(
String
errorMsg
)
{
hideLoading
();
toast
(
errorMsg
);
}
@Override
public
void
onSuccess
(
BaseMesBean
data
)
{
hideLoading
();
if
(!
data
.
isSuccess
())
{
toast
(
data
.
getMessage
());
return
;
}
List
<
WorkFactoryBean
.
SitesBean
>
getList
=
JSON
.
parseObject
(
data
.
getData
().
toString
(),
WorkFactoryBean
.
class
).
getSites
();
// if (page == 1) {
clientList
.
clear
();
clientList
.
addAll
(
getList
);
clientAdapter
.
notifyDataSetChanged
();
clientAdapter
.
loadMoreComplete
();
// } else {
// clientAdapter.loadMoreComplete();
// clientList.addAll(getList);
// clientAdapter.notifyDataSetChanged();
// }
// if (getList.size() == 0) {
// clientAdapter.loadMoreEnd();
// } else {
// page++;
// }
toast
(
"搜索成功"
);
}
});
}
@Override
protected
void
initEvent
()
{
// clientAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
// @Override
// public void onLoadMoreRequested() {
// param.put("pageNum", page);
// getData();
// }
// }, rvClient);
clientAdapter
.
setOnItemClickListener
(
new
BaseQuickAdapter
.
OnItemClickListener
()
{
@Override
public
void
onItemClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
Intent
intent
=
new
Intent
();
intent
.
putExtra
(
"data"
,
JSON
.
toJSONString
(
clientList
.
get
(
position
)));
setResult
(
10001
,
intent
);
finish
();
}
});
}
@Override
protected
int
layoutId
()
{
return
R
.
layout
.
activity_mes_fault_search
;
}
@OnClick
(
R
.
id
.
btn_search
)
public
void
onViewClicked
()
{
paramMap
.
put
(
"siteCode"
,
etKey
.
getText
().
toString
());
param
.
put
(
"pageNum"
,
1
);
page
=
1
;
getData
();
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/work/WorkOrderLocationSearchActivity.java
0 → 100644
浏览文件 @
fee4a851
package
com
.
wd
.
workoffice
.
ui
.
activity
.
mes
.
work
;
import
android.content.Intent
;
import
android.view.View
;
import
android.widget.Button
;
import
android.widget.EditText
;
import
com.alibaba.fastjson.JSON
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.app.BaseMesBean
;
import
com.wd.workoffice.app.WorkToolBarActivity
;
import
com.wd.workoffice.bean.mesBean.WorkFactoryBean
;
import
com.wd.workoffice.bean.mesBean.WorkLocationBean
;
import
com.wd.workoffice.retrofit.RtfUtils
;
import
com.wd.workoffice.retrofit.WorkObserver
;
import
com.wd.workoffice.ui.adapter.WorkFactoryAdapter
;
import
com.wd.workoffice.ui.adapter.WorkLocationAdapter
;
import
com.wd.workoffice.util.WorkUtils
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Map
;
import
androidx.recyclerview.widget.LinearLayoutManager
;
import
androidx.recyclerview.widget.RecyclerView
;
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
WorkOrderLocationSearchActivity
extends
WorkToolBarActivity
{
@BindView
(
R
.
id
.
et_key
)
EditText
etKey
;
@BindView
(
R
.
id
.
btn_search
)
Button
btnSearch
;
@BindView
(
R
.
id
.
rv_client
)
RecyclerView
rvClient
;
private
Map
<
String
,
Object
>
param
;
private
List
<
WorkLocationBean
.
ListBean
>
clientList
;
private
WorkLocationAdapter
clientAdapter
;
private
int
page
=
1
;
private
Map
<
String
,
Object
>
paramMap
;
@Override
protected
void
initView
()
{
ButterKnife
.
bind
(
this
);
rvClient
.
setLayoutManager
(
new
LinearLayoutManager
(
this
,
RecyclerView
.
VERTICAL
,
false
));
}
@Override
protected
void
initData
()
{
clientList
=
new
ArrayList
<>();
clientAdapter
=
new
WorkLocationAdapter
(
R
.
layout
.
item_fault_search
,
clientList
);
clientAdapter
.
bindToRecyclerView
(
rvClient
);
clientAdapter
.
setEmptyView
(
R
.
layout
.
view_empty_content
,
rvClient
);
param
=
WorkUtils
.
pageMesKey
();
paramMap
=
WorkUtils
.
simpleParam
();
paramMap
.
put
(
"siteId"
,
getIntent
().
getStringExtra
(
"id"
));
param
.
put
(
"paramMap"
,
paramMap
);
param
.
put
(
"pageNum"
,
1
);
getData
();
}
private
void
getData
()
{
RtfUtils
.
getMesRtf
().
astlocations
(
"1"
,
WorkUtils
.
convertMapToBody
(
param
)).
compose
(
Transformer
.
schedule
()).
subscribe
(
new
WorkObserver
<
BaseMesBean
>()
{
@Override
public
void
doOnSubscribe
(
Disposable
d
)
{
}
@Override
public
void
onFail
(
String
errorMsg
)
{
hideLoading
();
toast
(
errorMsg
);
}
@Override
public
void
onSuccess
(
BaseMesBean
data
)
{
hideLoading
();
if
(!
data
.
isSuccess
())
{
toast
(
data
.
getMessage
());
return
;
}
List
<
WorkLocationBean
.
ListBean
>
getList
=
JSON
.
parseObject
(
data
.
getData
().
toString
(),
WorkLocationBean
.
class
).
getList
();
if
(
page
==
1
)
{
clientList
.
clear
();
clientList
.
addAll
(
getList
);
clientAdapter
.
notifyDataSetChanged
();
clientAdapter
.
loadMoreComplete
();
}
else
{
clientAdapter
.
loadMoreComplete
();
clientList
.
addAll
(
getList
);
clientAdapter
.
notifyDataSetChanged
();
}
if
(
getList
.
size
()
==
0
)
{
clientAdapter
.
loadMoreEnd
();
}
else
{
page
++;
}
toast
(
"搜索成功"
);
}
});
}
@Override
protected
void
initEvent
()
{
clientAdapter
.
setOnLoadMoreListener
(
new
BaseQuickAdapter
.
RequestLoadMoreListener
()
{
@Override
public
void
onLoadMoreRequested
()
{
param
.
put
(
"pageNum"
,
page
);
getData
();
}
},
rvClient
);
clientAdapter
.
setOnItemClickListener
(
new
BaseQuickAdapter
.
OnItemClickListener
()
{
@Override
public
void
onItemClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
Intent
intent
=
new
Intent
();
intent
.
putExtra
(
"data"
,
JSON
.
toJSONString
(
clientList
.
get
(
position
)));
setResult
(
10001
,
intent
);
finish
();
}
});
}
@Override
protected
int
layoutId
()
{
return
R
.
layout
.
activity_mes_fault_search
;
}
@OnClick
(
R
.
id
.
btn_search
)
public
void
onViewClicked
()
{
paramMap
.
put
(
"locationName"
,
etKey
.
getText
().
toString
());
param
.
put
(
"pageNum"
,
1
);
page
=
1
;
getData
();
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/work/WorkOrderMachineSearchActivity.java
0 → 100644
浏览文件 @
fee4a851
package
com
.
wd
.
workoffice
.
ui
.
activity
.
mes
.
work
;
import
android.content.Intent
;
import
android.view.View
;
import
android.widget.Button
;
import
android.widget.EditText
;
import
com.alibaba.fastjson.JSON
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.app.BaseMesBean
;
import
com.wd.workoffice.app.WorkToolBarActivity
;
import
com.wd.workoffice.bean.mesBean.WorkLocationBean
;
import
com.wd.workoffice.bean.mesBean.WorkMachineBean
;
import
com.wd.workoffice.retrofit.RtfUtils
;
import
com.wd.workoffice.retrofit.WorkObserver
;
import
com.wd.workoffice.ui.adapter.WorkLocationAdapter
;
import
com.wd.workoffice.ui.adapter.WorkMarchineAdapter
;
import
com.wd.workoffice.util.WorkUtils
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Map
;
import
androidx.recyclerview.widget.LinearLayoutManager
;
import
androidx.recyclerview.widget.RecyclerView
;
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
WorkOrderMachineSearchActivity
extends
WorkToolBarActivity
{
@BindView
(
R
.
id
.
et_key
)
EditText
etKey
;
@BindView
(
R
.
id
.
btn_search
)
Button
btnSearch
;
@BindView
(
R
.
id
.
rv_client
)
RecyclerView
rvClient
;
private
Map
<
String
,
Object
>
param
;
private
List
<
WorkMachineBean
.
ListBean
>
clientList
;
private
WorkMarchineAdapter
clientAdapter
;
private
int
page
=
1
;
private
Map
<
String
,
Object
>
paramMap
;
@Override
protected
void
initView
()
{
ButterKnife
.
bind
(
this
);
rvClient
.
setLayoutManager
(
new
LinearLayoutManager
(
this
,
RecyclerView
.
VERTICAL
,
false
));
}
@Override
protected
void
initData
()
{
clientList
=
new
ArrayList
<>();
clientAdapter
=
new
WorkMarchineAdapter
(
R
.
layout
.
item_fault_search
,
clientList
);
clientAdapter
.
bindToRecyclerView
(
rvClient
);
clientAdapter
.
setEmptyView
(
R
.
layout
.
view_empty_content
,
rvClient
);
param
=
WorkUtils
.
pageMesKey
();
paramMap
=
WorkUtils
.
simpleParam
();
paramMap
.
put
(
"locationId"
,
getIntent
().
getStringExtra
(
"id"
));
param
.
put
(
"paramMap"
,
paramMap
);
param
.
put
(
"pageNum"
,
1
);
getData
();
}
private
void
getData
()
{
RtfUtils
.
getMesRtf
().
astasset
(
"aa8faf47c93311e98334fa163e1166bd"
,
WorkUtils
.
convertMapToBody
(
param
)).
compose
(
Transformer
.
schedule
()).
subscribe
(
new
WorkObserver
<
BaseMesBean
>()
{
@Override
public
void
doOnSubscribe
(
Disposable
d
)
{
}
@Override
public
void
onFail
(
String
errorMsg
)
{
hideLoading
();
toast
(
errorMsg
);
}
@Override
public
void
onSuccess
(
BaseMesBean
data
)
{
hideLoading
();
if
(!
data
.
isSuccess
())
{
toast
(
data
.
getMessage
());
return
;
}
List
<
WorkMachineBean
.
ListBean
>
getList
=
JSON
.
parseObject
(
data
.
getData
().
toString
(),
WorkMachineBean
.
class
).
getList
();
if
(
page
==
1
)
{
clientList
.
clear
();
clientList
.
addAll
(
getList
);
clientAdapter
.
notifyDataSetChanged
();
clientAdapter
.
loadMoreComplete
();
}
else
{
clientAdapter
.
loadMoreComplete
();
clientList
.
addAll
(
getList
);
clientAdapter
.
notifyDataSetChanged
();
}
if
(
getList
.
size
()
==
0
)
{
clientAdapter
.
loadMoreEnd
();
}
else
{
page
++;
}
toast
(
"搜索成功"
);
}
});
}
@Override
protected
void
initEvent
()
{
clientAdapter
.
setOnLoadMoreListener
(
new
BaseQuickAdapter
.
RequestLoadMoreListener
()
{
@Override
public
void
onLoadMoreRequested
()
{
param
.
put
(
"pageNum"
,
page
);
getData
();
}
},
rvClient
);
clientAdapter
.
setOnItemClickListener
(
new
BaseQuickAdapter
.
OnItemClickListener
()
{
@Override
public
void
onItemClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
Intent
intent
=
new
Intent
();
intent
.
putExtra
(
"data"
,
JSON
.
toJSONString
(
clientList
.
get
(
position
)));
setResult
(
10001
,
intent
);
finish
();
}
});
}
@Override
protected
int
layoutId
()
{
return
R
.
layout
.
activity_mes_fault_search
;
}
@OnClick
(
R
.
id
.
btn_search
)
public
void
onViewClicked
()
{
paramMap
.
put
(
"description"
,
etKey
.
getText
().
toString
());
param
.
put
(
"pageNum"
,
1
);
page
=
1
;
getData
();
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/work/WorkOrderNoSearchActivity.java
0 → 100644
浏览文件 @
fee4a851
package
com
.
wd
.
workoffice
.
ui
.
activity
.
mes
.
work
;
import
android.content.Intent
;
import
android.view.View
;
import
android.widget.Button
;
import
android.widget.EditText
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONPObject
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.app.BaseMesBean
;
import
com.wd.workoffice.app.WorkToolBarActivity
;
import
com.wd.workoffice.bean.mesBean.WorkLinkBean
;
import
com.wd.workoffice.bean.mesBean.WorkMachineBean
;
import
com.wd.workoffice.retrofit.RtfUtils
;
import
com.wd.workoffice.retrofit.WorkObserver
;
import
com.wd.workoffice.ui.adapter.WorkLinkAdapter
;
import
com.wd.workoffice.ui.adapter.WorkMarchineAdapter
;
import
com.wd.workoffice.util.WorkUtils
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Map
;
import
androidx.recyclerview.widget.LinearLayoutManager
;
import
androidx.recyclerview.widget.RecyclerView
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
import
butterknife.OnClick
;
import
flexible.xd.android_base.network.rtfhttp.Transformer
;
import
io.reactivex.Observable
;
import
io.reactivex.disposables.Disposable
;
/**
* 关联单号
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public
class
WorkOrderNoSearchActivity
extends
WorkToolBarActivity
{
@BindView
(
R
.
id
.
et_key
)
EditText
etKey
;
@BindView
(
R
.
id
.
btn_search
)
Button
btnSearch
;
@BindView
(
R
.
id
.
rv_client
)
RecyclerView
rvClient
;
private
Map
<
String
,
Object
>
param
;
private
List
<
JSONObject
>
clientList
;
private
WorkLinkAdapter
clientAdapter
;
private
int
page
=
1
;
private
Map
<
String
,
Object
>
paramMap
;
private
String
type
;
@Override
protected
void
initView
()
{
ButterKnife
.
bind
(
this
);
rvClient
.
setLayoutManager
(
new
LinearLayoutManager
(
this
,
RecyclerView
.
VERTICAL
,
false
));
}
@Override
protected
void
initData
()
{
type
=
getIntent
().
getStringExtra
(
"type"
);
clientList
=
new
ArrayList
<>();
clientAdapter
=
new
WorkLinkAdapter
(
R
.
layout
.
item_fault_search
,
clientList
);
clientAdapter
.
bindToRecyclerView
(
rvClient
);
clientAdapter
.
setEmptyView
(
R
.
layout
.
view_empty_content
,
rvClient
);
param
=
WorkUtils
.
pageMesKey
();
paramMap
=
WorkUtils
.
simpleParam
();
paramMap
.
put
(
"chooseLocation"
,
getIntent
().
getStringExtra
(
"id"
));
param
.
put
(
"paramMap"
,
paramMap
);
param
.
put
(
"pageNum"
,
1
);
getData
();
}
private
void
getData
()
{
Observable
<
BaseMesBean
>
modinspo
=
RtfUtils
.
getMesRtf
().
modinspo
(
"1"
,
WorkUtils
.
convertMapToBody
(
param
));
switch
(
type
)
{
case
"1"
:
modinspo
=
RtfUtils
.
getMesRtf
().
modinspo
(
"1"
,
WorkUtils
.
convertMapToBody
(
param
));
break
;
case
"2"
:
modinspo
=
RtfUtils
.
getMesRtf
().
spotCheckBillList
(
"1"
,
WorkUtils
.
convertMapToBody
(
param
));
break
;
case
"4"
:
modinspo
=
RtfUtils
.
getMesRtf
().
opmreportErrorList
(
"1"
,
WorkUtils
.
convertMapToBody
(
param
));
break
;
case
"5"
:
modinspo
=
RtfUtils
.
getMesRtf
().
pjmproject
(
"1"
,
WorkUtils
.
convertMapToBody
(
param
));
break
;
}
modinspo
.
compose
(
Transformer
.
schedule
()).
subscribe
(
new
WorkObserver
<
BaseMesBean
>()
{
@Override
public
void
doOnSubscribe
(
Disposable
d
)
{
}
@Override
public
void
onFail
(
String
errorMsg
)
{
hideLoading
();
toast
(
errorMsg
);
}
@Override
public
void
onSuccess
(
BaseMesBean
data
)
{
hideLoading
();
if
(!
data
.
isSuccess
())
{
toast
(
data
.
getMessage
());
return
;
}
List
<
JSONObject
>
covertList
=
new
ArrayList
<>();
switch
(
type
)
{
case
"1"
:
List
<
WorkLinkBean
.
ListBean
>
oneLinkList
=
JSON
.
parseObject
(
data
.
getData
().
toString
(),
WorkLinkBean
.
class
).
getList
();
for
(
WorkLinkBean
.
ListBean
linkBean
:
oneLinkList
)
{
JSONObject
link
=
new
JSONObject
();
link
.
put
(
"name"
,
linkBean
.
getDescription
());
link
.
put
(
"code"
,
linkBean
.
getInspoCode
());
link
.
put
(
"id"
,
linkBean
.
getId
());
covertList
.
add
(
link
);
}
break
;
case
"2"
:
List
<
WorkLinkBean
.
ListBean
>
twoList
=
JSON
.
parseObject
(
data
.
getData
().
toString
(),
WorkLinkBean
.
class
).
getList
();
for
(
WorkLinkBean
.
ListBean
linkBean
:
twoList
)
{
JSONObject
link
=
new
JSONObject
();
link
.
put
(
"name"
,
linkBean
.
getBillDescription
());
link
.
put
(
"code"
,
linkBean
.
getBillNum
());
link
.
put
(
"id"
,
linkBean
.
getId
());
covertList
.
add
(
link
);
}
break
;
case
"4"
:
List
<
WorkLinkBean
.
ListBean
>
fourList
=
JSON
.
parseObject
(
data
.
getData
().
toString
(),
WorkLinkBean
.
class
).
getList
();
for
(
WorkLinkBean
.
ListBean
linkBean
:
fourList
)
{
JSONObject
link
=
new
JSONObject
();
link
.
put
(
"name"
,
linkBean
.
getDescription
());
link
.
put
(
"code"
,
linkBean
.
getReportCode
());
link
.
put
(
"id"
,
linkBean
.
getId
());
covertList
.
add
(
link
);
}
break
;
case
"5"
:
List
<
WorkLinkBean
.
ListBean
>
fiveList
=
JSON
.
parseObject
(
data
.
getData
().
toString
(),
WorkLinkBean
.
class
).
getList
();
for
(
WorkLinkBean
.
ListBean
linkBean
:
fiveList
)
{
JSONObject
link
=
new
JSONObject
();
link
.
put
(
"name"
,
linkBean
.
getDescription
());
link
.
put
(
"code"
,
linkBean
.
getProjectCode
());
link
.
put
(
"id"
,
linkBean
.
getId
());
covertList
.
add
(
link
);
}
break
;
}
if
(
page
==
1
)
{
clientList
.
clear
();
clientList
.
addAll
(
covertList
);
clientAdapter
.
notifyDataSetChanged
();
clientAdapter
.
loadMoreComplete
();
}
else
{
clientAdapter
.
loadMoreComplete
();
clientList
.
addAll
(
covertList
);
clientAdapter
.
notifyDataSetChanged
();
}
if
(
covertList
.
size
()
==
0
)
{
clientAdapter
.
loadMoreEnd
();
}
else
{
page
++;
}
toast
(
"搜索成功"
);
}
});
}
@Override
protected
void
initEvent
()
{
clientAdapter
.
setOnLoadMoreListener
(
new
BaseQuickAdapter
.
RequestLoadMoreListener
()
{
@Override
public
void
onLoadMoreRequested
()
{
param
.
put
(
"pageNum"
,
page
);
getData
();
}
},
rvClient
);
clientAdapter
.
setOnItemClickListener
(
new
BaseQuickAdapter
.
OnItemClickListener
()
{
@Override
public
void
onItemClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
Intent
intent
=
new
Intent
();
intent
.
putExtra
(
"data"
,
JSON
.
toJSONString
(
clientList
.
get
(
position
)));
setResult
(
10001
,
intent
);
finish
();
}
});
}
@Override
protected
int
layoutId
()
{
return
R
.
layout
.
activity_mes_fault_search
;
}
@OnClick
(
R
.
id
.
btn_search
)
public
void
onViewClicked
()
{
paramMap
.
put
(
"description"
,
etKey
.
getText
().
toString
());
param
.
put
(
"pageNum"
,
1
);
page
=
1
;
getData
();
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/FauliTypeAdapter.java
0 → 100644
浏览文件 @
fee4a851
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.mesBean.FaultTypeBean
;
import
java.util.List
;
/**
* Created by flexible on 2018/8/13.
*/
public
class
FauliTypeAdapter
extends
BaseQuickAdapter
<
FaultTypeBean
.
ListBean
,
BaseViewHolder
>
{
public
FauliTypeAdapter
(
int
layoutResId
,
List
data
)
{
super
(
layoutResId
,
data
);
}
@Override
protected
void
convert
(
BaseViewHolder
helper
,
FaultTypeBean
.
ListBean
item
)
{
helper
.
setText
(
R
.
id
.
tv_content1
,
item
.
getFailureCode
());
helper
.
setText
(
R
.
id
.
tv_content2
,
item
.
getDescription
());
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/MesServiceStandardAdapter.java
浏览文件 @
fee4a851
...
@@ -30,15 +30,19 @@ public class MesServiceStandardAdapter extends BaseQuickAdapter<ServiceStandardB
...
@@ -30,15 +30,19 @@ public class MesServiceStandardAdapter extends BaseQuickAdapter<ServiceStandardB
@Override
@Override
protected
void
convert
(
BaseViewHolder
helper
,
ServiceStandardBean
.
ListBean
item
)
{
protected
void
convert
(
BaseViewHolder
helper
,
ServiceStandardBean
.
ListBean
item
)
{
if
(
TextUtils
.
isEmpty
(
type
)){
if
(
TextUtils
.
isEmpty
(
type
))
{
helper
.
setText
(
R
.
id
.
tv_name
,
String
.
format
(
"检查项目:%s"
,
item
.
getCheckProject
()));
helper
.
setText
(
R
.
id
.
tv_name
,
String
.
format
(
"检查项目:%s"
,
item
.
getCheckProject
()));
if
(!
TextUtils
.
isEmpty
(
item
.
getStatus
()))
{
helper
.
setText
(
R
.
id
.
tv_status
,
TextUtils
.
equals
(
item
.
getStatus
(),
"1"
)
?
"异常"
:
"正常"
);
//1 异常 0正常
helper
.
setText
(
R
.
id
.
tv_status
,
TextUtils
.
equals
(
item
.
getStatus
(),
"1"
)
?
"异常"
:
"正常"
);
//1 异常 0正常
}
helper
.
setText
(
R
.
id
.
tv_content1
,
item
.
getProcessStandard
());
helper
.
setText
(
R
.
id
.
tv_content1
,
item
.
getProcessStandard
());
helper
.
setText
(
R
.
id
.
tv_content2
,
item
.
getMeasurementUnit
());
helper
.
setText
(
R
.
id
.
tv_content2
,
item
.
getMeasurementUnit
());
helper
.
setText
(
R
.
id
.
tv_content3
,
item
.
getFailureCode
());
helper
.
setText
(
R
.
id
.
tv_content3
,
item
.
getFailureCode
());
}
else
{
}
else
{
helper
.
setText
(
R
.
id
.
tv_name
,
String
.
format
(
"检查项目:%s"
,
item
.
getInspoProDescription
()));
helper
.
setText
(
R
.
id
.
tv_name
,
String
.
format
(
"检查项目:%s"
,
item
.
getInspoProDescription
()));
if
(!
TextUtils
.
isEmpty
(
item
.
getStatus
()))
{
helper
.
setText
(
R
.
id
.
tv_status
,
TextUtils
.
equals
(
item
.
getStatus
(),
"1"
)
?
"异常"
:
"正常"
);
//1 异常 0正常
helper
.
setText
(
R
.
id
.
tv_status
,
TextUtils
.
equals
(
item
.
getStatus
(),
"1"
)
?
"异常"
:
"正常"
);
//1 异常 0正常
}
helper
.
setText
(
R
.
id
.
tv_content1
,
item
.
getProcessStandard
());
helper
.
setText
(
R
.
id
.
tv_content1
,
item
.
getProcessStandard
());
helper
.
setText
(
R
.
id
.
tv_content2
,
item
.
getUint
());
helper
.
setText
(
R
.
id
.
tv_content2
,
item
.
getUint
());
helper
.
setText
(
R
.
id
.
tv_content3
,
item
.
getReportCode
());
helper
.
setText
(
R
.
id
.
tv_content3
,
item
.
getReportCode
());
...
...
app/src/main/java/com/wd/workoffice/ui/adapter/WorkFactoryAdapter.java
0 → 100644
浏览文件 @
fee4a851
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.mesBean.FaultTypeBean
;
import
com.wd.workoffice.bean.mesBean.WorkFactoryBean
;
import
java.util.List
;
/**
* Created by flexible on 2018/8/13.
*/
public
class
WorkFactoryAdapter
extends
BaseQuickAdapter
<
WorkFactoryBean
.
SitesBean
,
BaseViewHolder
>
{
public
WorkFactoryAdapter
(
int
layoutResId
,
List
data
)
{
super
(
layoutResId
,
data
);
}
@Override
protected
void
convert
(
BaseViewHolder
helper
,
WorkFactoryBean
.
SitesBean
item
)
{
helper
.
setText
(
R
.
id
.
tv_content1
,
item
.
getSiteCode
());
helper
.
setText
(
R
.
id
.
tv_content2
,
item
.
getSiteName
());
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/WorkLinkAdapter.java
0 → 100644
浏览文件 @
fee4a851
package
com
.
wd
.
workoffice
.
ui
.
adapter
;
import
com.alibaba.fastjson.JSONObject
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.chad.library.adapter.base.BaseViewHolder
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.bean.mesBean.WorkLinkBean
;
import
com.wd.workoffice.bean.mesBean.WorkMachineBean
;
import
java.util.List
;
/**
* Created by flexible on 2018/8/13.
*/
public
class
WorkLinkAdapter
extends
BaseQuickAdapter
<
JSONObject
,
BaseViewHolder
>
{
public
WorkLinkAdapter
(
int
layoutResId
,
List
data
)
{
super
(
layoutResId
,
data
);
}
@Override
protected
void
convert
(
BaseViewHolder
helper
,
JSONObject
item
)
{
helper
.
setText
(
R
.
id
.
tv_content1
,
item
.
getString
(
"name"
));
helper
.
setText
(
R
.
id
.
tv_content2
,
item
.
getString
(
"code"
));
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/WorkLocationAdapter.java
0 → 100644
浏览文件 @
fee4a851
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.mesBean.FaultTypeBean
;
import
com.wd.workoffice.bean.mesBean.WorkLocationBean
;
import
java.util.List
;
/**
* Created by flexible on 2018/8/13.
*/
public
class
WorkLocationAdapter
extends
BaseQuickAdapter
<
WorkLocationBean
.
ListBean
,
BaseViewHolder
>
{
public
WorkLocationAdapter
(
int
layoutResId
,
List
data
)
{
super
(
layoutResId
,
data
);
}
@Override
protected
void
convert
(
BaseViewHolder
helper
,
WorkLocationBean
.
ListBean
item
)
{
helper
.
setText
(
R
.
id
.
tv_content1
,
item
.
getLocationCode
());
helper
.
setText
(
R
.
id
.
tv_content2
,
item
.
getLocationName
());
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/WorkMarchineAdapter.java
0 → 100644
浏览文件 @
fee4a851
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.mesBean.WorkLocationBean
;
import
com.wd.workoffice.bean.mesBean.WorkMachineBean
;
import
java.util.List
;
/**
* Created by flexible on 2018/8/13.
*/
public
class
WorkMarchineAdapter
extends
BaseQuickAdapter
<
WorkMachineBean
.
ListBean
,
BaseViewHolder
>
{
public
WorkMarchineAdapter
(
int
layoutResId
,
List
data
)
{
super
(
layoutResId
,
data
);
}
@Override
protected
void
convert
(
BaseViewHolder
helper
,
WorkMachineBean
.
ListBean
item
)
{
helper
.
setText
(
R
.
id
.
tv_content1
,
item
.
getAssetCode
());
helper
.
setText
(
R
.
id
.
tv_content2
,
item
.
getDescription
());
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/WorkOrderTaskAdapter.java
浏览文件 @
fee4a851
...
@@ -27,6 +27,8 @@ public class WorkOrderTaskAdapter extends BaseQuickAdapter<WorkTaskBean.ListBean
...
@@ -27,6 +27,8 @@ public class WorkOrderTaskAdapter extends BaseQuickAdapter<WorkTaskBean.ListBean
helper
.
setText
(
R
.
id
.
tv_status
,
WorkOrder
.
getNameByCode
(
item
.
getStatus
()));
helper
.
setText
(
R
.
id
.
tv_status
,
WorkOrder
.
getNameByCode
(
item
.
getStatus
()));
helper
.
setText
(
R
.
id
.
tv_desc
,
item
.
getDescription
());
helper
.
setText
(
R
.
id
.
tv_desc
,
item
.
getDescription
());
helper
.
setText
(
R
.
id
.
tv_time
,
item
.
getTime
()+
""
);
helper
.
setText
(
R
.
id
.
tv_time
,
item
.
getTime
()+
""
);
helper
.
addOnClickListener
(
R
.
id
.
tv_delete
);
helper
.
addOnClickListener
(
R
.
id
.
tv_edit
);
}
}
}
}
app/src/main/java/com/wd/workoffice/util/PickTimeUtils.java
浏览文件 @
fee4a851
...
@@ -55,4 +55,14 @@ public class PickTimeUtils {
...
@@ -55,4 +55,14 @@ public class PickTimeUtils {
setSubCalSize
(
16
);
setSubCalSize
(
16
);
return
pvTime
.
build
();
return
pvTime
.
build
();
}
}
public
static
TimePickerView
showPickTime
(
Context
ctx
,
OnTimeSelectListener
listener
,
boolean
todayStart
)
{
TimePickerBuilder
pvTime
=
new
TimePickerBuilder
(
ctx
,
listener
);
if
(
todayStart
)
{
pvTime
.
setRangDate
(
Calendar
.
getInstance
(),
null
);
}
pvTime
.
setType
(
new
boolean
[]{
false
,
false
,
false
,
true
,
true
,
true
}).
setTitleSize
(
16
).
setContentTextSize
(
16
).
setSubCalSize
(
16
);
// .setRangDate(startDate, endDate);
return
pvTime
.
build
();
}
}
}
app/src/main/res/layout/activity_mes_fault_search.xml
0 → 100644
浏览文件 @
fee4a851
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
<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:background=
"@color/white"
android:orientation=
"horizontal"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"10mm"
>
<LinearLayout
android:layout_width=
"0dp"
android:layout_height=
"match_parent"
android:layout_weight=
"1"
android:background=
"@drawable/shape_client_search"
android:gravity=
"center_vertical"
android:paddingHorizontal=
"10mm"
>
<ImageView
android:layout_width=
"15mm"
android:layout_height=
"15mm"
android:src=
"@mipmap/client_search"
/>
<EditText
android:id=
"@+id/et_key"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_marginLeft=
"2mm"
android:background=
"@null"
android:hint=
"搜索"
android:textColor=
"#91ABBA"
android:textColorHint=
"#91ABBA"
android:textSize=
"14sp"
/>
</LinearLayout>
<Button
android:id=
"@+id/btn_search"
android:layout_width=
"60mm"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"10mm"
android:background=
"@color/mainTextColor"
android:text=
"搜索"
android:textColor=
"@color/white"
android:textSize=
"16sp"
/>
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_client"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_marginTop=
"4mm"
>
</androidx.recyclerview.widget.RecyclerView>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/activity_mes_service_check_detail.xml
浏览文件 @
fee4a851
...
@@ -188,9 +188,11 @@
...
@@ -188,9 +188,11 @@
android:textSize=
"14sp"
/>
android:textSize=
"14sp"
/>
</RelativeLayout>
</RelativeLayout>
<View
style=
"@style/dividerX"
/>
<View
style=
"@style/dividerX"
android:visibility=
"gone"
/>
<RelativeLayout
<RelativeLayout
android:visibility=
"gone"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:layout_gravity=
"center"
...
@@ -449,7 +451,7 @@
...
@@ -449,7 +451,7 @@
<androidx.recyclerview.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_data"
android:id=
"@+id/rv_data"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"
wrap_cont
ent"
/>
android:layout_height=
"
match_par
ent"
/>
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</androidx.core.widget.NestedScrollView>
...
...
app/src/main/res/layout/activity_mes_service_detail.xml
浏览文件 @
fee4a851
...
@@ -300,6 +300,7 @@
...
@@ -300,6 +300,7 @@
android:textSize=
"16sp"
/>
android:textSize=
"16sp"
/>
<RelativeLayout
<RelativeLayout
android:visibility=
"gone"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:layout_gravity=
"center"
...
@@ -326,6 +327,7 @@
...
@@ -326,6 +327,7 @@
<View
style=
"@style/dividerX"
/>
<View
style=
"@style/dividerX"
/>
<RelativeLayout
<RelativeLayout
android:visibility=
"gone"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:layout_gravity=
"center"
...
@@ -352,7 +354,6 @@
...
@@ -352,7 +354,6 @@
<View
style=
"@style/dividerX"
/>
<View
style=
"@style/dividerX"
/>
<RelativeLayout
<RelativeLayout
android:visibility=
"gone"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:layout_gravity=
"center"
...
@@ -379,7 +380,7 @@
...
@@ -379,7 +380,7 @@
<View
style=
"@style/dividerX"
/>
<View
style=
"@style/dividerX"
/>
<RelativeLayout
<RelativeLayout
android:visibility=
"gone"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:layout_gravity=
"center"
...
...
app/src/main/res/layout/activity_mes_service_fault.xml
浏览文件 @
fee4a851
...
@@ -220,6 +220,7 @@
...
@@ -220,6 +220,7 @@
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_alignParentRight=
"true"
android:text=
"待提交"
android:textColor=
"@color/flexible_text_gray"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
android:textSize=
"14sp"
/>
</RelativeLayout>
</RelativeLayout>
...
@@ -417,7 +418,8 @@
...
@@ -417,7 +418,8 @@
<View
style=
"@style/dividerX"
/>
<View
style=
"@style/dividerX"
/>
<RelativeLayout
<LinearLayout
android:id=
"@+id/ll_recover_time"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:layout_gravity=
"center"
...
@@ -434,12 +436,18 @@
...
@@ -434,12 +436,18 @@
<TextView
<TextView
android:id=
"@+id/tv_recover_time"
android:id=
"@+id/tv_recover_time"
android:layout_width=
"wrap_content"
android:layout_width=
"0dp"
android:layout_weight=
"1"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:gravity=
"right"
android:layout_alignParentRight=
"true"
android:layout_alignParentRight=
"true"
android:textColor=
"@color/flexible_text_gray"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
android:textSize=
"14sp"
/>
</RelativeLayout>
<ImageView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:src=
"@mipmap/arrow_right_gray"
/>
</LinearLayout>
<View
style=
"@style/dividerX"
/>
<View
style=
"@style/dividerX"
/>
...
...
app/src/main/res/layout/activity_mes_service_standard_detail.xml
浏览文件 @
fee4a851
...
@@ -213,7 +213,7 @@
...
@@ -213,7 +213,7 @@
<TextView
<TextView
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"
设备故障活
故障代码"
android:text=
"
缺陷或
故障代码"
android:textSize=
"14sp"
/>
android:textSize=
"14sp"
/>
<TextView
<TextView
...
...
app/src/main/res/layout/activity_work_add_task.xml
0 → 100644
浏览文件 @
fee4a851
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
<LinearLayout
android:id=
"@+id/ll_bottom"
android:layout_width=
"match_parent"
android:layout_height=
"60mm"
android:layout_alignParentBottom=
"true"
android:gravity=
"center"
android:orientation=
"horizontal"
>
<TextView
android:id=
"@+id/tv_cancel"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginRight=
"10mm"
android:background=
"@color/blue_btn"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"5mm"
android:text=
"取消"
android:textColor=
"@color/white"
/>
<TextView
android:id=
"@+id/tv_save"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginRight=
"10mm"
android:background=
"@color/blue_btn"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"5mm"
android:text=
"保存"
android:textColor=
"@color/white"
/>
</LinearLayout>
<androidx.core.widget.NestedScrollView
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_above=
"@id/ll_bottom"
android:background=
"@color/white"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_above=
"@id/ll_bottom"
android:orientation=
"vertical"
android:paddingBottom=
"20mm"
>
<TextView
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@color/flexible_background"
android:paddingVertical=
"10mm"
android:paddingLeft=
"10mm"
android:text=
"基本信息"
android:textSize=
"16sp"
/>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:background=
"@color/white"
android:gravity=
"center"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"15mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"任务号"
android:textSize=
"14sp"
/>
<TextView
android:id=
"@+id/tv_no"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
</RelativeLayout>
<View
style=
"@style/dividerX"
/>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:background=
"@color/white"
android:gravity=
"center"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"15mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"描述"
android:textSize=
"14sp"
/>
<EditText
android:id=
"@+id/tv_desc"
android:layout_width=
"0dp"
android:layout_weight=
"1"
android:background=
"@null"
android:hint=
"请输入"
android:gravity=
"right"
android:layout_height=
"wrap_content"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
</LinearLayout>
<View
style=
"@style/dividerX"
/>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:background=
"@color/white"
android:gravity=
"center"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"15mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"估计持续时间(h)"
android:textSize=
"14sp"
/>
<EditText
android:id=
"@+id/tv_time"
android:layout_width=
"0dp"
android:layout_weight=
"1"
android:background=
"@null"
android:hint=
"请输入"
android:gravity=
"right"
android:layout_height=
"wrap_content"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
</LinearLayout>
<View
style=
"@style/dividerX"
/>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:background=
"@color/white"
android:gravity=
"center"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"15mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"状态"
android:textSize=
"14sp"
/>
<TextView
android:id=
"@+id/tv_status"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:text=
"草稿"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
</RelativeLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</RelativeLayout>
app/src/main/res/layout/fg_work_order_detail.xml
浏览文件 @
fee4a851
差异被折叠。
点击展开。
app/src/main/res/layout/fg_work_order_detail_plan.xml
浏览文件 @
fee4a851
...
@@ -136,6 +136,18 @@
...
@@ -136,6 +136,18 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
android:layout_height=
"wrap_content"
/>
<TextView
android:id=
"@+id/tv_add_task"
android:layout_width=
"150mm"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center_horizontal"
android:gravity=
"center"
android:background=
"@color/blue_btn"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"5mm"
android:text=
"新建工单任务"
android:textColor=
"@color/white"
/>
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</androidx.core.widget.NestedScrollView>
</RelativeLayout>
</RelativeLayout>
app/src/main/res/layout/item_work_order_task.xml
浏览文件 @
fee4a851
...
@@ -123,5 +123,44 @@
...
@@ -123,5 +123,44 @@
android:textSize=
"14sp"
/>
android:textSize=
"14sp"
/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id=
"@+id/ll_btn"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:gravity=
"right"
android:background=
"@color/white"
android:orientation=
"horizontal"
android:layout_marginTop=
"10mm"
android:paddingHorizontal=
"10mm"
>
<TextView
android:id=
"@+id/tv_delete"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center_horizontal"
android:gravity=
"center"
android:layout_marginRight=
"10mm"
android:background=
"@color/blue_btn"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"5mm"
android:text=
"删除"
android:textColor=
"@color/white"
/>
<TextView
android:id=
"@+id/tv_edit"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center_horizontal"
android:gravity=
"center"
android:background=
"@color/blue_btn"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"5mm"
android:text=
"编辑"
android:textColor=
"@color/white"
/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论