Commit 733b988b authored by jianglx's avatar jianglx

Merge branch 'master-invoice' of http://113.105.137.151:22280/lify/rvapp into Branch_tag_1.5.6

parents 4053d89a da4b8ba9
...@@ -63,14 +63,14 @@ public class OrderListActivity extends BaseStatusActivity<PickerPresenter> { ...@@ -63,14 +63,14 @@ public class OrderListActivity extends BaseStatusActivity<PickerPresenter> {
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) { protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
menuPosition = intent.getIntExtra("position", 0); menuPosition = intent.getIntExtra("position", 0);
titleView.setTitle(mActivity.getString(R.string.rv_my_order)); titleView.setTitle(mActivity.getString(R.string.rv_my_order));
/* titleView.setText(R.id.tv_title_right, "开发票"); // titleView.setText(R.id.tv_title_right, "开发票");
titleView.setChildClickListener(R.id.tv_title_right, new View.OnClickListener() { // titleView.setChildClickListener(R.id.tv_title_right, new View.OnClickListener() {
@Override // @Override
public void onClick(View v) { // public void onClick(View v) {
ARouter.getInstance().build(Constance.ACTIVITY_URL_INVOICINGACTIVITY) // ARouter.getInstance().build(Constance.ACTIVITY_URL_INVOICINGACTIVITY)
.navigation(); // .navigation();
} // }
});*/ // });
initRecyclerView(); initRecyclerView();
initViewpager(); initViewpager();
......
...@@ -92,8 +92,6 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> implemen ...@@ -92,8 +92,6 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> implemen
initRxbus(); initRxbus();
userInfo = getUserInfo(); userInfo = getUserInfo();
dialog = new ProgressDialog(this); dialog = new ProgressDialog(this);
showBindingDialog();
} }
private void initRxbus() { private void initRxbus() {
......
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