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
733b988b
Commit
733b988b
authored
Dec 24, 2019
by
jianglx
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master-invoice' of
http://113.105.137.151:22280/lify/rvapp
into Branch_tag_1.5.6
parents
4053d89a
da4b8ba9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
10 deletions
+8
-10
OrderListActivity.java
.../home/rv/module/ui/main/home/order/OrderListActivity.java
+8
-8
WalletActivity.java
...rc/main/java/com/xxrv/wallet/activity/WalletActivity.java
+0
-2
No files found.
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/OrderListActivity.java
View file @
733b988b
...
@@ -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
();
...
...
plugin_wallet/src/main/java/com/xxrv/wallet/activity/WalletActivity.java
View file @
733b988b
...
@@ -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
()
{
...
...
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