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
fe42132b
提交
fe42132b
authored
5月 06, 2020
作者:
lgd
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.编辑
2.//TODO erp用户是否选择新部门为空,质检接口数据无对应问题,内部交易订单审核,审核规则,领用申请列表/退件列表/参数,坩埚下单,mes,刷新token,编辑任务担当无法修改.供应商接口,
上级
139d9d4b
隐藏空白字符变更
内嵌
并排
正在显示
10 个修改的文件
包含
1705 行增加
和
177 行删除
+1705
-177
ModifyUserDataEvent.java
...ava/com/wd/workoffice/bean/event/ModifyUserDataEvent.java
+11
-0
MesChooseClientActivity.java
...koffice/ui/activity/mes/user/MesChooseClientActivity.java
+0
-1
MesUserDataDetailActivity.java
...ffice/ui/activity/mes/user/MesUserDataDetailActivity.java
+12
-6
MesUserDataDetailModifyActivity.java
...ui/activity/mes/user/MesUserDataDetailModifyActivity.java
+311
-166
UserDataDetailFactory1Adapter.java
.../workoffice/ui/adapter/UserDataDetailFactory1Adapter.java
+31
-0
UserDataDetailFactory2Adapter.java
.../workoffice/ui/adapter/UserDataDetailFactory2Adapter.java
+29
-0
activity_mes_user_data_detail.xml
app/src/main/res/layout/activity_mes_user_data_detail.xml
+4
-4
activity_mes_user_data_detail_modify.xml
.../main/res/layout/activity_mes_user_data_detail_modify.xml
+1253
-0
item_user_detail_factory1.xml
app/src/main/res/layout/item_user_detail_factory1.xml
+24
-0
item_user_detail_factory2.xml
app/src/main/res/layout/item_user_detail_factory2.xml
+30
-0
没有找到文件。
app/src/main/java/com/wd/workoffice/bean/event/ModifyUserDataEvent.java
0 → 100644
浏览文件 @
fe42132b
package
com
.
wd
.
workoffice
.
bean
.
event
;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public
class
ModifyUserDataEvent
{
public
ModifyUserDataEvent
()
{
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseClientActivity.java
浏览文件 @
fe42132b
...
@@ -142,7 +142,6 @@ public class MesChooseClientActivity extends WorkToolBarActivity {
...
@@ -142,7 +142,6 @@ public class MesChooseClientActivity extends WorkToolBarActivity {
userDataBean
.
setSalesManagerName
(
chooseClient
.
getSalesManagerName
());
userDataBean
.
setSalesManagerName
(
chooseClient
.
getSalesManagerName
());
startActivity
(
MesUserDataAdd2Activity
.
class
,
"data"
,
JSON
.
toJSONString
(
userDataBean
));
startActivity
(
MesUserDataAdd2Activity
.
class
,
"data"
,
JSON
.
toJSONString
(
userDataBean
));
}
}
}
}
});
});
}
}
...
...
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailActivity.java
浏览文件 @
fe42132b
...
@@ -19,6 +19,7 @@ import com.wd.workoffice.app.BaseMesBean;
...
@@ -19,6 +19,7 @@ import com.wd.workoffice.app.BaseMesBean;
import
com.wd.workoffice.app.WorkToolBarActivity
;
import
com.wd.workoffice.app.WorkToolBarActivity
;
import
com.wd.workoffice.bean.AccountBean
;
import
com.wd.workoffice.bean.AccountBean
;
import
com.wd.workoffice.bean.event.AddUserDataEvent
;
import
com.wd.workoffice.bean.event.AddUserDataEvent
;
import
com.wd.workoffice.bean.event.ModifyUserDataEvent
;
import
com.wd.workoffice.bean.event.RefreshMachineEvent
;
import
com.wd.workoffice.bean.event.RefreshMachineEvent
;
import
com.wd.workoffice.bean.mesBean.FactoryDetailBean
;
import
com.wd.workoffice.bean.mesBean.FactoryDetailBean
;
import
com.wd.workoffice.bean.mesBean.MachineDetailBean
;
import
com.wd.workoffice.bean.mesBean.MachineDetailBean
;
...
@@ -28,6 +29,8 @@ import com.wd.workoffice.retrofit.WorkObserver;
...
@@ -28,6 +29,8 @@ import com.wd.workoffice.retrofit.WorkObserver;
import
com.wd.workoffice.ui.adapter.UserDataAdd3Adapter
;
import
com.wd.workoffice.ui.adapter.UserDataAdd3Adapter
;
import
com.wd.workoffice.ui.adapter.UserDataAdd3LabelAdapter
;
import
com.wd.workoffice.ui.adapter.UserDataAdd3LabelAdapter
;
import
com.wd.workoffice.ui.adapter.UserDataAdd3RefAdapter
;
import
com.wd.workoffice.ui.adapter.UserDataAdd3RefAdapter
;
import
com.wd.workoffice.ui.adapter.UserDataDetailFactory1Adapter
;
import
com.wd.workoffice.ui.adapter.UserDataDetailFactory2Adapter
;
import
com.wd.workoffice.ui.adapter.UserDataMachineAdapter
;
import
com.wd.workoffice.ui.adapter.UserDataMachineAdapter
;
import
com.wd.workoffice.util.WorkUtils
;
import
com.wd.workoffice.util.WorkUtils
;
...
@@ -173,7 +176,6 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
...
@@ -173,7 +176,6 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
RecyclerView
rvData6
;
RecyclerView
rvData6
;
@BindView
(
R
.
id
.
tv_add6
)
@BindView
(
R
.
id
.
tv_add6
)
TextView
tvAdd6
;
TextView
tvAdd6
;
private
AccountBean
dataBean
;
private
UserDataMachineAdapter
data1Adapter
;
private
UserDataMachineAdapter
data1Adapter
;
private
UserDataMachineAdapter
data2Adapter
;
private
UserDataMachineAdapter
data2Adapter
;
private
UserDataMachineAdapter
data3Adapter
;
private
UserDataMachineAdapter
data3Adapter
;
...
@@ -186,8 +188,8 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
...
@@ -186,8 +188,8 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
private
List
<
FactoryDetailBean
.
SteelFurnListBean
>
dataFactory1List
;
private
List
<
FactoryDetailBean
.
SteelFurnListBean
>
dataFactory1List
;
private
List
<
FactoryDetailBean
.
SteelRefFurnListBean
>
dataFactory2List
;
private
List
<
FactoryDetailBean
.
SteelRefFurnListBean
>
dataFactory2List
;
private
List
<
FactoryDetailBean
.
SteelLadleListBean
>
dataFactory3List
;
private
List
<
FactoryDetailBean
.
SteelLadleListBean
>
dataFactory3List
;
private
UserData
Add3
Adapter
factory1Adapter
;
private
UserData
DetailFactory1
Adapter
factory1Adapter
;
private
UserData
Add3Ref
Adapter
factory2Adapter
;
private
UserData
DetailFactory2
Adapter
factory2Adapter
;
private
UserDataAdd3LabelAdapter
factory3Adapter
;
private
UserDataAdd3LabelAdapter
factory3Adapter
;
private
UserDataMachineAdapter
data5Adapter
;
private
UserDataMachineAdapter
data5Adapter
;
private
UserDataMachineAdapter
data6Adapter
;
private
UserDataMachineAdapter
data6Adapter
;
...
@@ -241,8 +243,8 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
...
@@ -241,8 +243,8 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
dataFactory1List
=
new
ArrayList
<>();
dataFactory1List
=
new
ArrayList
<>();
dataFactory2List
=
new
ArrayList
<>();
dataFactory2List
=
new
ArrayList
<>();
dataFactory3List
=
new
ArrayList
<>();
dataFactory3List
=
new
ArrayList
<>();
factory1Adapter
=
new
UserData
Add3Adapter
(
R
.
layout
.
item_user_add3
,
dataFactory1List
);
factory1Adapter
=
new
UserData
DetailFactory1Adapter
(
R
.
layout
.
item_user_detail_factory1
,
dataFactory1List
);
factory2Adapter
=
new
UserData
Add3RefAdapter
(
R
.
layout
.
item_user_add3
,
dataFactory2List
);
factory2Adapter
=
new
UserData
DetailFactory2Adapter
(
R
.
layout
.
item_user_detail_factory2
,
dataFactory2List
);
factory3Adapter
=
new
UserDataAdd3LabelAdapter
(
R
.
layout
.
item_add3_label
,
dataFactory3List
);
factory3Adapter
=
new
UserDataAdd3LabelAdapter
(
R
.
layout
.
item_add3_label
,
dataFactory3List
);
factory1Adapter
.
bindToRecyclerView
(
rvFactoryData1
);
factory1Adapter
.
bindToRecyclerView
(
rvFactoryData1
);
factory2Adapter
.
bindToRecyclerView
(
rvFactoryData2
);
factory2Adapter
.
bindToRecyclerView
(
rvFactoryData2
);
...
@@ -638,8 +640,12 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
...
@@ -638,8 +640,12 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
EventBus
.
getDefault
().
unregister
(
this
);
EventBus
.
getDefault
().
unregister
(
this
);
}
}
// @Subscribe
// public void refresh(RefreshMachineEvent event) {
// getData();
// }
@Subscribe
@Subscribe
public
void
refresh
(
RefreshMachine
Event
event
)
{
public
void
refresh
(
ModifyUserData
Event
event
)
{
getData
();
getData
();
}
}
...
...
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailModifyActivity.java
浏览文件 @
fe42132b
package
com
.
wd
.
workoffice
.
ui
.
activity
.
mes
.
user
;
package
com
.
wd
.
workoffice
.
ui
.
activity
.
mes
.
user
;
import
android.content.Intent
;
import
android.text.TextUtils
;
import
android.view.LayoutInflater
;
import
android.view.LayoutInflater
;
import
android.view.Menu
;
import
android.view.Menu
;
import
android.view.MenuItem
;
import
android.view.MenuItem
;
...
@@ -14,26 +12,27 @@ import android.widget.RelativeLayout;
...
@@ -14,26 +12,27 @@ import android.widget.RelativeLayout;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
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.WorkToolBarActivity
;
import
com.wd.workoffice.app.WorkToolBarActivity
;
import
com.wd.workoffice.bean.AccountBean
;
import
com.wd.workoffice.bean.event.AddFactoryEvent
;
import
com.wd.workoffice.bean.event.AddMachineAddChildEvent
;
import
com.wd.workoffice.bean.event.AddMachineEvent
;
import
com.wd.workoffice.bean.event.AddMachineModifyChildEvent
;
import
com.wd.workoffice.bean.event.AddUserDataEvent
;
import
com.wd.workoffice.bean.event.AddUserDataEvent
;
import
com.wd.workoffice.bean.event.ModifyUserDataEvent
;
import
com.wd.workoffice.bean.event.RefreshMachineEvent
;
import
com.wd.workoffice.bean.event.RefreshMachineEvent
;
import
com.wd.workoffice.bean.mesBean.FactoryBean
;
import
com.wd.workoffice.bean.mesBean.FactoryDetailBean
;
import
com.wd.workoffice.bean.mesBean.FactoryDetailBean
;
import
com.wd.workoffice.bean.mesBean.MachineBean
;
import
com.wd.workoffice.bean.mesBean.MachineDetailBean
;
import
com.wd.workoffice.bean.mesBean.MachineDetailBean
;
import
com.wd.workoffice.bean.mesBean.MesClientBean
;
import
com.wd.workoffice.bean.mesBean.UserDataBean
;
import
com.wd.workoffice.bean.mesBean.UserDataDetailBean
;
import
com.wd.workoffice.bean.mesBean.UserDataDetailBean
;
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.UserDataAdd3Adapter
;
import
com.wd.workoffice.ui.adapter.UserDataAdd3Adapter
;
import
com.wd.workoffice.ui.adapter.UserDataAdd3LabelAdapter
;
import
com.wd.workoffice.ui.adapter.UserDataAdd3LabelAdapter
;
import
com.wd.workoffice.ui.adapter.UserDataAdd3RefAdapter
;
import
com.wd.workoffice.ui.adapter.UserDataAdd3RefAdapter
;
import
com.wd.workoffice.ui.adapter.UserDataDetailFactory1Adapter
;
import
com.wd.workoffice.ui.adapter.UserDataDetailFactory2Adapter
;
import
com.wd.workoffice.ui.adapter.UserDataMachineAdapter
;
import
com.wd.workoffice.ui.adapter.UserDataMachineAdapter
;
import
com.wd.workoffice.util.WorkUtils
;
import
com.wd.workoffice.util.WorkUtils
;
...
@@ -44,7 +43,6 @@ import java.util.ArrayList;
...
@@ -44,7 +43,6 @@ import java.util.ArrayList;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
androidx.annotation.Nullable
;
import
androidx.appcompat.app.AlertDialog
;
import
androidx.appcompat.app.AlertDialog
;
import
androidx.recyclerview.widget.LinearLayoutManager
;
import
androidx.recyclerview.widget.LinearLayoutManager
;
import
androidx.recyclerview.widget.RecyclerView
;
import
androidx.recyclerview.widget.RecyclerView
;
...
@@ -67,7 +65,7 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
...
@@ -67,7 +65,7 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
@BindView
(
R
.
id
.
btn_refuse
)
@BindView
(
R
.
id
.
btn_refuse
)
Button
btnRefuse
;
Button
btnRefuse
;
@BindView
(
R
.
id
.
btn_agree
)
@BindView
(
R
.
id
.
btn_agree
)
Button
btn
Reviews
;
Button
btn
Agree
;
@BindView
(
R
.
id
.
ll_bottom
)
@BindView
(
R
.
id
.
ll_bottom
)
LinearLayout
llBottom
;
LinearLayout
llBottom
;
@BindView
(
R
.
id
.
tv_reason
)
@BindView
(
R
.
id
.
tv_reason
)
...
@@ -87,69 +85,75 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
...
@@ -87,69 +85,75 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
@BindView
(
R
.
id
.
iv_modify_steel
)
@BindView
(
R
.
id
.
iv_modify_steel
)
ImageView
ivModifySteel
;
ImageView
ivModifySteel
;
@BindView
(
R
.
id
.
tv_factory
)
@BindView
(
R
.
id
.
tv_factory
)
TextView
tvFactory
;
EditText
tvFactory
;
@BindView
(
R
.
id
.
tv_num
)
@BindView
(
R
.
id
.
tv_num
)
TextView
tvNum
;
EditText
tvNum
;
@BindView
(
R
.
id
.
tv_type
)
@BindView
(
R
.
id
.
tv_type
)
TextView
tvType
;
EditText
tvType
;
@BindView
(
R
.
id
.
tv_factory_desc1
)
TextView
tvFactoryDesc1
;
@BindView
(
R
.
id
.
rv_factory_data1
)
@BindView
(
R
.
id
.
rv_factory_data1
)
RecyclerView
rvFactoryData1
;
RecyclerView
rvFactoryData1
;
@BindView
(
R
.
id
.
tv_factory_desc2
)
TextView
tvFactoryDesc2
;
@BindView
(
R
.
id
.
rv_factory_data2
)
@BindView
(
R
.
id
.
rv_factory_data2
)
RecyclerView
rvFactoryData2
;
RecyclerView
rvFactoryData2
;
@BindView
(
R
.
id
.
tv_factory_desc3
)
TextView
tvFactoryDesc3
;
@BindView
(
R
.
id
.
rv_factory_data3
)
@BindView
(
R
.
id
.
rv_factory_data3
)
RecyclerView
rvFactoryData3
;
RecyclerView
rvFactoryData3
;
@BindView
(
R
.
id
.
iv_modify_machine
)
@BindView
(
R
.
id
.
iv_modify_machine
)
ImageView
ivModifyMachine
;
ImageView
ivModifyMachine
;
@BindView
(
R
.
id
.
tv_machine_type
)
@BindView
(
R
.
id
.
tv_machine_type
)
TextView
tvMachineType
;
EditText
tvMachineType
;
@BindView
(
R
.
id
.
tv_section
)
@BindView
(
R
.
id
.
tv_section
)
TextView
tvSection
;
EditText
tvSection
;
@BindView
(
R
.
id
.
tv_steel_type
)
@BindView
(
R
.
id
.
tv_steel_type
)
TextView
tvSteelType
;
EditText
tvSteelType
;
@BindView
(
R
.
id
.
tv_speed
)
@BindView
(
R
.
id
.
tv_speed
)
TextView
tvSpeed
;
EditText
tvSpeed
;
@BindView
(
R
.
id
.
rl_middle
)
@BindView
(
R
.
id
.
rl_middle
)
RelativeLayout
rlMiddle
;
RelativeLayout
rlMiddle
;
@BindView
(
R
.
id
.
tv_middle1
)
@BindView
(
R
.
id
.
tv_middle1
)
TextView
tvMiddle1
;
EditText
tvMiddle1
;
@BindView
(
R
.
id
.
tv_middle2
)
@BindView
(
R
.
id
.
tv_middle2
)
TextView
tvMiddle2
;
EditText
tvMiddle2
;
@BindView
(
R
.
id
.
tv_middle3
)
@BindView
(
R
.
id
.
tv_middle3
)
TextView
tvMiddle3
;
EditText
tvMiddle3
;
@BindView
(
R
.
id
.
tv_middle4
)
@BindView
(
R
.
id
.
tv_middle4
)
TextView
tvMiddle4
;
EditText
tvMiddle4
;
@BindView
(
R
.
id
.
tv_middle5
)
@BindView
(
R
.
id
.
tv_middle5
)
TextView
tvMiddle5
;
EditText
tvMiddle5
;
@BindView
(
R
.
id
.
tv_middle6
)
@BindView
(
R
.
id
.
tv_middle6
)
TextView
tvMiddle6
;
EditText
tvMiddle6
;
@BindView
(
R
.
id
.
tv_middle7
)
@BindView
(
R
.
id
.
tv_middle7
)
TextView
tvMiddle7
;
EditText
tvMiddle7
;
@BindView
(
R
.
id
.
tv_middle8
)
@BindView
(
R
.
id
.
tv_middle8
)
TextView
tvMiddle8
;
EditText
tvMiddle8
;
@BindView
(
R
.
id
.
ll_middle
)
@BindView
(
R
.
id
.
ll_middle
)
LinearLayout
llMiddle
;
LinearLayout
llMiddle
;
@BindView
(
R
.
id
.
rl_cover
)
@BindView
(
R
.
id
.
rl_cover
)
RelativeLayout
rlCover
;
RelativeLayout
rlCover
;
@BindView
(
R
.
id
.
tv_cover1
)
@BindView
(
R
.
id
.
tv_cover1
)
TextView
tvCover1
;
EditText
tvCover1
;
@BindView
(
R
.
id
.
tv_cover2
)
@BindView
(
R
.
id
.
tv_cover2
)
TextView
tvCover2
;
EditText
tvCover2
;
@BindView
(
R
.
id
.
tv_cover3
)
@BindView
(
R
.
id
.
tv_cover3
)
TextView
tvCover3
;
EditText
tvCover3
;
@BindView
(
R
.
id
.
tv_cover4
)
@BindView
(
R
.
id
.
tv_cover4
)
TextView
tvCover4
;
EditText
tvCover4
;
@BindView
(
R
.
id
.
ll_cover
)
@BindView
(
R
.
id
.
ll_cover
)
LinearLayout
llCover
;
LinearLayout
llCover
;
@BindView
(
R
.
id
.
rl_protection
)
@BindView
(
R
.
id
.
rl_protection
)
RelativeLayout
rlProtection
;
RelativeLayout
rlProtection
;
@BindView
(
R
.
id
.
tv_protection1
)
@BindView
(
R
.
id
.
tv_protection1
)
TextView
tvProtection1
;
EditText
tvProtection1
;
@BindView
(
R
.
id
.
tv_protection2
)
@BindView
(
R
.
id
.
tv_protection2
)
TextView
tvProtection2
;
EditText
tvProtection2
;
@BindView
(
R
.
id
.
tv_protection3
)
@BindView
(
R
.
id
.
tv_protection3
)
TextView
tvProtection3
;
EditText
tvProtection3
;
@BindView
(
R
.
id
.
tv_protection4
)
@BindView
(
R
.
id
.
tv_protection4
)
TextView
tvProtection4
;
EditText
tvProtection4
;
@BindView
(
R
.
id
.
ll_protection
)
@BindView
(
R
.
id
.
ll_protection
)
LinearLayout
llProtection
;
LinearLayout
llProtection
;
@BindView
(
R
.
id
.
rv_data1
)
@BindView
(
R
.
id
.
rv_data1
)
...
@@ -162,27 +166,20 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
...
@@ -162,27 +166,20 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
RecyclerView
rvData3
;
RecyclerView
rvData3
;
@BindView
(
R
.
id
.
tv_add3
)
@BindView
(
R
.
id
.
tv_add3
)
TextView
tvAdd3
;
TextView
tvAdd3
;
@BindView
(
R
.
id
.
rv_data4
)
RecyclerView
rvData4
;
@BindView
(
R
.
id
.
tv_add4
)
TextView
tvAdd4
;
@BindView
(
R
.
id
.
rl_add
)
RelativeLayout
rlAdd
;
@BindView
(
R
.
id
.
tv_factory_desc1
)
TextView
tvFactoryDesc1
;
@BindView
(
R
.
id
.
tv_factory_desc2
)
TextView
tvFactoryDesc2
;
@BindView
(
R
.
id
.
tv_factory_desc3
)
TextView
tvFactoryDesc3
;
@BindView
(
R
.
id
.
rv_data5
)
@BindView
(
R
.
id
.
rv_data5
)
RecyclerView
rvData5
;
RecyclerView
rvData5
;
@BindView
(
R
.
id
.
tv_add5
)
@BindView
(
R
.
id
.
tv_add5
)
TextView
tvAdd5
;
TextView
tvAdd5
;
@BindView
(
R
.
id
.
rv_data4
)
RecyclerView
rvData4
;
@BindView
(
R
.
id
.
tv_add4
)
TextView
tvAdd4
;
@BindView
(
R
.
id
.
rv_data6
)
@BindView
(
R
.
id
.
rv_data6
)
RecyclerView
rvData6
;
RecyclerView
rvData6
;
@BindView
(
R
.
id
.
tv_add6
)
@BindView
(
R
.
id
.
tv_add6
)
TextView
tvAdd6
;
TextView
tvAdd6
;
private
AccountBean
dataBean
;
@BindView
(
R
.
id
.
rl_add
)
RelativeLayout
rlAdd
;
private
UserDataMachineAdapter
data1Adapter
;
private
UserDataMachineAdapter
data1Adapter
;
private
UserDataMachineAdapter
data2Adapter
;
private
UserDataMachineAdapter
data2Adapter
;
private
UserDataMachineAdapter
data3Adapter
;
private
UserDataMachineAdapter
data3Adapter
;
...
@@ -195,14 +192,16 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
...
@@ -195,14 +192,16 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
private
List
<
FactoryDetailBean
.
SteelFurnListBean
>
dataFactory1List
;
private
List
<
FactoryDetailBean
.
SteelFurnListBean
>
dataFactory1List
;
private
List
<
FactoryDetailBean
.
SteelRefFurnListBean
>
dataFactory2List
;
private
List
<
FactoryDetailBean
.
SteelRefFurnListBean
>
dataFactory2List
;
private
List
<
FactoryDetailBean
.
SteelLadleListBean
>
dataFactory3List
;
private
List
<
FactoryDetailBean
.
SteelLadleListBean
>
dataFactory3List
;
private
UserData
Add3
Adapter
factory1Adapter
;
private
UserData
DetailFactory1
Adapter
factory1Adapter
;
private
UserData
Add3Ref
Adapter
factory2Adapter
;
private
UserData
DetailFactory2
Adapter
factory2Adapter
;
private
UserDataAdd3LabelAdapter
factory3Adapter
;
private
UserDataAdd3LabelAdapter
factory3Adapter
;
private
UserDataMachineAdapter
data5Adapter
;
private
UserDataMachineAdapter
data5Adapter
;
private
UserDataMachineAdapter
data6Adapter
;
private
UserDataMachineAdapter
data6Adapter
;
private
List
<
String
>
data5List
;
private
List
<
String
>
data5List
;
private
List
<
String
>
data6List
;
private
List
<
String
>
data6List
;
private
UserDataDetailBean
userDataDetailBean
;
private
UserDataDetailBean
userDataDetailBean
;
private
FactoryDetailBean
factoryDetailBean
;
private
boolean
canFinish
;
@Override
@Override
protected
void
initView
()
{
protected
void
initView
()
{
...
@@ -245,8 +244,8 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
...
@@ -245,8 +244,8 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
dataFactory1List
=
new
ArrayList
<>();
dataFactory1List
=
new
ArrayList
<>();
dataFactory2List
=
new
ArrayList
<>();
dataFactory2List
=
new
ArrayList
<>();
dataFactory3List
=
new
ArrayList
<>();
dataFactory3List
=
new
ArrayList
<>();
factory1Adapter
=
new
UserData
Add3Adapter
(
R
.
layout
.
item_user_add3
,
dataFactory1List
);
factory1Adapter
=
new
UserData
DetailFactory1Adapter
(
R
.
layout
.
item_user_detail_factory1
,
dataFactory1List
);
factory2Adapter
=
new
UserData
Add3RefAdapter
(
R
.
layout
.
item_user_add3
,
dataFactory2List
);
factory2Adapter
=
new
UserData
DetailFactory2Adapter
(
R
.
layout
.
item_user_detail_factory2
,
dataFactory2List
);
factory3Adapter
=
new
UserDataAdd3LabelAdapter
(
R
.
layout
.
item_add3_label
,
dataFactory3List
);
factory3Adapter
=
new
UserDataAdd3LabelAdapter
(
R
.
layout
.
item_add3_label
,
dataFactory3List
);
factory1Adapter
.
bindToRecyclerView
(
rvFactoryData1
);
factory1Adapter
.
bindToRecyclerView
(
rvFactoryData1
);
factory2Adapter
.
bindToRecyclerView
(
rvFactoryData2
);
factory2Adapter
.
bindToRecyclerView
(
rvFactoryData2
);
...
@@ -314,7 +313,7 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
...
@@ -314,7 +313,7 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
toast
(
data
.
getMsg
());
toast
(
data
.
getMsg
());
return
;
return
;
}
}
FactoryDetailBean
factoryDetailBean
=
JSON
.
parseObject
(
data
.
getData
().
toString
(),
FactoryDetailBean
.
class
);
factoryDetailBean
=
JSON
.
parseObject
(
data
.
getData
().
toString
(),
FactoryDetailBean
.
class
);
FactoryDetailBean
.
SteelWorksBean
steelWorks
=
factoryDetailBean
.
getSteelWorks
();
FactoryDetailBean
.
SteelWorksBean
steelWorks
=
factoryDetailBean
.
getSteelWorks
();
if
(
steelWorks
!=
null
)
{
if
(
steelWorks
!=
null
)
{
tvNum
.
setText
(
steelWorks
.
getAnnualOutput
());
tvNum
.
setText
(
steelWorks
.
getAnnualOutput
());
...
@@ -488,11 +487,13 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
...
@@ -488,11 +487,13 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
@Override
@Override
protected
int
layoutId
()
{
protected
int
layoutId
()
{
return
R
.
layout
.
activity_mes_user_data_detail
;
return
R
.
layout
.
activity_mes_user_data_detail
_modify
;
}
}
@OnClick
({
R
.
id
.
iv_modify_client
,
R
.
id
.
iv_modify_machine
,
R
.
id
.
iv_modify_steel
,
R
.
id
.
tv_add5
,
R
.
id
.
tv_add6
,
R
.
id
.
btn_agree
,
R
.
id
.
btn_refuse
,
R
.
id
.
tv_add1
,
R
.
id
.
tv_add3
,
R
.
id
.
tv_add4
,
R
.
id
.
rl_add
})
@OnClick
({
R
.
id
.
iv_modify_client
,
R
.
id
.
iv_modify_machine
,
R
.
id
.
iv_modify_steel
,
R
.
id
.
tv_add5
,
R
.
id
.
tv_add6
,
R
.
id
.
tv_add1
,
R
.
id
.
tv_add3
,
R
.
id
.
tv_add4
})
public
void
onViewClicked
(
View
view
)
{
public
void
onViewClicked
(
View
view
)
{
switch
(
view
.
getId
())
{
switch
(
view
.
getId
())
{
case
R
.
id
.
iv_modify_client
:
case
R
.
id
.
iv_modify_client
:
...
@@ -500,22 +501,21 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
...
@@ -500,22 +501,21 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
toast
(
"数据加载中,请稍后"
);
toast
(
"数据加载中,请稍后"
);
return
;
return
;
}
}
startActivityForResult
(
MesChooseClientActivity
.
class
,
10001
,
"from"
,
"1"
);
break
;
break
;
case
R
.
id
.
iv_modify_machine
:
case
R
.
id
.
iv_modify_machine
:
if
(
userDataDetailBean
==
null
)
{
if
(
userDataDetailBean
==
null
)
{
toast
(
"数据加载中,请稍后"
);
toast
(
"数据加载中,请稍后"
);
return
;
return
;
}
}
changeViewModify
(
2
);
startActivityForResult
(
MesChooseMachineActivity
.
class
,
10003
,
"from"
,
"1"
,
"data"
,
JSON
.
toJSONString
(
userDataDetailBean
.
getMainInfo
()));
break
;
break
;
case
R
.
id
.
iv_modify_steel
:
case
R
.
id
.
iv_modify_steel
:
if
(
userDataDetailBean
==
null
)
{
if
(
userDataDetailBean
==
null
)
{
toast
(
"数据加载中,请稍后"
);
toast
(
"数据加载中,请稍后"
);
return
;
return
;
}
}
startActivityForResult
(
MesChooseFactoryActivity
.
class
,
10002
,
"from"
,
"1"
,
"data"
,
JSON
.
toJSONString
(
userDataDetailBean
.
getMainInfo
())
);
changeViewModify
(
1
);
break
;
break
;
case
R
.
id
.
tv_add1
:
case
R
.
id
.
tv_add1
:
if
(
userDataDetailBean
==
null
)
{
if
(
userDataDetailBean
==
null
)
{
...
@@ -552,51 +552,142 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
...
@@ -552,51 +552,142 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
}
}
startActivity
(
MesMiddleAddActivity
.
class
,
"continuousCasterCode"
,
userDataDetailBean
.
getSteelInfo
().
getContinuousCasterCode
());
startActivity
(
MesMiddleAddActivity
.
class
,
"continuousCasterCode"
,
userDataDetailBean
.
getSteelInfo
().
getContinuousCasterCode
());
break
;
break
;
case
R
.
id
.
rl_add
:
case
R
.
id
.
rl_middle
:
// startActivity(MesMiddleAddActivity.class);
if
(
llMiddle
.
getVisibility
()
==
View
.
VISIBLE
)
{
llMiddle
.
setVisibility
(
View
.
GONE
);
}
else
{
llMiddle
.
setVisibility
(
View
.
VISIBLE
);
}
break
;
break
;
case
R
.
id
.
btn_agree
:
case
R
.
id
.
rl_cover
:
openCheck
(
1
);
if
(
llCover
.
getVisibility
()
==
View
.
VISIBLE
)
{
llCover
.
setVisibility
(
View
.
GONE
);
}
else
{
llCover
.
setVisibility
(
View
.
VISIBLE
);
}
break
;
break
;
case
R
.
id
.
btn_refuse
:
case
R
.
id
.
rl_protection
:
openCheck
(
2
);
if
(
llProtection
.
getVisibility
()
==
View
.
VISIBLE
)
{
llProtection
.
setVisibility
(
View
.
GONE
);
}
else
{
llProtection
.
setVisibility
(
View
.
VISIBLE
);
}
break
;
break
;
}
}
}
}
private
void
openCheck
(
int
type
)
{
private
void
changeViewModify
(
int
type
)
{
AlertDialog
.
Builder
builder
=
new
AlertDialog
.
Builder
(
this
);
switch
(
type
)
{
View
view
=
LayoutInflater
.
from
(
this
).
inflate
(
R
.
layout
.
view_user_check
,
null
);
case
1
:
TextView
tvDesc
=
view
.
findViewById
(
R
.
id
.
tv_desc
);
changeViewClick
(
tvNum
,
!
tvNum
.
isClickable
());
tvDesc
.
setText
(
type
==
1
?
"通过"
:
"驳回原因"
);
changeViewClick
(
tvFactory
,
!
tvFactory
.
isClickable
());
TextView
btnOk
=
view
.
findViewById
(
R
.
id
.
btn_ok
);
changeViewClick
(
tvType
,
!
tvType
.
isClickable
());
EditText
etContent
=
view
.
findViewById
(
R
.
id
.
et_content
);
break
;
TextView
tvClose
=
view
.
findViewById
(
R
.
id
.
tv_close
);
case
2
:
builder
.
setView
(
view
);
changeViewClick
(
tvMachineType
,
!
tvMachineType
.
isClickable
());
AlertDialog
addCartDialog
=
builder
.
create
();
changeViewClick
(
tvSection
,
!
tvSection
.
isClickable
());
btnOk
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
changeViewClick
(
tvSteelType
,
!
tvSteelType
.
isClickable
());
@Override
changeViewClick
(
tvSpeed
,
!
tvSpeed
.
isClickable
());
public
void
onClick
(
View
v
)
{
submitCheck
(
type
,
etContent
.
getText
().
toString
());
changeViewClick
(
tvMiddle1
,
!
tvMiddle1
.
isClickable
());
addCartDialog
.
dismiss
();
changeViewClick
(
tvMiddle2
,
!
tvMiddle2
.
isClickable
());
}
changeViewClick
(
tvMiddle3
,
!
tvMiddle3
.
isClickable
());
});
changeViewClick
(
tvMiddle4
,
!
tvMiddle4
.
isClickable
());
tvClose
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
changeViewClick
(
tvMiddle5
,
!
tvMiddle5
.
isClickable
());
@Override
changeViewClick
(
tvMiddle6
,
!
tvMiddle6
.
isClickable
());
public
void
onClick
(
View
v
)
{
changeViewClick
(
tvMiddle7
,
!
tvMiddle7
.
isClickable
());
addCartDialog
.
dismiss
();
changeViewClick
(
tvMiddle8
,
!
tvMiddle8
.
isClickable
());
}
});
changeViewClick
(
tvCover1
,
!
tvCover1
.
isClickable
());
addCartDialog
.
show
();
changeViewClick
(
tvCover2
,
!
tvCover2
.
isClickable
());
changeViewClick
(
tvCover3
,
!
tvCover3
.
isClickable
());
changeViewClick
(
tvCover4
,
!
tvCover4
.
isClickable
());
changeViewClick
(
tvProtection1
,
!
tvProtection1
.
isClickable
());
changeViewClick
(
tvProtection2
,
!
tvProtection2
.
isClickable
());
changeViewClick
(
tvProtection3
,
!
tvProtection3
.
isClickable
());
changeViewClick
(
tvProtection4
,
!
tvProtection4
.
isClickable
());
break
;
}
}
}
private
void
submitCheck
(
int
type
,
String
remark
)
{
private
void
changeViewClick
(
EditText
view
,
boolean
canClick
)
{
Map
<
String
,
Object
>
param
=
WorkUtils
.
simpleParam
();
view
.
setClickable
(
canClick
);
param
.
put
(
"id"
,
getIntent
().
getStringExtra
(
"id"
));
view
.
setFocusable
(
canClick
);
param
.
put
(
"approvalStatus"
,
type
==
1
?
1
:
2
);
view
.
setFocusableInTouchMode
(
canClick
);
param
.
put
(
"isCustomerArchives"
,
type
==
1
);
}
param
.
put
(
"remark"
,
remark
);
RtfUtils
.
getMesRtf
().
userDataCheck
(
"1"
,
WorkUtils
.
convertMapToBody
(
param
)).
compose
(
Transformer
.
schedule
()).
subscribe
(
new
WorkObserver
<
BaseMesBean
>()
{
@Override
public
boolean
onCreateOptionsMenu
(
Menu
menu
)
{
getMenuInflater
().
inflate
(
R
.
menu
.
menu_finish
,
menu
);
return
super
.
onCreateOptionsMenu
(
menu
);
}
@Override
public
boolean
onOptionsItemSelected
(
MenuItem
item
)
{
switch
(
item
.
getItemId
())
{
case
R
.
id
.
finish
:
changeSimple
();
submitMachine
();
submitFactory
();
break
;
}
return
super
.
onOptionsItemSelected
(
item
);
}
private
void
changeSimple
()
{
MachineDetailBean
.
CastInfoBean
castInfo
=
machineDetailBean
.
getCastInfo
();
if
(
castInfo
==
null
)
{
castInfo
=
new
MachineDetailBean
.
CastInfoBean
();
machineDetailBean
.
setCastInfo
(
castInfo
);
}
castInfo
.
setContinuousCasterType
(
tvMachineType
.
getText
().
toString
());
castInfo
.
setFractureSurface
(
tvSection
.
getText
().
toString
());
castInfo
.
setSteelGrade
(
tvSteelType
.
getText
().
toString
());
castInfo
.
setCastingSpeed
(
tvSpeed
.
getText
().
toString
());
MachineDetailBean
.
CastLadleBean
castLadle
=
machineDetailBean
.
getCastLadle
();
if
(
castLadle
==
null
)
{
castLadle
=
new
MachineDetailBean
.
CastLadleBean
();
machineDetailBean
.
setCastLadle
(
castLadle
);
}
castLadle
.
setCapacity
(
tvMiddle1
.
getText
().
toString
());
castLadle
.
setLifeSpan
(
tvMiddle2
.
getText
().
toString
());
castLadle
.
setLadleCode
(
tvMiddle3
.
getText
().
toString
());
castLadle
.
setLiquidLevel
(
tvMiddle4
.
getText
().
toString
());
castLadle
.
setLiquidSteelTemperature
(
tvMiddle5
.
getText
().
toString
());
castLadle
.
setBakingMethod
(
tvMiddle6
.
getText
().
toString
());
castLadle
.
setBakingTemperature
(
tvMiddle7
.
getText
().
toString
());
castLadle
.
setBakingDateTime
(
TimeUtils
.
string2Millis
(
tvMiddle8
.
getText
().
toString
())
/
1000
);
MachineDetailBean
.
CovAgentBean
covAgent
=
machineDetailBean
.
getCovAgent
();
if
(
covAgent
==
null
)
{
covAgent
=
new
MachineDetailBean
.
CovAgentBean
();
machineDetailBean
.
setCovAgent
(
covAgent
);
}
covAgent
.
setLadleCoveringAgentName
(
tvCover1
.
getText
().
toString
());
covAgent
.
setAcidAlkaliDegree
(
tvCover2
.
getText
().
toString
());
covAgent
.
setChemicalComposition
(
tvCover3
.
getText
().
toString
());
covAgent
.
setSupplierName
(
tvCover4
.
getText
().
toString
());
MachineDetailBean
.
MouldFluBean
mouldFlu
=
machineDetailBean
.
getMouldFlu
();
if
(
mouldFlu
==
null
)
{
mouldFlu
=
new
MachineDetailBean
.
MouldFluBean
();
machineDetailBean
.
setMouldFlu
(
mouldFlu
);
}
mouldFlu
.
setMouldFluxesName
(
tvProtection1
.
getText
().
toString
());
mouldFlu
.
setAcidAlkaliDegree
(
tvProtection2
.
getText
().
toString
());
mouldFlu
.
setChemicalComposition
(
tvProtection3
.
getText
().
toString
());
mouldFlu
.
setSupplierName
(
tvProtection4
.
getText
().
toString
());
}
private
void
submitMachine
()
{
showLoading
();
RequestBody
requestBody
=
RequestBody
.
create
(
MediaType
.
parse
(
"application/json; charset=utf-8"
),
JSON
.
toJSONString
(
machineDetailBean
));
RtfUtils
.
getMesRtf
().
machineAdd
(
"1"
,
"2"
,
requestBody
).
compose
(
Transformer
.
schedule
()).
subscribe
(
new
WorkObserver
<
BaseMesBean
>()
{
@Override
@Override
public
void
doOnSubscribe
(
Disposable
d
)
{
public
void
doOnSubscribe
(
Disposable
d
)
{
}
}
...
@@ -614,81 +705,39 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
...
@@ -614,81 +705,39 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
toast
(
data
.
getMsg
());
toast
(
data
.
getMsg
());
return
;
return
;
}
}
llBottom
.
setVisibility
(
View
.
GONE
);
if
(
canFinish
)
{
toast
(
"提交成功"
);
toast
(
"编辑成功"
);
EventBus
.
getDefault
().
post
(
new
AddUserDataEvent
());
EventBus
.
getDefault
().
post
(
new
ModifyUserDataEvent
());
finish
();
}
else
{
canFinish
=
true
;
}
}
}
});
});
}
}
@Override
private
void
submitFactory
()
{
protected
void
onActivityResult
(
int
requestCode
,
int
resultCode
,
@Nullable
Intent
data
)
{
FactoryDetailBean
.
SteelWorksBean
steelWorks
=
factoryDetailBean
.
getSteelWorks
();
super
.
onActivityResult
(
requestCode
,
resultCode
,
data
);
if
(
steelWorks
!=
null
)
{
switch
(
requestCode
)
{
steelWorks
.
setAnnualOutput
(
tvNum
.
getText
().
toString
());
case
10001
:
steelWorks
.
setSteelmakingWorksName
(
tvFactory
.
getText
().
toString
());
if
(
resultCode
==
10001
)
{
steelWorks
.
setSteelGrade
(
tvType
.
getText
().
toString
());
MesClientBean
.
ListBean
modifyClient
=
JSON
.
parseObject
(
data
.
getStringExtra
(
"data"
),
MesClientBean
.
ListBean
.
class
);
UserDataDetailBean
.
MainInfoBean
mainInfo
=
userDataDetailBean
.
getMainInfo
();
mainInfo
.
setCustomerUserCode
(
modifyClient
.
getCustomerCode
());
mainInfo
.
setCustomerUserName
(
modifyClient
.
getCustomerName
());
mainInfo
.
setSalesCompanyCode
(
modifyClient
.
getSalesCompanyCode
());
mainInfo
.
setSalesCompanyName
(
modifyClient
.
getSalesCompanyName
());
mainInfo
.
setSalesManagerCode
(
modifyClient
.
getSalesManagerCode
());
mainInfo
.
setSalesManagerName
(
modifyClient
.
getSalesManagerName
());
changeInfo
();
}
break
;
case
10002
:
if
(
resultCode
==
10002
)
{
FactoryBean
modifyClient
=
JSON
.
parseObject
(
data
.
getStringExtra
(
"data"
),
FactoryBean
.
class
);
UserDataDetailBean
.
MainInfoBean
mainInfo
=
userDataDetailBean
.
getMainInfo
();
UserDataDetailBean
.
SteelInfoBean
steelInfo
=
userDataDetailBean
.
getSteelInfo
();
steelInfo
.
setSteelmakingWorksCode
(
modifyClient
.
getSteelmakingWorksCode
());
mainInfo
.
setSteelmakingWorksName
(
modifyClient
.
getSteelmakingWorksName
());
mainInfo
.
setSteelmakingWorksCode
(
modifyClient
.
getSteelmakingWorksCode
());
mainInfo
.
setAnnualOutput
(
modifyClient
.
getAnnualOutput
());
mainInfo
.
setSteelGrade
(
modifyClient
.
getSteelGrade
());
changeInfo
();
}
break
;
case
10003
:
if
(
resultCode
==
10003
)
{
MachineBean
modifyClient
=
JSON
.
parseObject
(
data
.
getStringExtra
(
"data"
),
MachineBean
.
class
);
UserDataDetailBean
.
MainInfoBean
mainInfo
=
userDataDetailBean
.
getMainInfo
();
UserDataDetailBean
.
SteelInfoBean
steelInfo
=
userDataDetailBean
.
getSteelInfo
();
steelInfo
.
setContinuousCasterCode
(
modifyClient
.
getContinuousCasterCode
());
mainInfo
.
setContinuousCasterName
(
modifyClient
.
getContinuousCasterName
());
mainInfo
.
setContinuousCasterType
(
modifyClient
.
getContinuousCasterType
());
changeInfo
();
}
break
;
}
}
}
if
(
factoryDetailBean
.
getSteelFurnList
()
!=
null
)
{
factoryDetailBean
.
getSteelFurnList
().
clear
();
@Override
factoryDetailBean
.
getSteelFurnList
().
addAll
(
dataFactory1List
);
public
boolean
onCreateOptionsMenu
(
Menu
menu
)
{
getMenuInflater
().
inflate
(
R
.
menu
.
menu_finish
,
menu
);
return
super
.
onCreateOptionsMenu
(
menu
);
}
@Override
public
boolean
onOptionsItemSelected
(
MenuItem
item
)
{
switch
(
item
.
getItemId
())
{
case
R
.
id
.
finish
:
submit
();
break
;
}
}
return
super
.
onOptionsItemSelected
(
item
);
if
(
factoryDetailBean
.
getSteelRefFurnList
()
!=
null
)
{
}
factoryDetailBean
.
getSteelRefFurnList
().
clear
();
factoryDetailBean
.
getSteelRefFurnList
().
addAll
(
dataFactory2List
);
private
void
submit
()
{
}
if
(
factoryDetailBean
.
getSteelLadleList
()
!=
null
)
{
factoryDetailBean
.
getSteelLadleList
().
clear
();
factoryDetailBean
.
getSteelLadleList
().
addAll
(
dataFactory3List
);
}
RequestBody
requestBody
=
RequestBody
.
create
(
MediaType
.
parse
(
"application/json; charset=utf-8"
),
JSON
.
toJSONString
(
factoryDetailBean
));
showLoading
();
showLoading
();
userDataDetailBean
.
getMainInfo
().
setApprovalStatus
(
0
);
RtfUtils
.
getMesRtf
().
factoryAdd
(
"1"
,
"2"
,
requestBody
).
compose
(
Transformer
.
schedule
()).
subscribe
(
new
WorkObserver
<
BaseMesBean
>()
{
RequestBody
requestBody
=
RequestBody
.
create
(
MediaType
.
parse
(
"application/json; charset=utf-8"
),
JSON
.
toJSONString
(
userDataDetailBean
));
RtfUtils
.
getMesRtf
().
userDataAdd
(
"1"
,
"2"
,
requestBody
).
compose
(
Transformer
.
schedule
()).
subscribe
(
new
WorkObserver
<
BaseMesBean
>()
{
@Override
@Override
public
void
doOnSubscribe
(
Disposable
d
)
{
public
void
doOnSubscribe
(
Disposable
d
)
{
}
}
...
@@ -706,9 +755,13 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
...
@@ -706,9 +755,13 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
toast
(
data
.
getMsg
());
toast
(
data
.
getMsg
());
return
;
return
;
}
}
toast
(
"编辑成功"
);
if
(
canFinish
)
{
EventBus
.
getDefault
().
post
(
new
AddUserDataEvent
());
toast
(
"编辑成功"
);
finish
();
EventBus
.
getDefault
().
post
(
new
ModifyUserDataEvent
());
finish
();
}
else
{
canFinish
=
true
;
}
}
}
});
});
}
}
...
@@ -730,4 +783,96 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
...
@@ -730,4 +783,96 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
getData
();
getData
();
}
}
// @Subscribe
// public void modify(AddMachineModifyChildEvent event) {
// switch (event.getType()) {
// case 1:
// List<MachineDetailBean.ProductListBean> productList = machineDetailBean.getProductList();
// if (productList == null) {
// machineDetailBean.setProductList(new ArrayList<>());
// }
// productList.remove(event.getPosition());
// productList.add(event.getPosition(), JSON.parseObject(event.getData(), MachineDetailBean.ProductListBean.class));
// break;
// case 2:
// break;
// case 3:
// List<MachineDetailBean.OtherSupListBean> supplyList = machineDetailBean.getOtherSupList();
// if (supplyList == null) {
// machineDetailBean.setOtherSupList(new ArrayList<>());
// }
// supplyList.remove(event.getPosition());
// supplyList.add(event.getPosition(), JSON.parseObject(event.getData(), MachineDetailBean.OtherSupListBean.class));
// break;
// case 4:
// List<MachineDetailBean.OtherLadleListBean> otherLadleList = machineDetailBean.getOtherLadleList();
// if (otherLadleList == null) {
// machineDetailBean.setOtherLadleList(new ArrayList<>());
// }
// otherLadleList.remove(event.getPosition());
// otherLadleList.add(event.getPosition(), JSON.parseObject(event.getData(), MachineDetailBean.OtherLadleListBean.class));
// break;
// case 5:
// List<MachineDetailBean.StockListBean> stockList = machineDetailBean.getStockList();
// if (stockList == null) {
// machineDetailBean.setStockList(new ArrayList<>());
// }
// stockList.remove(event.getPosition());
// stockList.add(event.getPosition(), JSON.parseObject(event.getData(), MachineDetailBean.StockListBean.class));
// break;
// case 6:
// List<MachineDetailBean.SettleListBean> settleList = machineDetailBean.getSettleList();
// if (settleList == null) {
// machineDetailBean.setSettleList(new ArrayList<>());
// }
// settleList.remove(event.getPosition());
// settleList.add(event.getPosition(), JSON.parseObject(event.getData(), MachineDetailBean.SettleListBean.class));
// break;
// }
// changeList();
// }
// @Subscribe
// public void refresh(AddMachineAddChildEvent event) {
// switch (event.getType()) {
// case 1:
// List<MachineDetailBean.ProductListBean> productList = machineDetailBean.getProductList();
// if (productList == null) {
// machineDetailBean.setProductList(new ArrayList<>());
// }
// machineDetailBean.getProductList().add(JSON.parseObject(event.getData(), MachineDetailBean.ProductListBean.class));
// break;
// case 2:
// break;
// case 3:
// List<MachineDetailBean.OtherSupListBean> supplyList = machineDetailBean.getOtherSupList();
// if (supplyList == null) {
// machineDetailBean.setOtherSupList(new ArrayList<>());
// }
// machineDetailBean.getOtherSupList().add(JSON.parseObject(event.getData(), MachineDetailBean.OtherSupListBean.class));
// break;
// case 4:
// List<MachineDetailBean.OtherLadleListBean> otherLadleList = machineDetailBean.getOtherLadleList();
// if (otherLadleList == null) {
// machineDetailBean.setOtherLadleList(new ArrayList<>());
// }
// machineDetailBean.getOtherLadleList().add(JSON.parseObject(event.getData(), MachineDetailBean.OtherLadleListBean.class));
// break;
// case 5:
// List<MachineDetailBean.StockListBean> stockList = machineDetailBean.getStockList();
// if (stockList == null) {
// machineDetailBean.setStockList(new ArrayList<>());
// }
// machineDetailBean.getStockList().add(JSON.parseObject(event.getData(), MachineDetailBean.StockListBean.class));
// break;
// case 6:
// List<MachineDetailBean.SettleListBean> settleList = machineDetailBean.getSettleList();
// if (settleList == null) {
// machineDetailBean.setSettleList(new ArrayList<>());
// }
// machineDetailBean.getSettleList().add(JSON.parseObject(event.getData(), MachineDetailBean.SettleListBean.class));
// break;
// }
// changeList();
// }
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/UserDataDetailFactory1Adapter.java
0 → 100644
浏览文件 @
fe42132b
package
com
.
wd
.
workoffice
.
ui
.
adapter
;
import
android.view.View
;
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.FactoryDetailBean
;
import
java.util.List
;
/**
* Created by flexible on 2018/8/13.
*/
public
class
UserDataDetailFactory1Adapter
extends
BaseQuickAdapter
<
FactoryDetailBean
.
SteelFurnListBean
,
BaseViewHolder
>
{
public
UserDataDetailFactory1Adapter
(
int
layoutResId
,
List
data
)
{
super
(
layoutResId
,
data
);
}
@Override
protected
void
convert
(
BaseViewHolder
helper
,
FactoryDetailBean
.
SteelFurnListBean
item
)
{
helper
.
setText
(
R
.
id
.
tv_name
,
item
.
getSteelmakingFurnaceCode
());
helper
.
setText
(
R
.
id
.
tv_num
,
item
.
getCapacity
());
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/UserDataDetailFactory2Adapter.java
0 → 100644
浏览文件 @
fe42132b
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.FactoryDetailBean
;
import
java.util.List
;
/**
* Created by flexible on 2018/8/13.
*/
public
class
UserDataDetailFactory2Adapter
extends
BaseQuickAdapter
<
FactoryDetailBean
.
SteelRefFurnListBean
,
BaseViewHolder
>
{
public
UserDataDetailFactory2Adapter
(
int
layoutResId
,
List
data
)
{
super
(
layoutResId
,
data
);
}
@Override
protected
void
convert
(
BaseViewHolder
helper
,
FactoryDetailBean
.
SteelRefFurnListBean
item
)
{
helper
.
setText
(
R
.
id
.
tv_name
,
item
.
getRefiningFurnaceCode
());
helper
.
setText
(
R
.
id
.
tv_num
,
item
.
getModelNumber
());
helper
.
setText
(
R
.
id
.
tv_type
,
item
.
getCalciumTreatmentSituation
());
}
}
app/src/main/res/layout/activity_mes_user_data_detail.xml
浏览文件 @
fe42132b
...
@@ -288,7 +288,7 @@
...
@@ -288,7 +288,7 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:background=
"@android:color/white"
android:orientation=
"
vertic
al"
android:orientation=
"
horizont
al"
android:paddingHorizontal=
"20mm"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
android:paddingVertical=
"9mm"
>
...
@@ -302,7 +302,7 @@
...
@@ -302,7 +302,7 @@
<androidx.recyclerview.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_factory_data1"
android:id=
"@+id/rv_factory_data1"
android:layout_width=
"
wrap_cont
ent"
android:layout_width=
"
match_par
ent"
android:layout_height=
"wrap_content"
/>
android:layout_height=
"wrap_content"
/>
</LinearLayout>
</LinearLayout>
...
@@ -313,7 +313,7 @@
...
@@ -313,7 +313,7 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:background=
"@android:color/white"
android:orientation=
"
vertic
al"
android:orientation=
"
horizont
al"
android:paddingHorizontal=
"20mm"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
android:paddingVertical=
"9mm"
>
...
@@ -327,7 +327,7 @@
...
@@ -327,7 +327,7 @@
<androidx.recyclerview.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_factory_data2"
android:id=
"@+id/rv_factory_data2"
android:layout_width=
"
wrap_cont
ent"
android:layout_width=
"
match_par
ent"
android:layout_height=
"wrap_content"
/>
android:layout_height=
"wrap_content"
/>
</LinearLayout>
</LinearLayout>
...
...
app/src/main/res/layout/activity_mes_user_data_detail_modify.xml
0 → 100644
浏览文件 @
fe42132b
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"vertical"
>
<LinearLayout
android:id=
"@+id/ll_bottom"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_alignParentBottom=
"true"
android:background=
"@color/white"
android:gravity=
"center"
android:visibility=
"gone"
android:paddingVertical=
"10mm"
>
<Button
android:id=
"@+id/btn_refuse"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:background=
"@drawable/shape_red_circle"
android:paddingHorizontal=
"40mm"
android:text=
"驳回"
android:textColor=
"@color/white"
/>
<Button
android:id=
"@+id/btn_agree"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"20mm"
android:background=
"@drawable/shape_blue_circle"
android:paddingHorizontal=
"40mm"
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"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"vertical"
>
<LinearLayout
android:id=
"@+id/ll_reason"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:orientation=
"vertical"
android:paddingHorizontal=
"23mm"
android:paddingVertical=
"20mm"
android:visibility=
"gone"
>
<TextView
android:layout_width=
"78dp"
android:layout_height=
"22dp"
android:text=
"驳回理由:"
android:textColor=
"#ffcb5050"
android:textSize=
"15sp"
/>
<TextView
android:id=
"@+id/tv_reason"
android:layout_width=
"140dp"
android:layout_height=
"22dp"
android:text=
"这是一条狠心的驳回"
android:textColor=
"#ffcb5050"
android:textSize=
"15sp"
/>
</LinearLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"客户信息"
android:textSize=
"18sp"
/>
<ImageView
android:visibility=
"gone"
android:id=
"@+id/iv_modify_client"
android:layout_width=
"22mm"
android:layout_height=
"22mm"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:src=
"@mipmap/mes_modify"
/>
</RelativeLayout>
<RelativeLayout
android:id=
"@+id/rl_client"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"客户信息"
android:textSize=
"14sp"
/>
<TextView
android:id=
"@+id/tv_client"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:background=
"@null"
android:textSize=
"14sp"
/>
</RelativeLayout>
<View
style=
"@style/dividerX"
/>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"所属销售公司"
android:textSize=
"14sp"
/>
<TextView
android:id=
"@+id/tv_sale"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:background=
"@null"
android:textSize=
"14sp"
/>
</RelativeLayout>
<View
style=
"@style/dividerX"
/>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"销售经理"
android:textSize=
"14sp"
/>
<TextView
android:id=
"@+id/tv_manager"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:background=
"@null"
android:textSize=
"14sp"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"炼钢基本信息"
android:textSize=
"18sp"
/>
<ImageView
android:id=
"@+id/iv_modify_steel"
android:layout_width=
"22mm"
android:layout_height=
"22mm"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:src=
"@mipmap/mes_modify"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"炼钢厂"
android:textSize=
"14sp"
/>
<EditText
android:id=
"@+id/tv_factory"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:background=
"@null"
android:textSize=
"14sp"
/>
</RelativeLayout>
<View
style=
"@style/dividerX"
/>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"年产量"
android:textSize=
"14sp"
/>
<EditText
android:id=
"@+id/tv_num"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:background=
"@null"
android:textSize=
"14sp"
/>
</RelativeLayout>
<View
style=
"@style/dividerX"
/>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"钢种"
android:textSize=
"14sp"
/>
<EditText
android:id=
"@+id/tv_type"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:background=
"@null"
android:textSize=
"14sp"
/>
</RelativeLayout>
<View
style=
"@style/dividerX"
/>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:orientation=
"horizontal"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
<TextView
android:id=
"@+id/tv_factory_desc1"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"炼钢炉"
android:textSize=
"15sp"
/>
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_factory_data1"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
</LinearLayout>
<View
style=
"@style/dividerX"
/>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:orientation=
"horizontal"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
<TextView
android:id=
"@+id/tv_factory_desc2"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"精炼炉"
android:textSize=
"15sp"
/>
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_factory_data2"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
</LinearLayout>
<View
style=
"@style/dividerX"
/>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:orientation=
"vertical"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
<TextView
android:id=
"@+id/tv_factory_desc3"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"钢包"
android:textSize=
"15sp"
/>
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_factory_data3"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
/>
</LinearLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"连铸机"
android:textSize=
"18sp"
/>
<ImageView
android:id=
"@+id/iv_modify_machine"
android:layout_width=
"22mm"
android:layout_height=
"22mm"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:src=
"@mipmap/mes_modify"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"连铸机类型"
android:textSize=
"14sp"
/>
<EditText
android:id=
"@+id/tv_machine_type"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:background=
"@null"
android:textSize=
"14sp"
/>
</RelativeLayout>
<View
style=
"@style/dividerX"
/>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"断面"
android:textSize=
"14sp"
/>
<EditText
android:id=
"@+id/tv_section"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:background=
"@null"
android:textSize=
"14sp"
/>
</RelativeLayout>
<View
style=
"@style/dividerX"
/>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"钢种"
android:textSize=
"14sp"
/>
<EditText
android:id=
"@+id/tv_steel_type"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:background=
"@null"
android:textSize=
"14sp"
/>
</RelativeLayout>
<View
style=
"@style/dividerX"
/>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"拉速"
android:textSize=
"14sp"
/>
<EditText
android:id=
"@+id/tv_speed"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:background=
"@null"
android:textSize=
"14sp"
/>
</RelativeLayout>
<View
style=
"@style/dividerX"
/>
<RelativeLayout
android:id=
"@+id/rl_middle"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"中间包参数"
android:textSize=
"14sp"
/>
<ImageView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:src=
"@mipmap/mes_arrow_down"
/>
</RelativeLayout>
<View
style=
"@style/dividerX"
/>
<LinearLayout
android:id=
"@+id/ll_middle"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:orientation=
"vertical"
android:paddingHorizontal=
"20mm"
>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:paddingVertical=
"9mm"
android:paddingLeft=
"25mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"容量"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
<EditText
android:id=
"@+id/tv_middle1"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:background=
"@null"
android:textSize=
"14sp"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:paddingVertical=
"9mm"
android:paddingLeft=
"25mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"寿命"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
<EditText
android:id=
"@+id/tv_middle2"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:background=
"@null"
android:textSize=
"14sp"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:paddingVertical=
"9mm"
android:paddingLeft=
"25mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"类型"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
<EditText
android:id=
"@+id/tv_middle3"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:background=
"@null"
android:textSize=
"14sp"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:paddingVertical=
"9mm"
android:paddingLeft=
"25mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"液位"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
<EditText
android:id=
"@+id/tv_middle4"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:background=
"@null"
android:textSize=
"14sp"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:paddingVertical=
"9mm"
android:paddingLeft=
"25mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"钢水温度"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
<EditText
android:id=
"@+id/tv_middle5"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:background=
"@null"
android:textSize=
"14sp"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:paddingVertical=
"9mm"
android:paddingLeft=
"25mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"烘烤方式"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
<EditText
android:id=
"@+id/tv_middle6"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:background=
"@null"
android:textSize=
"14sp"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:paddingVertical=
"9mm"
android:paddingLeft=
"25mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"烘烤温度"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
<EditText
android:id=
"@+id/tv_middle7"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:background=
"@null"
android:textSize=
"14sp"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:paddingVertical=
"9mm"
android:paddingLeft=
"25mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"烘烤时间"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
<EditText
android:id=
"@+id/tv_middle8"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:background=
"@null"
android:textSize=
"14sp"
/>
</RelativeLayout>
</LinearLayout>
<View
style=
"@style/dividerX"
/>
<RelativeLayout
android:id=
"@+id/rl_cover"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"中间包覆盖剂"
android:textSize=
"14sp"
/>
<ImageView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:src=
"@mipmap/mes_arrow_down"
/>
</RelativeLayout>
<View
style=
"@style/dividerX"
/>
<LinearLayout
android:id=
"@+id/ll_cover"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:orientation=
"vertical"
android:paddingHorizontal=
"20mm"
>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:paddingVertical=
"9mm"
android:paddingLeft=
"25mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"名称"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
<EditText
android:id=
"@+id/tv_cover1"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:background=
"@null"
android:textSize=
"14sp"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:paddingVertical=
"9mm"
android:paddingLeft=
"25mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"酸碱度"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
<EditText
android:id=
"@+id/tv_cover2"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:background=
"@null"
android:textSize=
"14sp"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:paddingVertical=
"9mm"
android:paddingLeft=
"25mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"化学成分"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
<EditText
android:id=
"@+id/tv_cover3"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:background=
"@null"
android:textSize=
"14sp"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:paddingVertical=
"9mm"
android:paddingLeft=
"25mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"供应商"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
<EditText
android:id=
"@+id/tv_cover4"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:background=
"@null"
android:textSize=
"14sp"
/>
</RelativeLayout>
</LinearLayout>
<View
style=
"@style/dividerX"
/>
<RelativeLayout
android:id=
"@+id/rl_protection"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"结晶器保护渣"
android:textSize=
"14sp"
/>
<ImageView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:src=
"@mipmap/mes_arrow_down"
/>
</RelativeLayout>
<View
style=
"@style/dividerX"
/>
<LinearLayout
android:id=
"@+id/ll_protection"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:orientation=
"vertical"
android:paddingHorizontal=
"20mm"
>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:paddingVertical=
"9mm"
android:paddingLeft=
"25mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"名称"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
<EditText
android:id=
"@+id/tv_protection1"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:background=
"@null"
android:textSize=
"14sp"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:paddingVertical=
"9mm"
android:paddingLeft=
"25mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"酸碱度"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
<EditText
android:id=
"@+id/tv_protection2"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:background=
"@null"
android:textSize=
"14sp"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:paddingVertical=
"9mm"
android:paddingLeft=
"25mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"化学成分"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
<EditText
android:id=
"@+id/tv_protection3"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:background=
"@null"
android:textSize=
"14sp"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:paddingVertical=
"9mm"
android:paddingLeft=
"25mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"供应商"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
<EditText
android:id=
"@+id/tv_protection4"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:background=
"@null"
android:textSize=
"14sp"
/>
</RelativeLayout>
</LinearLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"添加连铸三大件"
android:textSize=
"15sp"
/>
<LinearLayout
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:gravity=
"right"
android:orientation=
"vertical"
>
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_data1"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
<TextView
android:id=
"@+id/tv_add1"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:gravity=
"right"
android:text=
"添加 +"
android:textSize=
"16sp"
/>
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"10mm"
android:background=
"@android:color/white"
android:gravity=
"right"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"供货记录"
android:textSize=
"15sp"
/>
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_data2"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_gravity=
"right"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"10mm"
android:background=
"@android:color/white"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"其他供应商供货情况"
android:textSize=
"15sp"
/>
<LinearLayout
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:gravity=
"right"
android:orientation=
"vertical"
>
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_data3"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_gravity=
"right"
/>
<TextView
android:id=
"@+id/tv_add3"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:gravity=
"right"
android:text=
"添加 +"
android:textSize=
"16sp"
/>
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"10mm"
android:background=
"@android:color/white"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"库存记录"
android:textSize=
"15sp"
/>
<LinearLayout
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:gravity=
"right"
android:orientation=
"vertical"
>
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_data5"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
<TextView
android:id=
"@+id/tv_add5"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:gravity=
"right"
android:text=
"添加 +"
android:textSize=
"16sp"
/>
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"10mm"
android:background=
"@android:color/white"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"其他中包耐材记录"
android:textSize=
"15sp"
/>
<LinearLayout
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:gravity=
"right"
android:orientation=
"vertical"
>
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_data4"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
<TextView
android:id=
"@+id/tv_add4"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:gravity=
"right"
android:text=
"添加 +"
android:textSize=
"16sp"
/>
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"10mm"
android:background=
"@android:color/white"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"中间包承包与结算情况"
android:textSize=
"15sp"
/>
<LinearLayout
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:gravity=
"right"
android:orientation=
"vertical"
>
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_data6"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
<TextView
android:id=
"@+id/tv_add6"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:gravity=
"right"
android:text=
"添加 +"
android:textSize=
"16sp"
/>
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id=
"@+id/rl_add"
android:visibility=
"gone"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"10mm"
android:layout_marginBottom=
"30mm"
android:background=
"@android:color/white"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"中间包承包与结算情况"
android:textSize=
"14sp"
/>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:text=
"+添加"
android:textSize=
"14sp"
/>
</RelativeLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/item_user_detail_factory1.xml
0 → 100644
浏览文件 @
fe42132b
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:gravity=
"right"
android:orientation=
"horizontal"
>
<TextView
android:id=
"@+id/tv_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginRight=
"10mm"
android:text=
"cs344"
android:textSize=
"15sp"
/>
<TextView
android:id=
"@+id/tv_num"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"cs344"
android:textSize=
"15sp"
/>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/item_user_detail_factory2.xml
0 → 100644
浏览文件 @
fe42132b
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:gravity=
"right"
android:orientation=
"horizontal"
>
<TextView
android:id=
"@+id/tv_num"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginRight=
"10mm"
android:text=
"cs344"
android:textSize=
"15sp"
/>
<TextView
android:id=
"@+id/tv_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginRight=
"10mm"
android:text=
"cs344"
android:textSize=
"15sp"
/>
<TextView
android:id=
"@+id/tv_type"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"cs344"
android:textSize=
"15sp"
/>
</LinearLayout>
\ No newline at end of file
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论