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
e7017a05
提交
e7017a05
authored
6月 28, 2020
作者:
lgd
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.修改消息样式
上级
7b6753a4
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
44 行增加
和
22 行删除
+44
-22
MsgBean.java
app/src/main/java/com/wd/workoffice/bean/MsgBean.java
+3
-3
MsgAdapter.java
...rc/main/java/com/wd/workoffice/ui/adapter/MsgAdapter.java
+1
-0
MsgFragment.java
app/src/main/java/com/wd/workoffice/ui/fg/MsgFragment.java
+3
-3
MsgListFragment.java
...rc/main/java/com/wd/workoffice/ui/fg/MsgListFragment.java
+7
-10
item_msg.xml
app/src/main/res/layout/item_msg.xml
+30
-6
没有找到文件。
app/src/main/java/com/wd/workoffice/bean/MsgBean.java
浏览文件 @
e7017a05
...
@@ -132,7 +132,7 @@ public class MsgBean {
...
@@ -132,7 +132,7 @@ public class MsgBean {
private
Object
userNickName
;
private
Object
userNickName
;
private
String
noticeType
;
private
String
noticeType
;
private
String
title
;
private
String
title
;
private
Object
content
;
private
String
content
;
public
int
getCreatedBy
()
{
public
int
getCreatedBy
()
{
return
createdBy
;
return
createdBy
;
...
@@ -310,11 +310,11 @@ public class MsgBean {
...
@@ -310,11 +310,11 @@ public class MsgBean {
this
.
title
=
title
;
this
.
title
=
title
;
}
}
public
Object
getContent
()
{
public
String
getContent
()
{
return
content
;
return
content
;
}
}
public
void
setContent
(
Object
content
)
{
public
void
setContent
(
String
content
)
{
this
.
content
=
content
;
this
.
content
=
content
;
}
}
}
}
...
...
app/src/main/java/com/wd/workoffice/ui/adapter/MsgAdapter.java
浏览文件 @
e7017a05
...
@@ -27,6 +27,7 @@ public class MsgAdapter extends BaseQuickAdapter<MsgBean.RecordsBean, BaseViewHo
...
@@ -27,6 +27,7 @@ public class MsgAdapter extends BaseQuickAdapter<MsgBean.RecordsBean, BaseViewHo
protected
void
convert
(
BaseViewHolder
helper
,
MsgBean
.
RecordsBean
item
)
{
protected
void
convert
(
BaseViewHolder
helper
,
MsgBean
.
RecordsBean
item
)
{
helper
.
setText
(
R
.
id
.
tv_time
,
item
.
getCreatedTime
());
helper
.
setText
(
R
.
id
.
tv_time
,
item
.
getCreatedTime
());
helper
.
setText
(
R
.
id
.
tv_title
,
item
.
getTitle
());
helper
.
setText
(
R
.
id
.
tv_title
,
item
.
getTitle
());
helper
.
setText
(
R
.
id
.
tv_content
,
item
.
getContent
());
}
}
}
}
app/src/main/java/com/wd/workoffice/ui/fg/MsgFragment.java
浏览文件 @
e7017a05
...
@@ -35,7 +35,7 @@ public class MsgFragment extends WorkBaseFg {
...
@@ -35,7 +35,7 @@ public class MsgFragment extends WorkBaseFg {
ViewPager
vpData
;
ViewPager
vpData
;
private
String
tab
[]
=
{
private
String
tab
[]
=
{
"BAT消息"
,
"MES消息"
};
"BAT消息"
,
"MES消息"
};
private
String
order
[]
=
{
private
String
type
[]
=
{
"0"
,
"1"
};
"0"
,
"1"
};
@Override
@Override
...
@@ -50,9 +50,9 @@ public class MsgFragment extends WorkBaseFg {
...
@@ -50,9 +50,9 @@ public class MsgFragment extends WorkBaseFg {
FragmentManager
sfm
=
getChildFragmentManager
();
FragmentManager
sfm
=
getChildFragmentManager
();
List
<
Fragment
>
data
=
new
ArrayList
<>();
List
<
Fragment
>
data
=
new
ArrayList
<>();
for
(
int
i
=
0
;
i
<
tab
.
length
;
i
++)
{
for
(
int
i
=
0
;
i
<
tab
.
length
;
i
++)
{
Msg
DetailFragment
saleFragment
=
new
MsgDetail
Fragment
();
Msg
ListFragment
saleFragment
=
new
MsgList
Fragment
();
Bundle
bundle
=
new
Bundle
();
Bundle
bundle
=
new
Bundle
();
bundle
.
putString
(
"
state"
,
order
[
i
]);
bundle
.
putString
(
"
type"
,
type
[
i
]);
saleFragment
.
setArguments
(
bundle
);
saleFragment
.
setArguments
(
bundle
);
data
.
add
(
saleFragment
);
data
.
add
(
saleFragment
);
}
}
...
...
app/src/main/java/com/wd/workoffice/ui/fg/MsgListFragment.java
浏览文件 @
e7017a05
...
@@ -55,7 +55,6 @@ public class MsgListFragment extends WorkBaseFg {
...
@@ -55,7 +55,6 @@ public class MsgListFragment extends WorkBaseFg {
private
MsgAdapter
dataAdapter
;
private
MsgAdapter
dataAdapter
;
private
List
<
MsgBean
.
RecordsBean
>
dataList
;
private
List
<
MsgBean
.
RecordsBean
>
dataList
;
private
String
type
;
private
String
type
;
private
String
state
;
@Override
@Override
protected
void
initView
()
{
protected
void
initView
()
{
...
@@ -69,12 +68,12 @@ public class MsgListFragment extends WorkBaseFg {
...
@@ -69,12 +68,12 @@ public class MsgListFragment extends WorkBaseFg {
param
=
WorkUtils
.
pageKey
();
param
=
WorkUtils
.
pageKey
();
page
=
1
;
page
=
1
;
param
.
put
(
"current"
,
page
);
param
.
put
(
"current"
,
page
);
param
.
put
(
"type"
,
type
);
param
.
put
(
"type"
,
""
);
dataList
=
new
ArrayList
<>();
dataList
=
new
ArrayList
<>();
dataAdapter
=
new
MsgAdapter
(
R
.
layout
.
item_msg
,
dataList
);
dataAdapter
=
new
MsgAdapter
(
R
.
layout
.
item_msg
,
dataList
);
dataAdapter
.
bindToRecyclerView
(
rvData
);
dataAdapter
.
bindToRecyclerView
(
rvData
);
dataAdapter
.
setEmptyView
(
R
.
layout
.
view_empty_content
,
rvData
);
dataAdapter
.
setEmptyView
(
R
.
layout
.
view_empty_content
,
rvData
);
if
(
TextUtils
.
equals
(
stat
e
,
"1"
)){
if
(
TextUtils
.
equals
(
typ
e
,
"1"
)){
return
;
return
;
}
}
getData
();
getData
();
...
@@ -86,8 +85,6 @@ public class MsgListFragment extends WorkBaseFg {
...
@@ -86,8 +85,6 @@ public class MsgListFragment extends WorkBaseFg {
Bundle
arguments
=
getArguments
();
Bundle
arguments
=
getArguments
();
if
(
arguments
!=
null
)
{
if
(
arguments
!=
null
)
{
type
=
arguments
.
getString
(
"type"
);
type
=
arguments
.
getString
(
"type"
);
state
=
arguments
.
getString
(
"state"
);
}
}
}
}
...
@@ -145,11 +142,11 @@ public class MsgListFragment extends WorkBaseFg {
...
@@ -145,11 +142,11 @@ public class MsgListFragment extends WorkBaseFg {
dataAdapter
.
setOnItemClickListener
(
new
BaseQuickAdapter
.
OnItemClickListener
()
{
dataAdapter
.
setOnItemClickListener
(
new
BaseQuickAdapter
.
OnItemClickListener
()
{
@Override
@Override
public
void
onItemClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
public
void
onItemClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
msgRead
(
dataList
.
get
(
position
).
getId
());
//
msgRead(dataList.get(position).getId());
startActivity
(
MsgDetailActivity
.
class
,
"id"
,
dataList
.
get
(
position
).
getId
()+
""
);
//
startActivity(MsgDetailActivity.class, "id", dataList.get(position).getId()+"");
dataList
.
remove
(
position
);
//
dataList.remove(position);
dataAdapter
.
notifyItemRemoved
(
position
);
//
dataAdapter.notifyItemRemoved(position);
EventBus
.
getDefault
().
post
(
new
MsgReadEvent
());
//
EventBus.getDefault().post(new MsgReadEvent());
}
}
});
});
}
}
...
...
app/src/main/res/layout/item_msg.xml
浏览文件 @
e7017a05
...
@@ -3,22 +3,45 @@
...
@@ -3,22 +3,45 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:background=
"@color/white"
android:background=
"@color/white"
android:orientation=
"vertical"
android:paddingHorizontal=
"20mm"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"10mm"
>
android:paddingVertical=
"10mm"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:gravity=
"center_vertical"
>
<View
android:layout_width=
"5mm"
android:layout_height=
"14mm"
android:background=
"#FFFBD249"
/>
<TextView
android:id=
"@+id/tv_title"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"10mm"
android:ellipsize=
"end"
android:maxLines=
"1"
android:text=
"1111111"
/>
</LinearLayout>
<TextView
<TextView
android:id=
"@+id/tv_
title
"
android:id=
"@+id/tv_
content
"
android:layout_width=
"
0dp
"
android:layout_width=
"
wrap_content
"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:layout_marginLeft=
"15mm"
android:ellipsize=
"end"
android:layout_marginTop=
"3mm"
android:maxLines=
"1"
/>
android:text=
"zz3333333z"
android:textColor=
"@color/flexible_text_sup"
/>
<TextView
<TextView
android:id=
"@+id/tv_time"
android:id=
"@+id/tv_time"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"10mm"
android:layout_gravity=
"right"
android:layout_marginTop=
"3mm"
android:text=
"zz3333333z"
android:text=
"zz3333333z"
android:textColor=
"@color/flexible_text_sup"
/>
android:textColor=
"@color/flexible_text_sup"
/>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论