Commit c1b96687 authored by jianglx's avatar jianglx

修改所有订单钟会员待支付订单没有倒计时的问题以及价钱显示问题;修改im中聊天界面显示客服状态。

parent 6e80e712
...@@ -111,11 +111,11 @@ public class AllOrderFragment extends BaseFragment<CommonPresenter> implements B ...@@ -111,11 +111,11 @@ public class AllOrderFragment extends BaseFragment<CommonPresenter> implements B
switch (dataBean.getStatusX()) { switch (dataBean.getStatusX()) {
case 3: case 3:
if (id == R.id.tv_process) { if (id == R.id.tv_process) {
payShowSelect(dataBean.getNo(), dataBean.getOrderAmount()); payShowSelect(dataBean.getNo(), dataBean.getRealAmount());
} else if (id == R.id.tv_camp_process) { } else if (id == R.id.tv_camp_process) {
payShowSelect(dataBean.getNo(), dataBean.getOrderAmount()); payShowSelect(dataBean.getNo(), dataBean.getRealAmount());
} else if (id == R.id.tv_member_pay) { } else if (id == R.id.tv_member_pay) {
payShowSelect(dataBean.getNo(), dataBean.getOrderAmount()); payShowSelect(dataBean.getNo(), dataBean.getRealAmount());
} }
break; break;
case 4: case 4:
......
...@@ -225,6 +225,7 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity, ...@@ -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_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.setText(R.id.tv_member_pay, mContext.getString(R.string.rv_to_pay_for));
helper.setVisible(R.id.tv_member_pay, true); helper.setVisible(R.id.tv_member_pay, true);
setTimes(AppCookie.getLongValue("actMember"), helper, dataBean3);
break; break;
case 6: case 6:
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_completed)); helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_completed));
......
...@@ -247,7 +247,8 @@ public class ChatActivity extends BaseStatusActivity<CommonPresenter> implements ...@@ -247,7 +247,8 @@ public class ChatActivity extends BaseStatusActivity<CommonPresenter> implements
targetName = getIntent().getStringExtra("targetName"); targetName = getIntent().getStringExtra("targetName");
customerStatus = getIntent().getIntExtra("customerStatus", 0); customerStatus = getIntent().getIntExtra("customerStatus", 0);
if (!TextUtils.isEmpty(targetName)) if (!TextUtils.isEmpty(targetName))
titleView.setTitle(targetName + (customerStatus == 0 ? "(离线)" : "(在线)")); titleView.setTitle(targetName);
// titleView.setTitle(targetName + (customerStatus == 0 ? "(离线)" : "(在线)"));
mInputManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); mInputManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
mLoginUserId = ImSetting.getUserId(); mLoginUserId = ImSetting.getUserId();
presenter = new ChatPresenterImp(this, this); presenter = new ChatPresenterImp(this, this);
...@@ -257,9 +258,9 @@ public class ChatActivity extends BaseStatusActivity<CommonPresenter> implements ...@@ -257,9 +258,9 @@ public class ChatActivity extends BaseStatusActivity<CommonPresenter> implements
initWidget(); initWidget();
initListener(); initListener();
timer = new Timer(); // timer = new Timer();
timerTask = new RvImTimerTask(timerListener); // timerTask = new RvImTimerTask(timerListener);
timer.schedule(timerTask, 100, 10000); // timer.schedule(timerTask, 100, 10000);
} }
@Override @Override
......
...@@ -195,9 +195,9 @@ public class CustomerListActivity extends BaseStatusActivity<CommonPresenter> im ...@@ -195,9 +195,9 @@ public class CustomerListActivity extends BaseStatusActivity<CommonPresenter> im
@Override @Override
public void onShowError(String errorMsg, int errorType) { public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType); super.onShowError(errorMsg, errorType);
if(isRefresh) { if (isRefresh) {
refreshLayout.onRefreshComplete(); refreshLayout.onRefreshComplete();
isRefresh = false ; isRefresh = false;
} }
} }
...@@ -262,8 +262,11 @@ public class CustomerListActivity extends BaseStatusActivity<CommonPresenter> im ...@@ -262,8 +262,11 @@ public class CustomerListActivity extends BaseStatusActivity<CommonPresenter> im
timerTask.cancel(); timerTask.cancel();
} }
private AppConfig appConfig = null;
private RvImTimerTask.TimerListener timerListener = () -> runOnUiThread(() -> { 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 (appConfig != null && !TextUtils.isEmpty(appConfig.USER_GET_URL))
if (customers != null && customers.size() > 0) if (customers != null && customers.size() > 0)
for (Customer customer : customers) { for (Customer customer : customers) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment