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
b87dc50f
提交
b87dc50f
authored
7月 07, 2020
作者:
lgd
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.修改钢包展示问题,添加限制
上级
9b749691
隐藏空白字符变更
内嵌
并排
正在显示
10 个修改的文件
包含
8 行增加
和
43 行删除
+8
-43
FactoryDetailBean.java
...ava/com/wd/workoffice/bean/mesBean/FactoryDetailBean.java
+3
-3
MesChooseFactoryAddActivity.java
...ice/ui/activity/mes/user/MesChooseFactoryAddActivity.java
+0
-9
MesChooseFactoryModifyActivity.java
.../ui/activity/mes/user/MesChooseFactoryModifyActivity.java
+0
-9
MesUserDataDetailAddActivity.java
...ce/ui/activity/mes/user/MesUserDataDetailAddActivity.java
+0
-9
MesUserDataDetailModifyActivity.java
...ui/activity/mes/user/MesUserDataDetailModifyActivity.java
+0
-9
UserDataAdd3LabelAddAdapter.java
...wd/workoffice/ui/adapter/UserDataAdd3LabelAddAdapter.java
+1
-3
activity_mes_user_data_machine_detail.xml
...main/res/layout/activity_mes_user_data_machine_detail.xml
+1
-0
activity_mes_user_data_machine_modify.xml
...main/res/layout/activity_mes_user_data_machine_modify.xml
+1
-0
item_add3_label.xml
app/src/main/res/layout/item_add3_label.xml
+1
-0
item_user_add_factory_label.xml
app/src/main/res/layout/item_user_add_factory_label.xml
+1
-1
没有找到文件。
app/src/main/java/com/wd/workoffice/bean/mesBean/FactoryDetailBean.java
浏览文件 @
b87dc50f
...
...
@@ -589,7 +589,7 @@ public class FactoryDetailBean {
private
String
steelmakingWorksName
;
private
String
capacity
;
private
String
temperatureRange
;
private
Lo
ng
castingDateTime
;
private
Stri
ng
castingDateTime
;
private
String
createUserId
;
private
Object
createUserName
;
private
String
updateUserId
;
...
...
@@ -661,11 +661,11 @@ public class FactoryDetailBean {
this
.
temperatureRange
=
temperatureRange
;
}
public
Lo
ng
getCastingDateTime
()
{
public
Stri
ng
getCastingDateTime
()
{
return
castingDateTime
;
}
public
void
setCastingDateTime
(
Lo
ng
castingDateTime
)
{
public
void
setCastingDateTime
(
Stri
ng
castingDateTime
)
{
this
.
castingDateTime
=
castingDateTime
;
}
...
...
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseFactoryAddActivity.java
浏览文件 @
b87dc50f
...
...
@@ -127,15 +127,6 @@ public class MesChooseFactoryAddActivity extends WorkToolBarActivity {
data3List
.
remove
(
position
);
data3Adapter
.
notifyDataSetChanged
();
break
;
case
R
.
id
.
rl_time
:
PickTimeUtils
.
showPickThree
(
MesChooseFactoryAddActivity
.
this
,
new
OnTimeSelectListener
()
{
@Override
public
void
onTimeSelect
(
Date
date
,
View
v
)
{
data3List
.
get
(
position
).
setCastingDateTime
(
TimeUtils
.
date2Millis
(
date
)/
1000
);
data3Adapter
.
notifyDataSetChanged
();
}
}).
show
();
break
;
}
}
...
...
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseFactoryModifyActivity.java
浏览文件 @
b87dc50f
...
...
@@ -181,15 +181,6 @@ public class MesChooseFactoryModifyActivity extends WorkToolBarActivity {
data3List
.
remove
(
position
);
data3Adapter
.
notifyDataSetChanged
();
break
;
case
R
.
id
.
rl_time
:
PickTimeUtils
.
showPickThree
(
MesChooseFactoryModifyActivity
.
this
,
new
OnTimeSelectListener
()
{
@Override
public
void
onTimeSelect
(
Date
date
,
View
v
)
{
data3List
.
get
(
position
).
setCastingDateTime
(
TimeUtils
.
date2Millis
(
date
)
/
1000
);
data3Adapter
.
notifyDataSetChanged
();
}
}).
show
();
break
;
}
}
...
...
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailAddActivity.java
浏览文件 @
b87dc50f
...
...
@@ -499,15 +499,6 @@ public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
dataFactory3List
.
remove
(
position
);
factory3Adapter
.
notifyDataSetChanged
();
break
;
case
R
.
id
.
rl_time
:
PickTimeUtils
.
showPickThree
(
MesUserDataDetailAddActivity
.
this
,
new
OnTimeSelectListener
()
{
@Override
public
void
onTimeSelect
(
Date
date
,
View
v
)
{
dataFactory3List
.
get
(
position
).
setCastingDateTime
(
TimeUtils
.
date2Millis
(
date
)
/
1000
);
factory3Adapter
.
notifyDataSetChanged
();
}
}).
show
();
break
;
}
}
...
...
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailModifyActivity.java
浏览文件 @
b87dc50f
...
...
@@ -499,15 +499,6 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
dataFactory3List
.
remove
(
position
);
factory3Adapter
.
notifyDataSetChanged
();
break
;
case
R
.
id
.
rl_time
:
PickTimeUtils
.
showPickThree
(
MesUserDataDetailModifyActivity
.
this
,
new
OnTimeSelectListener
()
{
@Override
public
void
onTimeSelect
(
Date
date
,
View
v
)
{
dataFactory3List
.
get
(
position
).
setCastingDateTime
(
TimeUtils
.
date2Millis
(
date
)
/
1000
);
factory3Adapter
.
notifyDataSetChanged
();
}
}).
show
();
break
;
}
}
...
...
app/src/main/java/com/wd/workoffice/ui/adapter/UserDataAdd3LabelAddAdapter.java
浏览文件 @
b87dc50f
...
...
@@ -97,9 +97,7 @@ public class UserDataAdd3LabelAddAdapter extends BaseQuickAdapter<FactoryDetailB
@Override
public
void
afterTextChanged
(
Editable
s
)
{
if
(!
TextUtils
.
isEmpty
(
s
.
toString
()))
{
item
.
setCastingDateTime
(
Long
.
valueOf
(
s
.
toString
()));
}
item
.
setCastingDateTime
(
s
.
toString
());
}
});
}
...
...
app/src/main/res/layout/activity_mes_user_data_machine_detail.xml
浏览文件 @
b87dc50f
...
...
@@ -384,6 +384,7 @@
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:inputType=
"numberDecimal"
android:background=
"@null"
android:textSize=
"14sp"
/>
</RelativeLayout>
...
...
app/src/main/res/layout/activity_mes_user_data_machine_modify.xml
浏览文件 @
b87dc50f
...
...
@@ -416,6 +416,7 @@
android:hint=
"请输入"
android:layout_height=
"wrap_content"
android:layout_marginRight=
"3mm"
android:inputType=
"numberDecimal"
android:background=
"@null"
android:textSize=
"14sp"
/>
</LinearLayout>
...
...
app/src/main/res/layout/item_add3_label.xml
浏览文件 @
b87dc50f
...
...
@@ -107,6 +107,7 @@
android:id=
"@+id/tv_content3"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:inputType=
"numberDecimal"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:textSize=
"14sp"
/>
...
...
app/src/main/res/layout/item_user_add_factory_label.xml
浏览文件 @
b87dc50f
...
...
@@ -133,8 +133,8 @@
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"3mm"
android:background=
"@null"
android:inputType=
"number"
android:hint=
"请输入"
android:inputType=
"numberDecimal"
android:textSize=
"14sp"
/>
</RelativeLayout>
</LinearLayout>
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论