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
7fc2e0dc
Commit
7fc2e0dc
authored
Jul 09, 2019
by
jianglx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改百度地图定位的appid,为会员订单添加详情界面
parent
1799436d
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
377 additions
and
49 deletions
+377
-49
AndroidManifest.xml
RvClient/src/main/AndroidManifest.xml
+1
-1
ApiConfig.java
...e_home/src/main/java/com/rv/home/rv/module/ApiConfig.java
+2
-1
AllOrderFragment.java
...v/home/rv/module/ui/main/home/order/AllOrderFragment.java
+1
-1
CompletedFragment.java
.../home/rv/module/ui/main/home/order/CompletedFragment.java
+1
-1
ForPaymentFragment.java
...home/rv/module/ui/main/home/order/ForPaymentFragment.java
+1
-9
MemberOrderDetailsActivity.java
...module/ui/main/home/order/MemberOrderDetailsActivity.java
+366
-31
update_file_paths.xml
plugin_version/src/main/res/xml/update_file_paths.xml
+5
-5
No files found.
RvClient/src/main/AndroidManifest.xml
View file @
7fc2e0dc
...
@@ -119,7 +119,7 @@
...
@@ -119,7 +119,7 @@
<meta-data
<meta-data
android:name=
"com.baidu.lbsapi.API_KEY"
android:name=
"com.baidu.lbsapi.API_KEY"
android:value=
"
NrMH6EqS8HZLtcYzqIUXQFsw7rZUK9S8
"
/>
<!-- <meta-data -->
android:value=
"
QaN98C5rV8hawNLVix0FAPLSsz7uh2q1
"
/>
<!-- <meta-data -->
<!-- android:name="android.max_aspect" -->
<!-- android:name="android.max_aspect" -->
<!-- android:value="2.1" /> -->
<!-- android:value="2.1" /> -->
<!-- autoSize布局最大分辨率 -->
<!-- autoSize布局最大分辨率 -->
...
...
module_home/src/main/java/com/rv/home/rv/module/ApiConfig.java
View file @
7fc2e0dc
...
@@ -39,6 +39,7 @@ public class ApiConfig {
...
@@ -39,6 +39,7 @@ public class ApiConfig {
public
static
String
HTTP_URL_PAY_THE_CALLBACK
=
RvFrameConfig
.
VEHICLE_ORDER
+
"baseOrder/pay"
;
//订单支付
public
static
String
HTTP_URL_PAY_THE_CALLBACK
=
RvFrameConfig
.
VEHICLE_ORDER
+
"baseOrder/pay"
;
//订单支付
public
static
String
HTTP_URL_CAR_TYPE_DETAIL
=
RvFrameConfig
.
HOST
+
"/h5/appHtml/view/detail.html"
;
//租车类型详情页
public
static
String
HTTP_URL_CAR_TYPE_DETAIL
=
RvFrameConfig
.
HOST
+
"/h5/appHtml/view/detail.html"
;
//租车类型详情页
public
static
String
HTTP_URL_CAR_TYPE_ORDERDETAIL
=
RvFrameConfig
.
HOST
+
"/h5/appHtml/view/orderDetail.html"
;
//订单详情页
public
static
String
HTTP_URL_CAR_TYPE_ORDERDETAIL
=
RvFrameConfig
.
HOST
+
"/h5/appHtml/view/orderDetail.html"
;
//订单详情页
public
static
String
HTTP_URL_VIP_ORDERDETAIL
=
RvFrameConfig
.
HOST
+
"/h5/appHtml/view/vipOrderDetail.html?no=%s"
;
public
static
String
HTTP_URL_BASEORDER_CANCEL
=
RvFrameConfig
.
VEHICLE_ORDER
+
"baseOrder/cancel/"
;
//重置密码
public
static
String
HTTP_URL_BASEORDER_CANCEL
=
RvFrameConfig
.
VEHICLE_ORDER
+
"baseOrder/cancel/"
;
//重置密码
public
static
String
HTTP_URL_CAR_TYPE_TRAVELORDERDETAIL
=
RvFrameConfig
.
HOST
+
"/h5/appHtml/view/travelOrderDetail.html"
;
//旅游订单详情页
public
static
String
HTTP_URL_CAR_TYPE_TRAVELORDERDETAIL
=
RvFrameConfig
.
HOST
+
"/h5/appHtml/view/travelOrderDetail.html"
;
//旅游订单详情页
public
static
String
HTTP_URL_CAR_TYPE_COSTDETAIL
=
RvFrameConfig
.
HOST
+
"/h5/appHtml/view/costDetail.html"
;
//费用明细
public
static
String
HTTP_URL_CAR_TYPE_COSTDETAIL
=
RvFrameConfig
.
HOST
+
"/h5/appHtml/view/costDetail.html"
;
//费用明细
...
@@ -68,5 +69,5 @@ public class ApiConfig {
...
@@ -68,5 +69,5 @@ public class ApiConfig {
public
static
String
HTTP_URL_FIND_BANNERLIST
=
RvFrameConfig
.
HOST
+
"/api/app/banner/app/unauth/findBannerlist"
;
// banner图接口
public
static
String
HTTP_URL_FIND_BANNERLIST
=
RvFrameConfig
.
HOST
+
"/api/app/banner/app/unauth/findBannerlist"
;
// banner图接口
public
static
String
HTTP_URL_EFFECTIVE_TIME
=
RvFrameConfig
.
VEHICLE_ORDER
+
"/baseOrder/app/unauth/getOrderParam"
;
// 获取订单失效时间
public
static
String
HTTP_URL_EFFECTIVE_TIME
=
RvFrameConfig
.
VEHICLE_ORDER
+
"/baseOrder/app/unauth/getOrderParam"
;
// 获取订单失效时间
}
}
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/AllOrderFragment.java
View file @
7fc2e0dc
...
@@ -82,7 +82,7 @@ public class AllOrderFragment extends BaseFragment<CommonPresenter> implements B
...
@@ -82,7 +82,7 @@ public class AllOrderFragment extends BaseFragment<CommonPresenter> implements B
}
else
if
(
2
==
dataBean
.
getType
())
{
}
else
if
(
2
==
dataBean
.
getType
())
{
startActivityForResult
(
TravelOrderDetailsActivity
.
getIntent
(
_mActivity
,
dataBean
),
2
);
startActivityForResult
(
TravelOrderDetailsActivity
.
getIntent
(
_mActivity
,
dataBean
),
2
);
}
else
if
(
3
==
dataBean
.
getType
())
{
}
else
if
(
3
==
dataBean
.
getType
())
{
startActivityForResult
(
Travel
OrderDetailsActivity
.
getIntent
(
_mActivity
,
dataBean
),
3
);
startActivityForResult
(
Member
OrderDetailsActivity
.
getIntent
(
_mActivity
,
dataBean
),
3
);
}
}
}
}
});
});
...
...
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/CompletedFragment.java
View file @
7fc2e0dc
...
@@ -88,7 +88,7 @@ public class CompletedFragment extends BaseFragment<CommonPresenter> implements
...
@@ -88,7 +88,7 @@ public class CompletedFragment extends BaseFragment<CommonPresenter> implements
}
else
if
(
2
==
dataBean
.
getType
())
{
}
else
if
(
2
==
dataBean
.
getType
())
{
startActivityForResult
(
TravelOrderDetailsActivity
.
getIntent
(
_mActivity
,
dataBean
),
2
);
startActivityForResult
(
TravelOrderDetailsActivity
.
getIntent
(
_mActivity
,
dataBean
),
2
);
}
else
if
(
3
==
dataBean
.
getType
())
{
}
else
if
(
3
==
dataBean
.
getType
())
{
startActivity
(
Travel
OrderDetailsActivity
.
getIntent
(
_mActivity
,
dataBean
));
startActivity
(
Member
OrderDetailsActivity
.
getIntent
(
_mActivity
,
dataBean
));
}
}
}
}
});
});
...
...
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/ForPaymentFragment.java
View file @
7fc2e0dc
...
@@ -9,18 +9,12 @@ import android.os.Message;
...
@@ -9,18 +9,12 @@ import android.os.Message;
import
android.support.annotation.Nullable
;
import
android.support.annotation.Nullable
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.support.v7.widget.RecyclerView
;
import
android.support.v7.widget.RecyclerView
;
import
android.util.Log
;
import
android.view.View
;
import
android.view.View
;
import
com.alibaba.android.arouter.launcher.ARouter
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.chad.library.adapter.base.entity.MultiItemEntity
;
import
com.chad.library.adapter.base.entity.MultiItemEntity
;
import
com.frame.base.bus.CancelOrderEvent
;
import
com.frame.base.bus.Observer
;
import
com.frame.base.bus.PaymentFailedEvent
;
import
com.frame.base.bus.PaymentSuccessfulEvent
;
import
com.frame.base.bus.PaymentSuccessfulEvent
;
import
com.frame.base.bus.RxBus
;
import
com.frame.base.bus.RxBus
;
import
com.frame.base.url.Constance
;
import
com.frame.rv.config.RvFrameConfig
;
import
com.frame.rv.config.RvFrameConfig
;
import
com.ruiwenliu.wrapper.base.BaseBean
;
import
com.ruiwenliu.wrapper.base.BaseBean
;
import
com.ruiwenliu.wrapper.base.BaseFragment
;
import
com.ruiwenliu.wrapper.base.BaseFragment
;
...
@@ -32,7 +26,6 @@ import com.rv.home.R;
...
@@ -32,7 +26,6 @@ import com.rv.home.R;
import
com.rv.home.R2
;
import
com.rv.home.R2
;
import
com.rv.home.rv.module.ApiConfig
;
import
com.rv.home.rv.module.ApiConfig
;
import
com.rv.home.rv.module.basic.presenter.CommonPresenter
;
import
com.rv.home.rv.module.basic.presenter.CommonPresenter
;
import
com.rv.home.rv.module.ui.main.home.ConfirmOrderActivity
;
import
com.rv.home.rv.module.ui.main.home.bean.EffectiveTimeBean
;
import
com.rv.home.rv.module.ui.main.home.bean.EffectiveTimeBean
;
import
com.rv.home.rv.module.ui.main.home.bean.OrderPayBean
;
import
com.rv.home.rv.module.ui.main.home.bean.OrderPayBean
;
import
com.rv.home.rv.module.ui.main.home.order.adapter.ForPaymentAdapter
;
import
com.rv.home.rv.module.ui.main.home.order.adapter.ForPaymentAdapter
;
...
@@ -47,7 +40,6 @@ import java.util.LinkedHashMap;
...
@@ -47,7 +40,6 @@ import java.util.LinkedHashMap;
import
java.util.Map
;
import
java.util.Map
;
import
butterknife.BindView
;
import
butterknife.BindView
;
import
io.reactivex.Observable
;
import
io.reactivex.disposables.Disposable
;
import
io.reactivex.disposables.Disposable
;
import
io.reactivex.functions.Consumer
;
import
io.reactivex.functions.Consumer
;
import
io.reactivex.schedulers.Schedulers
;
import
io.reactivex.schedulers.Schedulers
;
...
@@ -113,7 +105,7 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
...
@@ -113,7 +105,7 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
}
else
if
(
2
==
dataBean
.
getType
())
{
}
else
if
(
2
==
dataBean
.
getType
())
{
startActivityForResult
(
TravelOrderDetailsActivity
.
getIntent
(
_mActivity
,
dataBean
),
2
);
startActivityForResult
(
TravelOrderDetailsActivity
.
getIntent
(
_mActivity
,
dataBean
),
2
);
}
else
if
(
3
==
dataBean
.
getType
())
{
}
else
if
(
3
==
dataBean
.
getType
())
{
startActivityForResult
(
MemberOrderDetailsActivity
.
getIntent
(
_mActivity
,
dataBean
),
3
);
}
}
}
}
});
});
...
...
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/MemberOrderDetailsActivity.java
View file @
7fc2e0dc
This diff is collapsed.
Click to expand it.
plugin_version/src/main/res/xml/update_file_paths.xml
View file @
7fc2e0dc
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<paths>
<paths>
<files-path
name=
"
name
"
path=
""
/>
<files-path
name=
"
files-path
"
path=
""
/>
<cache-path
name=
"
name
"
path=
""
/>
<cache-path
name=
"
cache-path
"
path=
""
/>
<external-path
name=
"
name"
path=
"
"
/>
<external-path
name=
"
external-path"
path=
"photo
"
/>
<external-files-path
name=
"
name
"
path=
""
/>
<external-files-path
name=
"
external-files-path
"
path=
""
/>
<external-cache-path
name=
"
name
"
path=
""
/>
<external-cache-path
name=
"
external-cache-path
"
path=
""
/>
</paths>
</paths>
...
...
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