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
d91455b6
Commit
d91455b6
authored
Jul 13, 2019
by
jianglx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加 点击订单详情内的再看看按钮的跳转
parent
f02312c2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
39 additions
and
14 deletions
+39
-14
MainActivity.java
RvClient/src/main/java/com/xxfc/rv/MainActivity.java
+7
-0
MemberOrderDetailsActivity.java
...module/ui/main/home/order/MemberOrderDetailsActivity.java
+7
-0
OrderDetailActivity.java
...ome/rv/module/ui/main/home/order/OrderDetailActivity.java
+7
-1
TravelOrderDetailsActivity.java
...module/ui/main/home/order/TravelOrderDetailsActivity.java
+18
-13
No files found.
RvClient/src/main/java/com/xxfc/rv/MainActivity.java
View file @
d91455b6
...
@@ -229,6 +229,13 @@ public class MainActivity extends BaseActivity<CommonPresenter> {
...
@@ -229,6 +229,13 @@ public class MainActivity extends BaseActivity<CommonPresenter> {
if
(
intent
!=
null
&&
"use_member"
.
equals
(
intent
.
getStringExtra
(
"from"
)))
{
if
(
intent
!=
null
&&
"use_member"
.
equals
(
intent
.
getStringExtra
(
"from"
)))
{
setCurrent
(
TYPE_HOME_PAGE
);
setCurrent
(
TYPE_HOME_PAGE
);
}
}
if
(
intent
!=
null
&&
"traveldetail"
.
equals
(
intent
.
getStringExtra
(
"from"
)))
{
setCurrent
(
TYPE_TRAVEL
);
}
if
(
intent
!=
null
&&
"orderdetail"
.
equals
(
intent
.
getStringExtra
(
"from"
)))
{
setCurrent
(
TYPE_HOME_PAGE
);
}
}
}
/****
/****
...
...
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/MemberOrderDetailsActivity.java
View file @
d91455b6
package
com
.
rv
.
home
.
rv
.
module
.
ui
.
main
.
home
.
order
;
package
com
.
rv
.
home
.
rv
.
module
.
ui
.
main
.
home
.
order
;
import
android.annotation.SuppressLint
;
import
android.annotation.SuppressLint
;
import
android.content.ComponentName
;
import
android.content.Context
;
import
android.content.Context
;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.net.Uri
;
import
android.net.Uri
;
...
@@ -437,6 +438,12 @@ public class MemberOrderDetailsActivity extends BaseStatusActivity<PickerPresent
...
@@ -437,6 +438,12 @@ public class MemberOrderDetailsActivity extends BaseStatusActivity<PickerPresent
@JavascriptInterface
@JavascriptInterface
public
void
showMore
()
{
public
void
showMore
()
{
ComponentName
cmn
=
new
ComponentName
(
getApplicationContext
(),
"com.rv.member.MemberCenterActivity"
);
Intent
intent
=
new
Intent
();
intent
.
setComponent
(
cmn
);
startActivity
(
intent
);
finish
();
}
}
}
}
}
}
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/OrderDetailActivity.java
View file @
d91455b6
...
@@ -3,6 +3,7 @@ package com.rv.home.rv.module.ui.main.home.order;
...
@@ -3,6 +3,7 @@ package com.rv.home.rv.module.ui.main.home.order;
import
android.annotation.SuppressLint
;
import
android.annotation.SuppressLint
;
import
android.app.Activity
;
import
android.app.Activity
;
import
android.content.ClipboardManager
;
import
android.content.ClipboardManager
;
import
android.content.ComponentName
;
import
android.content.Context
;
import
android.content.Context
;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.net.Uri
;
import
android.net.Uri
;
...
@@ -475,7 +476,12 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
...
@@ -475,7 +476,12 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
@JavascriptInterface
@JavascriptInterface
public
void
showMore
()
{
public
void
showMore
()
{
// ARouter.getInstance().build().navigation();
ComponentName
cmn
=
new
ComponentName
(
getApplicationContext
(),
"com.xxfc.rv.MainActivity"
);
Intent
intent
=
new
Intent
();
intent
.
putExtra
(
"from"
,
"orderdetail"
);
intent
.
setComponent
(
cmn
);
startActivity
(
intent
);
finish
();
}
}
}
}
}
}
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/TravelOrderDetailsActivity.java
View file @
d91455b6
...
@@ -2,6 +2,7 @@ package com.rv.home.rv.module.ui.main.home.order;
...
@@ -2,6 +2,7 @@ package com.rv.home.rv.module.ui.main.home.order;
import
android.annotation.SuppressLint
;
import
android.annotation.SuppressLint
;
import
android.content.ClipboardManager
;
import
android.content.ClipboardManager
;
import
android.content.ComponentName
;
import
android.content.Context
;
import
android.content.Context
;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.net.Uri
;
import
android.net.Uri
;
...
@@ -126,13 +127,13 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
...
@@ -126,13 +127,13 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
protected
void
initView
(
Bundle
savedInstanceState
,
TitleView
titleView
,
Intent
intent
)
{
protected
void
initView
(
Bundle
savedInstanceState
,
TitleView
titleView
,
Intent
intent
)
{
showTitle
(
false
);
showTitle
(
false
);
initRxBus
();
initRxBus
();
api
=
WXAPIFactory
.
createWXAPI
(
mActivity
,
RvFrameConfig
.
APP_ID
);
api
=
WXAPIFactory
.
createWXAPI
(
mActivity
,
RvFrameConfig
.
APP_ID
);
dataBean
=
(
OrderListBean
.
DataBeanX
.
DataBean
)
intent
.
getSerializableExtra
(
"dataBean"
);
dataBean
=
(
OrderListBean
.
DataBeanX
.
DataBean
)
intent
.
getSerializableExtra
(
"dataBean"
);
if
(
dataBean
!=
null
)
{
if
(
dataBean
!=
null
)
{
status
=
dataBean
.
getStatusX
();
status
=
dataBean
.
getStatusX
();
no
=
dataBean
.
getNo
();
no
=
dataBean
.
getNo
();
orderAmount
=
dataBean
.
getOrderAmount
();
orderAmount
=
dataBean
.
getOrderAmount
();
}
}
/**
/**
*
*
(query)
(query)
...
@@ -240,12 +241,12 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
...
@@ -240,12 +241,12 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
payShowSelect
(
no
,
orderAmount
);
payShowSelect
(
no
,
orderAmount
);
break
;
break
;
case
4
:
case
4
:
startActivity
(
GetOnTheCarQRCodeActivity
.
getIntent
(
mActivity
,
dataBean
));
startActivity
(
GetOnTheCarQRCodeActivity
.
getIntent
(
mActivity
,
dataBean
));
break
;
break
;
case
5
:
case
5
:
break
;
break
;
case
6
:
case
6
:
startActivityForResult
(
EvaluationActivity
.
getIntent
(
mActivity
,
dataBean
),
TYPE_REQUEST_EVALUATION
);
startActivityForResult
(
EvaluationActivity
.
getIntent
(
mActivity
,
dataBean
),
TYPE_REQUEST_EVALUATION
);
break
;
break
;
}
}
}
}
...
@@ -408,10 +409,9 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
...
@@ -408,10 +409,9 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
mWebView
.
setWebChromeClient
(
new
WebChromeClient
()
{
mWebView
.
setWebChromeClient
(
new
WebChromeClient
()
{
@Override
@Override
public
void
onProgressChanged
(
WebView
view
,
int
newProgress
)
{
public
void
onProgressChanged
(
WebView
view
,
int
newProgress
)
{
if
(
newProgress
==
100
)
{
if
(
newProgress
==
100
)
{
pbProgress
.
setVisibility
(
View
.
GONE
);
//加载完网页进度条消失
pbProgress
.
setVisibility
(
View
.
GONE
);
//加载完网页进度条消失
}
}
else
{
else
{
pbProgress
.
setVisibility
(
View
.
VISIBLE
);
//开始加载网页时显示进度条
pbProgress
.
setVisibility
(
View
.
VISIBLE
);
//开始加载网页时显示进度条
pbProgress
.
setProgress
(
newProgress
);
//设置进度值
pbProgress
.
setProgress
(
newProgress
);
//设置进度值
}
}
...
@@ -444,7 +444,12 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
...
@@ -444,7 +444,12 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
@JavascriptInterface
@JavascriptInterface
public
void
showMore
()
{
public
void
showMore
()
{
ComponentName
cmn
=
new
ComponentName
(
getApplicationContext
(),
"com.xxfc.rv.MainActivity"
);
Intent
intent
=
new
Intent
();
intent
.
putExtra
(
"from"
,
"traveldetail"
);
intent
.
setComponent
(
cmn
);
startActivity
(
intent
);
finish
();
}
}
}
}
}
}
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