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
8b06f055
Commit
8b06f055
authored
Jul 12, 2019
by
linfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug修复
parent
395ee7cb
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
8 additions
and
3 deletions
+8
-3
start_back_icon.xml
RvClient/src/main/res/drawable/start_back_icon.xml
+0
-0
styles.xml
RvClient/src/main/res/values/styles.xml
+1
-1
start_backgroud.png
..._resource/src/main/res/drawable-xhdpi/start_backgroud.png
+0
-0
EvaluationActivity.java
...home/rv/module/ui/main/home/order/EvaluationActivity.java
+1
-1
MemberOrderDetailsActivity.java
...module/ui/main/home/order/MemberOrderDetailsActivity.java
+5
-0
OrderListActivity.java
.../home/rv/module/ui/main/home/order/OrderListActivity.java
+0
-1
PersonalInformationActivity.java
...a/com/rv/rvmine/traveler/PersonalInformationActivity.java
+1
-0
No files found.
RvClient/src/main/res/drawable/start_back.xml
→
RvClient/src/main/res/drawable/start_back
_icon
.xml
View file @
8b06f055
File moved
RvClient/src/main/res/values/styles.xml
View file @
8b06f055
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
<!-- 给Theme设置backgroud,解决启动黑屏问题,不过这样的启动速度好像变得更慢了一些-->
<!-- 给Theme设置backgroud,解决启动黑屏问题,不过这样的启动速度好像变得更慢了一些-->
<style
name=
"SplashTheme"
parent=
"Theme.AppCompat.Light.NoActionBar"
>
<style
name=
"SplashTheme"
parent=
"Theme.AppCompat.Light.NoActionBar"
>
<item
name=
"android:windowBackground"
>
@drawable/start_back
</item>
<item
name=
"android:windowBackground"
>
@drawable/start_back
_icon
</item>
<item
name=
"windowNoTitle"
>
true
</item>
<item
name=
"windowNoTitle"
>
true
</item>
<item
name=
"windowActionBar"
>
false
</item>
<item
name=
"windowActionBar"
>
false
</item>
<item
name=
"android:windowContentOverlay"
>
@null
</item>
<item
name=
"android:windowContentOverlay"
>
@null
</item>
...
...
component_resource/src/main/res/drawable/start_backgroud.png
→
component_resource/src/main/res/drawable
-xhdpi
/start_backgroud.png
View file @
8b06f055
File moved
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/EvaluationActivity.java
View file @
8b06f055
...
@@ -114,7 +114,7 @@ public class EvaluationActivity extends BaseStatusActivity<PickerPresenter> {
...
@@ -114,7 +114,7 @@ public class EvaluationActivity extends BaseStatusActivity<PickerPresenter> {
if
(
dataBean
!=
null
)
{
if
(
dataBean
!=
null
)
{
tvName
.
setText
(
dataBean
.
getName
());
tvName
.
setText
(
dataBean
.
getName
());
GlideManager
.
getInstance
(
mActivity
).
loadImage
(
dataBean
.
get
Picture
(),
ivCar
);
GlideManager
.
getInstance
(
mActivity
).
loadImage
(
dataBean
.
get
Icon
(),
ivCar
);
}
}
...
...
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/MemberOrderDetailsActivity.java
View file @
8b06f055
...
@@ -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.content.Context
;
import
android.content.Context
;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.net.Uri
;
import
android.os.Build
;
import
android.os.Build
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.view.View
;
import
android.view.View
;
...
@@ -221,6 +222,10 @@ public class MemberOrderDetailsActivity extends BaseStatusActivity<PickerPresent
...
@@ -221,6 +222,10 @@ public class MemberOrderDetailsActivity extends BaseStatusActivity<PickerPresent
if
(
i
==
R
.
id
.
iv_back
)
{
if
(
i
==
R
.
id
.
iv_back
)
{
finish
();
finish
();
}
else
if
(
i
==
R
.
id
.
iv_customer_service
)
{
}
else
if
(
i
==
R
.
id
.
iv_customer_service
)
{
Intent
intent
=
new
Intent
(
Intent
.
ACTION_DIAL
);
Uri
uri
=
Uri
.
parse
(
"tel:"
+
"4000369369"
);
intent
.
setData
(
uri
);
startActivity
(
intent
);
}
else
if
(
i
==
R
.
id
.
tv_cancel_order
)
{
}
else
if
(
i
==
R
.
id
.
tv_cancel_order
)
{
cancelOnclick
();
cancelOnclick
();
...
...
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/OrderListActivity.java
View file @
8b06f055
...
@@ -32,7 +32,6 @@ import butterknife.BindView;
...
@@ -32,7 +32,6 @@ import butterknife.BindView;
@Route
(
path
=
Constance
.
ACTIVITY_URL_ORDERLIST
)
@Route
(
path
=
Constance
.
ACTIVITY_URL_ORDERLIST
)
public
class
OrderListActivity
extends
BaseStatusActivity
<
PickerPresenter
>
{
public
class
OrderListActivity
extends
BaseStatusActivity
<
PickerPresenter
>
{
@BindView
(
R2
.
id
.
recyclerView
)
@BindView
(
R2
.
id
.
recyclerView
)
RecyclerView
recyclerView
;
RecyclerView
recyclerView
;
@BindView
(
R2
.
id
.
order_viewPager
)
@BindView
(
R2
.
id
.
order_viewPager
)
...
...
module_mine/src/main/java/com/rv/rvmine/traveler/PersonalInformationActivity.java
View file @
8b06f055
...
@@ -82,6 +82,7 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
...
@@ -82,6 +82,7 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
.
putExtra
(
"userinfo"
,
info
);
.
putExtra
(
"userinfo"
,
info
);
}
}
@Override
@Override
protected
int
setLayout
()
{
protected
int
setLayout
()
{
return
R
.
layout
.
activity_personal_information
;
return
R
.
layout
.
activity_personal_information
;
...
...
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