Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
android
/
dayu
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
db26bdf1
authored
Nov 16, 2020
by
mReturn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
服务工单添加紧急状态标识
parent
995ec248
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
56 additions
and
2 deletions
orderCenter/src/main/java/com/dayu/order/api/protocol/OrderDetail.java
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
orderCenter/src/main/res/layout/fragment_multi_detail.xml
orderCenter/src/main/res/layout/fragment_orderdoing_item.xml
userCenter/src/main/java/com/dayu/usercenter/data/protocol/EngineerInfo.java
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java
orderCenter/src/main/java/com/dayu/order/api/protocol/OrderDetail.java
View file @
db26bdf1
...
...
@@ -82,6 +82,15 @@ public class OrderDetail implements Serializable {
private
double
subsidyPrice
;
private
int
createProviderId
;
private
int
version
;
private
int
alerted
;
public
int
getAlerted
()
{
return
alerted
;
}
public
void
setAlerted
(
int
alerted
)
{
this
.
alerted
=
alerted
;
}
public
int
getVersion
()
{
return
version
;
...
...
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
View file @
db26bdf1
...
...
@@ -345,7 +345,9 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
if
(
item
.
getAlerted
()
==
2
){
holder
.
itemTody
.
setTextColor
(
Color
.
parseColor
(
"#FF5A4B"
));
holder
.
itemTime
.
setTextColor
(
Color
.
parseColor
(
"#FF5A4B"
));
holder
.
tvAlert
.
setVisibility
(
View
.
VISIBLE
);
}
else
{
holder
.
tvAlert
.
setVisibility
(
View
.
GONE
);
long
timeDiff
=
CommonUtils
.
caluteTimeDiff
(
time
);
double
timeMin
=
timeDiff
/
60000.0
;
//相差分钟数
if
(
timeMin
<
0
)
{
...
...
orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
View file @
db26bdf1
...
...
@@ -92,6 +92,7 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag
initInfoView
(
detail
);
getShowPriceData
();
}
mBind
.
tvAlert
.
setText
(
detail
.
getAlerted
()
==
2
?
"紧急"
:
"正常"
);
mServerAdapter
=
new
CoreAdapter
<>(
false
);
mBind
.
rlServerContent
.
setLayoutManager
(
new
LinearLayoutManager
(
mActivity
));
mServerAdapter
.
setViewType
(
R
.
layout
.
item_detail_server_info
);
...
...
orderCenter/src/main/res/layout/fragment_multi_detail.xml
View file @
db26bdf1
...
...
@@ -86,10 +86,32 @@
android:textSize=
"14sp"
/>
<TextView
android:id=
"@+id/tv_content"
android:id=
"@+id/tv_alert0"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_below=
"@+id/tv_state"
android:layout_marginTop=
"15dp"
android:text=
"优 先 级"
android:textColor=
"@color/tv_cl"
android:textSize=
"14sp"
/>
<TextView
android:id=
"@+id/tv_alert"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_below=
"@+id/tv_state"
android:layout_marginLeft=
"19dp"
android:textColor=
"@color/common_text_color"
android:layout_marginTop=
"@dimen/dp_15"
android:layout_toRightOf=
"@+id/tv_alert0"
android:text=
"正常"
android:textSize=
"14sp"
/>
<TextView
android:id=
"@+id/tv_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_below=
"@+id/tv_alert0"
android:layout_marginTop=
"15dp"
android:text=
"@string/server_content"
android:textColor=
"@color/tv_cl"
...
...
@@ -99,7 +121,7 @@
android:id=
"@+id/ll_server_content"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_below=
"@id/tv_
state
"
android:layout_below=
"@id/tv_
alert0
"
android:layout_marginLeft=
"19dp"
android:layout_marginTop=
"15dp"
android:layout_toRightOf=
"@+id/tv_content"
>
...
...
orderCenter/src/main/res/layout/fragment_orderdoing_item.xml
View file @
db26bdf1
...
...
@@ -69,6 +69,17 @@
android:textColor=
"@color/cl_tab_read"
android:textSize=
"14sp"
android:visibility=
"gone"
/>
<TextView
android:id=
"@+id/tv_alert"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"right"
android:layout_marginTop=
"3dp"
android:textColor=
"@color/cl_tab_read"
android:text=
"紧急"
android:textSize=
"14sp"
android:visibility=
"gone"
/>
</LinearLayout>
<ImageView
...
...
userCenter/src/main/java/com/dayu/usercenter/data/protocol/EngineerInfo.java
View file @
db26bdf1
...
...
@@ -37,7 +37,15 @@ public class EngineerInfo extends BaseObservable implements Serializable {
private
int
liveStatus
;
private
int
lianmaiStatus
;
private
String
nickName
;
private
int
detectStatus
;
public
int
getDetectStatus
()
{
return
detectStatus
;
}
public
void
setDetectStatus
(
int
detectStatus
)
{
this
.
detectStatus
=
detectStatus
;
}
public
String
getNickName
()
{
return
nickName
;
...
...
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java
View file @
db26bdf1
...
...
@@ -218,6 +218,7 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
private
void
saveUserInfo
(
EngineerInfo
info
)
{
UserInfo
userInfo
=
UserManager
.
getInstance
().
getUser
();
if
(
userInfo
!=
null
)
{
userInfo
.
setDetectStatus
(
info
.
getDetectStatus
());
userInfo
.
setAccountName
(
info
.
getRealName
());
userInfo
.
setHeaderImg
(
info
.
getAccountUrl
());
userInfo
.
setNickName
(
info
.
getNickName
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment