Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
RvApp
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lify
RvApp
Commits
c1b96687
Commit
c1b96687
authored
Nov 06, 2019
by
jianglx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改所有订单钟会员待支付订单没有倒计时的问题以及价钱显示问题;修改im中聊天界面显示客服状态。
parent
6e80e712
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
10 deletions
+15
-10
AllOrderFragment.java
...v/home/rv/module/ui/main/home/order/AllOrderFragment.java
+3
-3
OrderListAdapter.java
...v/module/ui/main/home/order/adapter/OrderListAdapter.java
+1
-0
ChatActivity.java
plugin_im/src/main/java/com/rv/im/ChatActivity.java
+5
-4
CustomerListActivity.java
plugin_im/src/main/java/com/rv/im/CustomerListActivity.java
+6
-3
No files found.
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/AllOrderFragment.java
View file @
c1b96687
...
...
@@ -111,11 +111,11 @@ public class AllOrderFragment extends BaseFragment<CommonPresenter> implements B
switch
(
dataBean
.
getStatusX
())
{
case
3
:
if
(
id
==
R
.
id
.
tv_process
)
{
payShowSelect
(
dataBean
.
getNo
(),
dataBean
.
get
Order
Amount
());
payShowSelect
(
dataBean
.
getNo
(),
dataBean
.
get
Real
Amount
());
}
else
if
(
id
==
R
.
id
.
tv_camp_process
)
{
payShowSelect
(
dataBean
.
getNo
(),
dataBean
.
get
Order
Amount
());
payShowSelect
(
dataBean
.
getNo
(),
dataBean
.
get
Real
Amount
());
}
else
if
(
id
==
R
.
id
.
tv_member_pay
)
{
payShowSelect
(
dataBean
.
getNo
(),
dataBean
.
get
Order
Amount
());
payShowSelect
(
dataBean
.
getNo
(),
dataBean
.
get
Real
Amount
());
}
break
;
case
4
:
...
...
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/OrderListAdapter.java
View file @
c1b96687
...
...
@@ -225,6 +225,7 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
helper
.
setText
(
R
.
id
.
tv_order_state
,
mContext
.
getString
(
R
.
string
.
rv_order_for_payment
));
helper
.
setText
(
R
.
id
.
tv_member_pay
,
mContext
.
getString
(
R
.
string
.
rv_to_pay_for
));
helper
.
setVisible
(
R
.
id
.
tv_member_pay
,
true
);
setTimes
(
AppCookie
.
getLongValue
(
"actMember"
),
helper
,
dataBean3
);
break
;
case
6
:
helper
.
setText
(
R
.
id
.
tv_order_state
,
mContext
.
getString
(
R
.
string
.
rv_order_completed
));
...
...
plugin_im/src/main/java/com/rv/im/ChatActivity.java
View file @
c1b96687
...
...
@@ -247,7 +247,8 @@ public class ChatActivity extends BaseStatusActivity<CommonPresenter> implements
targetName
=
getIntent
().
getStringExtra
(
"targetName"
);
customerStatus
=
getIntent
().
getIntExtra
(
"customerStatus"
,
0
);
if
(!
TextUtils
.
isEmpty
(
targetName
))
titleView
.
setTitle
(
targetName
+
(
customerStatus
==
0
?
"(离线)"
:
"(在线)"
));
titleView
.
setTitle
(
targetName
);
// titleView.setTitle(targetName + (customerStatus == 0 ? "(离线)" : "(在线)"));
mInputManager
=
(
InputMethodManager
)
getSystemService
(
Context
.
INPUT_METHOD_SERVICE
);
mLoginUserId
=
ImSetting
.
getUserId
();
presenter
=
new
ChatPresenterImp
(
this
,
this
);
...
...
@@ -257,9 +258,9 @@ public class ChatActivity extends BaseStatusActivity<CommonPresenter> implements
initWidget
();
initListener
();
timer
=
new
Timer
();
timerTask
=
new
RvImTimerTask
(
timerListener
);
timer
.
schedule
(
timerTask
,
100
,
10000
);
//
timer = new Timer();
//
timerTask = new RvImTimerTask(timerListener);
//
timer.schedule(timerTask, 100, 10000);
}
@Override
...
...
plugin_im/src/main/java/com/rv/im/CustomerListActivity.java
View file @
c1b96687
...
...
@@ -195,9 +195,9 @@ public class CustomerListActivity extends BaseStatusActivity<CommonPresenter> im
@Override
public
void
onShowError
(
String
errorMsg
,
int
errorType
)
{
super
.
onShowError
(
errorMsg
,
errorType
);
if
(
isRefresh
)
{
if
(
isRefresh
)
{
refreshLayout
.
onRefreshComplete
();
isRefresh
=
false
;
isRefresh
=
false
;
}
}
...
...
@@ -262,8 +262,11 @@ public class CustomerListActivity extends BaseStatusActivity<CommonPresenter> im
timerTask
.
cancel
();
}
private
AppConfig
appConfig
=
null
;
private
RvImTimerTask
.
TimerListener
timerListener
=
()
->
runOnUiThread
(()
->
{
AppConfig
appConfig
=
(
AppConfig
)
RvCache
.
getInstance
().
get
(
CacheEnum
.
IM_CONFIG
);
if
(
appConfig
==
null
)
appConfig
=
(
AppConfig
)
RvCache
.
getInstance
().
get
(
CacheEnum
.
IM_CONFIG
);
if
(
appConfig
!=
null
&&
!
TextUtils
.
isEmpty
(
appConfig
.
USER_GET_URL
))
if
(
customers
!=
null
&&
customers
.
size
()
>
0
)
for
(
Customer
customer
:
customers
)
{
...
...
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