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
a48f4280
Commit
a48f4280
authored
Jul 11, 2019
by
linfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug修复
parent
c83db218
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
59 additions
and
38 deletions
+59
-38
HomeFragment.java
...java/com/rv/home/rv/module/ui/main/home/HomeFragment.java
+8
-13
SelectedEventsAdapter.java
...rv/module/ui/main/home/adapter/SelectedEventsAdapter.java
+4
-3
CompletedAdapter.java
...v/module/ui/main/home/order/adapter/CompletedAdapter.java
+4
-3
ForPaymentAdapter.java
.../module/ui/main/home/order/adapter/ForPaymentAdapter.java
+4
-3
HaveToTravelAdapter.java
...odule/ui/main/home/order/adapter/HaveToTravelAdapter.java
+4
-3
OrderListAdapter.java
...v/module/ui/main/home/order/adapter/OrderListAdapter.java
+4
-3
ToTravelAdapter.java
...rv/module/ui/main/home/order/adapter/ToTravelAdapter.java
+4
-3
OrderListBean.java
...home/rv/module/ui/main/home/order/bean/OrderListBean.java
+6
-6
aaa1.png
module_home/src/main/res/drawable-xhdpi/aaa1.png
+0
-0
aaa2.png
module_home/src/main/res/drawable-xhdpi/aaa2.png
+0
-0
AboutUsActivity.java
...src/main/java/com/rv/rvmine/traveler/AboutUsActivity.java
+20
-1
activity_about_us.xml
module_mine/src/main/res/layout/activity_about_us.xml
+1
-0
No files found.
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/HomeFragment.java
View file @
a48f4280
...
...
@@ -430,10 +430,9 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
}
private
void
getData
()
{
List
<
String
>
list
=
new
ArrayList
<>();
for
(
int
i
=
0
;
i
<
5
;
i
++)
{
list
.
add
(
"https://xxtest.upyuns.com/image/app/ENRq748FQTq86R8R77J88YEWhnPeZ3.png"
);
}
List
<
Integer
>
list
=
new
ArrayList
<>();
list
.
add
(
R
.
drawable
.
aaa1
);
list
.
add
(
R
.
drawable
.
aaa2
);
mActivityAdapter
.
setNewData
(
list
);
// mRvEnthusiast.setNewData(list);
}
...
...
@@ -575,13 +574,13 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
// if (getSwitchType == 0) {
// startActivityForResult(SelectShopActivity.getIntent(mActivity, 1,"",getCity.equals(nowCity) && mLatLng!=null?mLatLng.latitude:0,getCity.equals(nowCity)&& mLatLng!=null?mLatLng.longitude:0), TYPE_REQUEST_SHOP);
// } else {
startActivityForResult
(
SelectLocationActivity
.
getIntent
(
getContext
(),
1
,
getCity
,
0
,
latLatitude
,
lonLongitude
,
nowCity
,
0
),
TYPE_REQUEST_ADDRESS
);
startActivityForResult
(
SelectLocationActivity
.
getIntent
(
getContext
(),
1
,
getCity
,
0
,
latLatitude
,
lonLongitude
,
nowCity
,
0
),
TYPE_REQUEST_ADDRESS
);
}
else
if
(
id
==
R
.
id
.
tv_out_address
)
{
String
outCity
=
headTvOutCity
.
getText
().
toString
().
trim
();
// if (outSwitchType == 0) {
// startActivityForResult(SelectShopActivity.getIntent(mActivity, 2,"",outCity.equals(nowCity)&& mLatLng!=null?mLatLng.latitude:0,outCity.equals(nowCity)&& mLatLng!=null?mLatLng.longitude:0), TYPE_REQUEST_SHOP);
// } else {
startActivityForResult
(
SelectLocationActivity
.
getIntent
(
getContext
(),
2
,
outCity
,
0
,
outLatitude
,
outLongitude
,
nowCity
,
0
),
TYPE_REQUEST_ADDRESS
);
startActivityForResult
(
SelectLocationActivity
.
getIntent
(
getContext
(),
2
,
outCity
,
0
,
outLatitude
,
outLongitude
,
nowCity
,
0
),
TYPE_REQUEST_ADDRESS
);
}
else
if
(
id
==
R
.
id
.
ll_item_select_data
)
{
//选择日期
ARouter
.
getInstance
()
...
...
@@ -965,16 +964,12 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
dataBean
.
setDayNum
(
Integer
.
valueOf
(
day
+
""
));
dataBean
.
setStartCityName
(
starCity
);
dataBean
.
setStartAddr
(
starAddress
);
try
{
dataBean
.
setStartTime
(
TimeManager
.
dateToStamp
(
getTime
));
dataBean
.
setEndTime
(
TimeManager
.
dateToStamp
(
outTime
));
}
catch
(
ParseException
e
)
{
e
.
printStackTrace
();
}
dataBean
.
setStartTime
(
DateUtils
.
StringToTimeMillis2
(
getTime
));
dataBean
.
setEndTime
(
DateUtils
.
StringToTimeMillis2
(
outTime
));
dataBean
.
setEndCityName
(
endCity
);
dataBean
.
setEndAddr
(
endAddress
);
dataBean
.
setDriverType
(
2
);
startActivity
(
CarRentalListActivity
.
getIntent
(
getContext
(),
latLatitude
,
lonLongitude
,
outLatitude
,
outLongitude
,
false
,
dataBean
,
startTime
,
endTime
));
startActivity
(
CarRentalListActivity
.
getIntent
(
getContext
(),
latLatitude
,
lonLongitude
,
outLatitude
,
outLongitude
,
false
,
dataBean
,
startTime
,
endTime
));
}
...
...
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/adapter/SelectedEventsAdapter.java
View file @
a48f4280
...
...
@@ -7,14 +7,15 @@ import com.ruiwenliu.wrapper.util.BaseGlideHolder;
import
com.ruiwenliu.wrapper.util.glide.GlideManager
;
import
com.rv.home.R
;
public
class
SelectedEventsAdapter
extends
BaseQuickAdapter
<
String
,
BaseGlideHolder
>
{
public
class
SelectedEventsAdapter
extends
BaseQuickAdapter
<
Integer
,
BaseGlideHolder
>
{
public
SelectedEventsAdapter
()
{
super
(
R
.
layout
.
rv_item_selected_events
);
}
@Override
protected
void
convert
(
BaseGlideHolder
helper
,
String
string
)
{
GlideManager
.
getInstance
(
mContext
).
loadRoundImage
(
string
,
(
ImageView
)
helper
.
getView
(
R
.
id
.
iv_activity
),
6
);
protected
void
convert
(
BaseGlideHolder
helper
,
Integer
integer
)
{
// GlideManager.getInstance(mContext).loadRoundImage(string, (ImageView)helper.getView(R.id.iv_activity),6);
helper
.
setImageDrawable
(
R
.
id
.
iv_activity
,
mContext
.
getResources
().
getDrawable
(
integer
));
}
}
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/CompletedAdapter.java
View file @
a48f4280
...
...
@@ -7,6 +7,7 @@ import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
import
com.chad.library.adapter.base.entity.MultiItemEntity
;
import
com.ruiwenliu.wrapper.util.BaseGlideHolder
;
import
com.ruiwenliu.wrapper.util.TimeManager
;
import
com.rv.component.utils.DateUtils
;
import
com.rv.home.R
;
import
com.rv.home.R2
;
import
com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean
;
...
...
@@ -48,9 +49,9 @@ public class CompletedAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
helper
.
loadRoundImage
(
mContext
,
dataBean
.
getIcon
(),
(
ImageView
)
helper
.
getView
(
R
.
id
.
iv_goods
),
10
);
helper
.
setText
(
R
.
id
.
tv_car_type
,
dataBean
.
getName
());
if
(
dataBean
.
getOrderRentVehicleDetail
()
!=
null
)
{
helper
.
setText
(
R
.
id
.
tv_get_time
,
TimeManager
.
stampToDate
(
String
.
valueOf
(
dataBean
.
getOrderRentVehicleDetail
().
getStart_time
()
)));
helper
.
setText
(
R
.
id
.
tv_get_time
,
DateUtils
.
timestampToString1
(
dataBean
.
getOrderRentVehicleDetail
().
getStart_time
(
)));
helper
.
setText
(
R
.
id
.
tv_get_address
,
dataBean
.
getOrderRentVehicleDetail
().
getStart_addr
());
helper
.
setText
(
R
.
id
.
tv_out_time
,
TimeManager
.
stampToDate
(
String
.
valueOf
(
dataBean
.
getOrderRentVehicleDetail
().
getEnd_time
()
)));
helper
.
setText
(
R
.
id
.
tv_out_time
,
DateUtils
.
timestampToString1
(
dataBean
.
getOrderRentVehicleDetail
().
getEnd_time
(
)));
helper
.
setText
(
R
.
id
.
tv_out_address
,
dataBean
.
getOrderRentVehicleDetail
().
getEnd_addr
());
}
helper
.
setText
(
R
.
id
.
tv_price
,
String
.
format
(
"¥%1$s"
,
dataBean
.
getRealAmount
()));
...
...
@@ -70,7 +71,7 @@ public class CompletedAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
helper
.
setText
(
R
.
id
.
tv_order_state
,
mContext
.
getString
(
R
.
string
.
rv_order_completed
));
helper
.
loadRoundImage
(
mContext
,
dataBean2
.
getPicture
(),
(
ImageView
)
helper
.
getView
(
R
.
id
.
iv_goods
),
50
);
helper
.
setText
(
R
.
id
.
tv_car_type
,
dataBean2
.
getName
());
helper
.
setText
(
R
.
id
.
tv_out_time
,
mContext
.
getString
(
R
.
string
.
rv_to_time
)
+
TimeManager
.
stampToDate2
(
String
.
valueOf
(
dataBean2
.
getOrderTourDetail
().
getStartTime
()
)));
helper
.
setText
(
R
.
id
.
tv_out_time
,
mContext
.
getString
(
R
.
string
.
rv_to_time
)
+
DateUtils
.
timestampToString1
(
dataBean2
.
getOrderTourDetail
().
getStartTime
(
)));
helper
.
setText
(
R
.
id
.
tv_count_person
,
String
.
format
(
"%1$s%2$s"
,
mContext
.
getString
(
R
.
string
.
rv_to_person
),
dataBean2
.
getOrderTourDetail
().
getTotalNumber
(),
mContext
.
getString
(
R
.
string
.
rv_person
)));
helper
.
setText
(
R
.
id
.
tv_price
,
String
.
format
(
"¥%1$s"
,
dataBean2
.
getRealAmount
()));
helper
.
setText
(
R
.
id
.
tv_camp_process
,
mContext
.
getString
(
R
.
string
.
rv_to_evaluation
));
...
...
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/ForPaymentAdapter.java
View file @
a48f4280
...
...
@@ -9,6 +9,7 @@ import com.chad.library.adapter.base.entity.MultiItemEntity;
import
com.ruiwenliu.wrapper.util.BaseGlideHolder
;
import
com.ruiwenliu.wrapper.util.TimeManager
;
import
com.rv.component.utils.Cooker
;
import
com.rv.component.utils.DateUtils
;
import
com.rv.home.R
;
import
com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean
;
import
com.rv.home.rv.module.ui.main.home.order.view.MyTimerView
;
...
...
@@ -57,9 +58,9 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
helper
.
loadRoundImage
(
mContext
,
dataBean
.
getIcon
(),
(
ImageView
)
helper
.
getView
(
R
.
id
.
iv_goods
),
10
);
helper
.
setText
(
R
.
id
.
tv_car_type
,
dataBean
.
getName
());
if
(
dataBean
.
getOrderRentVehicleDetail
()
!=
null
)
{
helper
.
setText
(
R
.
id
.
tv_get_time
,
TimeManager
.
stampToDate
(
String
.
valueOf
(
dataBean
.
getOrderRentVehicleDetail
().
getStart_time
()
)));
helper
.
setText
(
R
.
id
.
tv_get_time
,
DateUtils
.
timestampToString1
(
dataBean
.
getOrderRentVehicleDetail
().
getStart_time
(
)));
helper
.
setText
(
R
.
id
.
tv_get_address
,
dataBean
.
getOrderRentVehicleDetail
().
getStart_addr
());
helper
.
setText
(
R
.
id
.
tv_out_time
,
TimeManager
.
stampToDate
(
String
.
valueOf
(
dataBean
.
getOrderRentVehicleDetail
().
getEnd_time
()
)));
helper
.
setText
(
R
.
id
.
tv_out_time
,
DateUtils
.
timestampToString1
(
dataBean
.
getOrderRentVehicleDetail
().
getEnd_time
(
)));
helper
.
setText
(
R
.
id
.
tv_out_address
,
dataBean
.
getOrderRentVehicleDetail
().
getEnd_addr
());
helper
.
setText
(
R
.
id
.
tv_price
,
String
.
format
(
"¥%1$s"
,
dataBean
.
getRealAmount
()));
}
...
...
@@ -79,7 +80,7 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
helper
.
setText
(
R
.
id
.
tv_city
,
dataBean
.
getOrderTourDetail
().
getStartCityName
());
helper
.
loadRoundImage
(
mContext
,
dataBean
.
getPicture
(),
(
ImageView
)
helper
.
getView
(
R
.
id
.
iv_goods
),
10
);
helper
.
setText
(
R
.
id
.
tv_car_type
,
dataBean
.
getName
());
helper
.
setText
(
R
.
id
.
tv_out_time
,
mContext
.
getString
(
R
.
string
.
rv_to_time
)
+
TimeManager
.
stampToDate2
(
String
.
valueOf
(
dataBean
.
getOrderTourDetail
().
getStartTime
()
)));
helper
.
setText
(
R
.
id
.
tv_out_time
,
mContext
.
getString
(
R
.
string
.
rv_to_time
)
+
DateUtils
.
timestampToString1
(
dataBean
.
getOrderTourDetail
().
getStartTime
(
)));
helper
.
setText
(
R
.
id
.
tv_count_person
,
String
.
format
(
"%1$s%2$s"
,
mContext
.
getString
(
R
.
string
.
rv_to_person
),
dataBean
.
getOrderTourDetail
().
getTotalNumber
(),
mContext
.
getString
(
R
.
string
.
rv_person
)));
helper
.
setText
(
R
.
id
.
tv_price
,
String
.
format
(
"¥%1$s"
,
dataBean
.
getRealAmount
()));
helper
.
setText
(
R
.
id
.
tv_camp_process
,
mContext
.
getString
(
R
.
string
.
rv_to_pay_for
));
...
...
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/HaveToTravelAdapter.java
View file @
a48f4280
...
...
@@ -7,6 +7,7 @@ import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
import
com.chad.library.adapter.base.entity.MultiItemEntity
;
import
com.ruiwenliu.wrapper.util.BaseGlideHolder
;
import
com.ruiwenliu.wrapper.util.TimeManager
;
import
com.rv.component.utils.DateUtils
;
import
com.rv.home.R
;
import
com.rv.home.R2
;
import
com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean
;
...
...
@@ -48,9 +49,9 @@ public class HaveToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEnti
helper
.
loadRoundImage
(
mContext
,
dataBean
.
getIcon
(),
(
ImageView
)
helper
.
getView
(
R
.
id
.
iv_goods
),
10
);
helper
.
setText
(
R
.
id
.
tv_car_type
,
dataBean
.
getName
());
if
(
dataBean
.
getOrderRentVehicleDetail
()
!=
null
)
{
helper
.
setText
(
R
.
id
.
tv_get_time
,
TimeManager
.
stampToDate
(
String
.
valueOf
(
dataBean
.
getOrderRentVehicleDetail
().
getStart_time
()
)));
helper
.
setText
(
R
.
id
.
tv_get_time
,
DateUtils
.
timestampToString1
(
dataBean
.
getOrderRentVehicleDetail
().
getStart_time
(
)));
helper
.
setText
(
R
.
id
.
tv_get_address
,
dataBean
.
getOrderRentVehicleDetail
().
getStart_addr
());
helper
.
setText
(
R
.
id
.
tv_out_time
,
TimeManager
.
stampToDate
(
String
.
valueOf
(
dataBean
.
getOrderRentVehicleDetail
().
getEnd_time
()
)));
helper
.
setText
(
R
.
id
.
tv_out_time
,
DateUtils
.
timestampToString1
(
dataBean
.
getOrderRentVehicleDetail
().
getEnd_time
(
)));
helper
.
setText
(
R
.
id
.
tv_out_address
,
dataBean
.
getOrderRentVehicleDetail
().
getEnd_addr
());
}
helper
.
setText
(
R
.
id
.
tv_price
,
String
.
format
(
"¥%1$s"
,
dataBean
.
getRealAmount
()));
...
...
@@ -70,7 +71,7 @@ public class HaveToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEnti
helper
.
setText
(
R
.
id
.
tv_order_state
,
mContext
.
getString
(
R
.
string
.
rv_order_have_travel
));
helper
.
loadRoundImage
(
mContext
,
dataBean2
.
getPicture
(),
(
ImageView
)
helper
.
getView
(
R
.
id
.
iv_goods
),
50
);
helper
.
setText
(
R
.
id
.
tv_car_type
,
dataBean2
.
getName
());
helper
.
setText
(
R
.
id
.
tv_out_time
,
mContext
.
getString
(
R
.
string
.
rv_to_time
)
+
TimeManager
.
stampToDate2
(
String
.
valueOf
(
dataBean2
.
getOrderTourDetail
().
getStartTime
()
)));
helper
.
setText
(
R
.
id
.
tv_out_time
,
mContext
.
getString
(
R
.
string
.
rv_to_time
)
+
DateUtils
.
timestampToString1
(
dataBean2
.
getOrderTourDetail
().
getStartTime
(
)));
helper
.
setText
(
R
.
id
.
tv_count_person
,
String
.
format
(
"%1$s%2$s"
,
mContext
.
getString
(
R
.
string
.
rv_to_person
),
dataBean2
.
getOrderTourDetail
().
getTotalNumber
(),
mContext
.
getString
(
R
.
string
.
rv_person
)));
helper
.
setText
(
R
.
id
.
tv_price
,
String
.
format
(
"¥%1$s"
,
dataBean2
.
getRealAmount
()));
helper
.
setVisible
(
R
.
id
.
tv_camp_process
,
false
);
...
...
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/OrderListAdapter.java
View file @
a48f4280
...
...
@@ -9,6 +9,7 @@ import com.chad.library.adapter.base.entity.MultiItemEntity;
import
com.ruiwenliu.wrapper.util.BaseGlideHolder
;
import
com.ruiwenliu.wrapper.util.TimeManager
;
import
com.rv.component.utils.Cooker
;
import
com.rv.component.utils.DateUtils
;
import
com.rv.home.R
;
import
com.rv.home.R2
;
import
com.rv.home.rv.module.ui.main.home.order.bean.ForPaymentBean
;
...
...
@@ -54,9 +55,9 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
helper
.
loadRoundImage
(
mContext
,
dataBean
.
getIcon
(),
(
ImageView
)
helper
.
getView
(
R
.
id
.
iv_goods
),
10
);
helper
.
setText
(
R
.
id
.
tv_car_type
,
dataBean
.
getName
());
if
(
dataBean
.
getOrderRentVehicleDetail
()
!=
null
)
{
helper
.
setText
(
R
.
id
.
tv_get_time
,
TimeManager
.
stampToDate
(
String
.
valueOf
(
dataBean
.
getOrderRentVehicleDetail
().
getStart_time
()
)));
helper
.
setText
(
R
.
id
.
tv_get_time
,
DateUtils
.
timestampToString1
(
dataBean
.
getOrderRentVehicleDetail
().
getStart_time
(
)));
helper
.
setText
(
R
.
id
.
tv_get_address
,
dataBean
.
getOrderRentVehicleDetail
().
getStart_addr
());
helper
.
setText
(
R
.
id
.
tv_out_time
,
TimeManager
.
stampToDate
(
String
.
valueOf
(
dataBean
.
getOrderRentVehicleDetail
().
getEnd_time
()
)));
helper
.
setText
(
R
.
id
.
tv_out_time
,
DateUtils
.
timestampToString1
(
dataBean
.
getOrderRentVehicleDetail
().
getEnd_time
(
)));
helper
.
setText
(
R
.
id
.
tv_out_address
,
dataBean
.
getOrderRentVehicleDetail
().
getEnd_addr
());
}
helper
.
setText
(
R
.
id
.
tv_price
,
String
.
format
(
"¥%1$s"
,
dataBean
.
getRealAmount
()));
...
...
@@ -122,7 +123,7 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
helper
.
loadRoundImage
(
mContext
,
dataBean2
.
getPicture
(),
(
ImageView
)
helper
.
getView
(
R
.
id
.
iv_goods
),
50
);
helper
.
setText
(
R
.
id
.
tv_car_type
,
dataBean2
.
getName
());
helper
.
setText
(
R
.
id
.
tv_out_time
,
mContext
.
getString
(
R
.
string
.
rv_to_time
)
+
TimeManager
.
stampToDate2
(
String
.
valueOf
(
dataBean2
.
getOrderTourDetail
().
getStartTime
()
)));
helper
.
setText
(
R
.
id
.
tv_out_time
,
mContext
.
getString
(
R
.
string
.
rv_to_time
)
+
DateUtils
.
timestampToString1
(
dataBean2
.
getOrderTourDetail
().
getStartTime
(
)));
helper
.
setText
(
R
.
id
.
tv_count_person
,
String
.
format
(
"%1$s%2$s"
,
mContext
.
getString
(
R
.
string
.
rv_to_person
),
dataBean2
.
getOrderTourDetail
().
getTotalNumber
(),
mContext
.
getString
(
R
.
string
.
rv_person
)));
helper
.
setText
(
R
.
id
.
tv_price
,
String
.
format
(
"¥%1$s"
,
dataBean2
.
getRealAmount
()));
...
...
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/ToTravelAdapter.java
View file @
a48f4280
...
...
@@ -7,6 +7,7 @@ import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
import
com.chad.library.adapter.base.entity.MultiItemEntity
;
import
com.ruiwenliu.wrapper.util.BaseGlideHolder
;
import
com.ruiwenliu.wrapper.util.TimeManager
;
import
com.rv.component.utils.DateUtils
;
import
com.rv.home.R
;
import
com.rv.home.R2
;
import
com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean
;
...
...
@@ -48,9 +49,9 @@ public class ToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
helper
.
loadRoundImage
(
mContext
,
dataBean
.
getIcon
(),
(
ImageView
)
helper
.
getView
(
R
.
id
.
iv_goods
),
10
);
helper
.
setText
(
R
.
id
.
tv_car_type
,
dataBean
.
getName
());
if
(
dataBean
.
getOrderRentVehicleDetail
()
!=
null
)
{
helper
.
setText
(
R
.
id
.
tv_get_time
,
TimeManager
.
stampToDate
(
String
.
valueOf
(
dataBean
.
getOrderRentVehicleDetail
().
getStart_time
()
)));
helper
.
setText
(
R
.
id
.
tv_get_time
,
DateUtils
.
timestampToString1
(
dataBean
.
getOrderRentVehicleDetail
().
getStart_time
(
)));
helper
.
setText
(
R
.
id
.
tv_get_address
,
dataBean
.
getOrderRentVehicleDetail
().
getStart_addr
());
helper
.
setText
(
R
.
id
.
tv_out_time
,
TimeManager
.
stampToDate
(
String
.
valueOf
(
dataBean
.
getOrderRentVehicleDetail
().
getEnd_time
()
)));
helper
.
setText
(
R
.
id
.
tv_out_time
,
DateUtils
.
timestampToString1
(
dataBean
.
getOrderRentVehicleDetail
().
getEnd_time
(
)));
helper
.
setText
(
R
.
id
.
tv_out_address
,
dataBean
.
getOrderRentVehicleDetail
().
getEnd_addr
());
}
helper
.
setText
(
R
.
id
.
tv_price
,
String
.
format
(
"¥%1$s"
,
dataBean
.
getRealAmount
()));
...
...
@@ -70,7 +71,7 @@ public class ToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
helper
.
setText
(
R
.
id
.
tv_order_state
,
mContext
.
getString
(
R
.
string
.
rv_order_to_travel
));
helper
.
loadRoundImage
(
mContext
,
dataBean2
.
getPicture
(),
(
ImageView
)
helper
.
getView
(
R
.
id
.
iv_goods
),
50
);
helper
.
setText
(
R
.
id
.
tv_car_type
,
dataBean2
.
getName
());
helper
.
setText
(
R
.
id
.
tv_out_time
,
mContext
.
getString
(
R
.
string
.
rv_to_time
)
+
TimeManager
.
stampToDate2
(
String
.
valueOf
(
dataBean2
.
getOrderTourDetail
().
getStartTime
()
)));
helper
.
setText
(
R
.
id
.
tv_out_time
,
mContext
.
getString
(
R
.
string
.
rv_to_time
)
+
DateUtils
.
timestampToString1
(
dataBean2
.
getOrderTourDetail
().
getStartTime
(
)));
helper
.
setText
(
R
.
id
.
tv_count_person
,
String
.
format
(
"%1$s%2$s"
,
mContext
.
getString
(
R
.
string
.
rv_to_person
),
dataBean2
.
getOrderTourDetail
().
getTotalNumber
(),
mContext
.
getString
(
R
.
string
.
rv_person
)));
helper
.
setText
(
R
.
id
.
tv_price
,
String
.
format
(
"¥%1$s"
,
dataBean2
.
getRealAmount
()));
helper
.
setText
(
R
.
id
.
tv_camp_process
,
mContext
.
getString
(
R
.
string
.
tv_boarding
));
...
...
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/bean/OrderListBean.java
View file @
a48f4280
...
...
@@ -653,8 +653,8 @@ public class OrderListBean extends BaseBean {
private
String
orderId
;
private
String
crtTime
;
//": 1560163254063,
private
String
updTime
;
//": 1560163254063,
private
Stri
ng
startTime
;
//": 1560152144000,
private
Stri
ng
endTime
;
//": 1560324944000,
private
lo
ng
startTime
;
//": 1560152144000,
private
lo
ng
endTime
;
//": 1560324944000,
private
String
startAddr
;
//": "东土",
private
String
endAddr
;
//": "西天3",
private
String
tourUserIds
;
//": "4,5",
...
...
@@ -703,19 +703,19 @@ public class OrderListBean extends BaseBean {
this
.
updTime
=
updTime
;
}
public
Stri
ng
getStartTime
()
{
public
lo
ng
getStartTime
()
{
return
startTime
;
}
public
void
setStartTime
(
Stri
ng
startTime
)
{
public
void
setStartTime
(
lo
ng
startTime
)
{
this
.
startTime
=
startTime
;
}
public
Stri
ng
getEndTime
()
{
public
lo
ng
getEndTime
()
{
return
endTime
;
}
public
void
setEndTime
(
Stri
ng
endTime
)
{
public
void
setEndTime
(
lo
ng
endTime
)
{
this
.
endTime
=
endTime
;
}
...
...
module_home/src/main/res/drawable-xhdpi/aaa1.png
0 → 100644
View file @
a48f4280
203 KB
module_home/src/main/res/drawable-xhdpi/aaa2.png
0 → 100644
View file @
a48f4280
318 KB
module_mine/src/main/java/com/rv/rvmine/traveler/AboutUsActivity.java
View file @
a48f4280
...
...
@@ -2,14 +2,21 @@ package com.rv.rvmine.traveler;
import
android.content.Context
;
import
android.content.Intent
;
import
android.support.v7.app.AppCompatActivity
;
import
android.os.Bundle
;
import
android.view.View
;
import
com.alibaba.android.arouter.launcher.ARouter
;
import
com.frame.base.url.Constance
;
import
com.ruiwenliu.wrapper.base.BaseBean
;
import
com.ruiwenliu.wrapper.weight.TitleView
;
import
com.rv.home.rv.module.ApiConfig
;
import
com.rv.home.rv.module.basic.BaseStatusActivity
;
import
com.rv.home.rv.module.basic.presenter.CommonPresenter
;
import
com.rv.rvmine.R
;
import
com.rv.rvmine.R2
;
import
butterknife.ButterKnife
;
import
butterknife.OnClick
;
/**
* 关于我们
...
...
@@ -35,4 +42,16 @@ public class AboutUsActivity extends BaseStatusActivity<CommonPresenter> {
public
void
onShowResult
(
int
requestType
,
BaseBean
result
)
{
}
@OnClick
({
R2
.
id
.
rl_item_privacy_policy
})
public
void
onViewClicked
(
View
view
)
{
int
id
=
view
.
getId
();
if
(
id
==
R
.
id
.
rl_item_privacy_policy
){
ARouter
.
getInstance
().
build
(
Constance
.
ACTIVITY_URL_WEBVIEW
)
.
withString
(
"title"
,
"隐私政策"
)
.
withString
(
"url"
,
ApiConfig
.
HTTP_URL_CAR_TYPE_NOTICE
)
.
withInt
(
"type"
,
19
)
.
navigation
();
}
}
}
module_mine/src/main/res/layout/activity_about_us.xml
View file @
a48f4280
...
...
@@ -89,6 +89,7 @@
<include
layout=
"@layout/common_line"
/>
<RelativeLayout
android:id=
"@+id/rl_item_privacy_policy"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/size_50"
>
...
...
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