Skip to content

R
RvApp
Commit cbfd693c authored by youjj's avatar youjj
Browse files
Options

旅游模块的接口、交互基本完成。

parent bd8fdb5f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1989 additions and 587 deletions
MyFrame/src/main/java/com/frame/base/glide/GlideManager.java
View file @ cbfd693c
......@@ -40,7 +40,7 @@ public class GlideManager {
.load(path)
.placeholder(com.base.resource.R.mipmap.glide_icon_placeholder)
.error(com.base.resource.R.mipmap.glide_icon_error)
.skipMemoryCache(true)
.skipMemoryCache(false)
.diskCacheStrategy(DiskCacheStrategy.ALL)
.into(image);
}
......
OkGo/src/main/java/com/yuyife/okgo/OkGoUtil.java
View file @ cbfd693c
......@@ -61,6 +61,16 @@ public class OkGoUtil {
return null;
}
/**
* 清空Token
*/
public static void clearToken(){
if (application ==null)
return;
SharedPreferences sp = application.getSharedPreferences(OkGoUtil.class.getSimpleName(), Context.MODE_PRIVATE);
sp.edit().clear().commit();
}
@SuppressLint("StaticFieldLeak")
private static Context application = null;
private static boolean addToken = false;
......
RvClient/build.gradle
View file @ cbfd693c
......@@ -7,8 +7,8 @@ android {
applicationId "com.test.rv"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
versionCode 30
versionName "3.0"
multiDexEnabled true
//新版Gradle 是 implementation 为了兼容compile,写上这句话
......
RvClient/src/main/AndroidManifest.xml
View file @ cbfd693c
......@@ -360,7 +360,21 @@
android:screenOrientation="portrait" />
<!--身份证认证-->
<activity android:name="com.rv.rvmine.IDCardCertificationActivity"
<activity android:name="com.rv.rvmine.personal.IDCardCertificationActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait" />
<!--添加出游人-->
<activity android:name="com.rv.rvmine.traveler.AddAVisitorActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait" />
<!--设置-->
<activity android:name="com.rv.rvmine.traveler.SettingActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait" />
<activity android:name="com.rv.home.rv.module.ui.main.home.order.TravelOrderDetailsActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait" />
<!--=================================================================-->
......
RvFrame/build.gradle
View file @ cbfd693c
......@@ -55,5 +55,7 @@ android {
api "com.tencent.mm.opensdk:wechat-sdk-android-with-mta:$rootProject.ext.wechatPayVersion"
//https://github.com/Justson/AgentWeb
api 'com.just.agentweb:agentweb:4.0.3-beta'
//api 'com.just.agentweb:filechooser:4.0.3-beta'
//api 'com.just.agentweb:download:4.0.3-beta'
}
}
RvHome/src/main/AndroidManifest.xml
View file @ cbfd693c
<manifest package="com.rv.home" />
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.rv.home">
</manifest>
\ No newline at end of file
RvHome/src/main/java/com/rv/home/rv/module/ApiConfig.java
View file @ cbfd693c
......@@ -40,6 +40,8 @@ public class ApiConfig {
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_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_COSTDETAIL= RvFrameConfig.HOST+"/h5/appHtml/view/costDetail.html";//费用明细
}
RvHome/src/main/java/com/rv/home/rv/module/basic/WebActivity.java
View file @ cbfd693c
......@@ -7,15 +7,14 @@ import android.os.Bundle;
import android.widget.LinearLayout;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.presenter.MvpPresenter;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.ruiwenliu.wrapper.weight.webview.SafeWebView;
import com.rv.home.R;
import com.rv.home.rv.module.basic.presenter.PickerPresenter;
import com.rv.home.R2;
import butterknife.BindView;
public class WebActivity extends BaseStatusActivity<MvpPresenter> {
public class WebActivity extends BaseStatusActivity<PickerPresenter> {
@BindView(R2.id.webView)
SafeWebView mWebView;
......
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/AllOrderFragment.java
View file @ cbfd693c
......@@ -70,7 +70,11 @@ public class AllOrderFragment extends BaseFragment<CommonPresenter> implements B
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
startActivity(OrderDetailActivity.getIntent(_mActivity,dataBean.getNo(),dataBean.getStatusX()));
if (1 ==dataBean.getType()) {
startActivityForResult(OrderDetailActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX()), 1);
}else if (2== dataBean.getType()){
startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX()), 2);
}
}
});
}
......
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/CompletedFragment.java
View file @ cbfd693c
......@@ -81,7 +81,11 @@ public class CompletedFragment extends BaseFragment<CommonPresenter>implements B
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
startActivity(OrderDetailActivity.getIntent(_mActivity,dataBean.getNo(),dataBean.getStatusX()));
if (1 ==dataBean.getType()) {
startActivityForResult(OrderDetailActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX()), 1);
}else if (2== dataBean.getType()){
startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX()), 2);
}
}
});
}
......
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/ForPaymentFragment.java
View file @ cbfd693c
......@@ -5,6 +5,7 @@ import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
......@@ -70,10 +71,13 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
startActivityForResult(OrderDetailActivity.getIntent(_mActivity,dataBean.getNo(),dataBean.getStatusX()),1);
if (1 ==dataBean.getType()) {
startActivityForResult(OrderDetailActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX()), 1);
}else if (2== dataBean.getType()){
startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX()), 2);
}
}
});
}
@Override
......
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/HaveToTravelFragment.java
View file @ cbfd693c
......@@ -68,7 +68,11 @@ public class HaveToTravelFragment extends BaseFragment<CommonPresenter>implement
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
startActivity(OrderDetailActivity.getIntent(_mActivity,dataBean.getNo(),dataBean.getStatusX()));
if (1 ==dataBean.getType()) {
startActivityForResult(OrderDetailActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX()), 1);
}else if (2== dataBean.getType()){
startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX()), 2);
}
}
});
}
......
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/OrderDetailActivity.java
View file @ cbfd693c
package com.rv.home.rv.module.ui.main.home.order;
import android.content.ClipboardManager;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
......@@ -19,6 +20,7 @@ import com.rv.home.R;
import com.rv.home.R2;
import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.basic.BaseStatusActivity;
import com.rv.home.rv.module.basic.WebActivity;
import com.rv.home.rv.module.basic.presenter.PickerPresenter;
import com.yuyife.okgo.OkGoUtil;
......@@ -233,5 +235,18 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
public String getToken() {
return OkGoUtil.getToken();
}
@JavascriptInterface
public ClipboardManager getCopy(){
ClipboardManager clip = (ClipboardManager)mActivity.getSystemService(Context.CLIPBOARD_SERVICE);
clip.setText(no);
showToast("复制成功！");
return clip;
}
@JavascriptInterface
public void onClick(){
startActivity(WebActivity.getIntent(mActivity, mActivity.getString(R.string.rv_charge_details), ApiConfig.HTTP_URL_CAR_TYPE_COSTDETAIL));
}
}
}
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/ToTravelFragment.java
View file @ cbfd693c
......@@ -67,7 +67,11 @@ public class ToTravelFragment extends BaseFragment<CommonPresenter> implements B
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
startActivity(OrderDetailActivity.getIntent(_mActivity,dataBean.getNo(),dataBean.getStatusX()));
if (1 ==dataBean.getType()) {
startActivityForResult(OrderDetailActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX()), 1);
}else if (2== dataBean.getType()){
startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX()), 2);
}
}
});
}
......
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/CompletedAdapter.java
View file @ cbfd693c
......@@ -21,8 +21,8 @@ import java.util.List;
*/
public class CompletedAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity, BaseGlideHolder> {
public static final int TYPE_FOR_PAYMENT = 0;
public static final int TYPE_TO_TRAVEL = 1;
public static final int TYPE_FOR_PAYMENT = 1;
public static final int TYPE_TO_TRAVEL = 2;
public CompletedAdapter(List<MultiItemEntity> data) {
super(data);
......@@ -35,33 +35,45 @@ public class CompletedAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
switch (helper.getItemViewType()) {
case TYPE_FOR_PAYMENT:
OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) item;
if (dataBean ==null){
return;
}
helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean.getCrtTime()));
helper.setText(R.id.tv_city, dataBean.getDetail().getStart_city_name());
if (dataBean.getOrderRentVehicleDetail() !=null && dataBean.getOrderRentVehicleDetail().getStart_city_name()!=null) {
helper.setText(R.id.tv_city, dataBean.getOrderRentVehicleDetail().getStart_city_name());
}
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_completed));
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_get_time, TimeManager.stampToDate(String.valueOf(dataBean.getDetail().getStart_time())));
helper.setText(R.id.tv_get_address, dataBean.getDetail().getStart_addr());
helper.setText(R.id.tv_out_time, TimeManager.stampToDate(String.valueOf(dataBean.getDetail().getEnd_time())));
helper.setText(R.id.tv_out_address, dataBean.getDetail().getEnd_addr());
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_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_address, dataBean.getOrderRentVehicleDetail().getEnd_addr());
}
helper.setText(R.id.tv_price, String.format("￥%1$s", dataBean.getOrderAmount()));
helper.setText(R.id.tv_process, mContext.getString(R.string.rv_to_evaluation));
helper.addOnClickListener(R.id.tv_process);
break;
case TYPE_TO_TRAVEL:
ToTravelBean toTravelBean = (ToTravelBean) item;
helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), "2019-8-12"));
OrderListBean.DataBeanX.DataBean dataBean2 = (OrderListBean.DataBeanX.DataBean) item;
if (dataBean2 == null) {
return;
}
if (dataBean2.getOrderTourDetail() ==null ){
return;
}
helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean2.getCrtTime()));
helper.setText(R.id.tv_city, "东莞市");
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
String urls = "https://gss1.bdstatic.com/-vo3dSag_xI4khGkpoWK1HF6hhy/baike/c0%3Dbaike180%2C5%2C5%2C180%2C60/sign=fc8e9183fd03738dca470470d272db34/10dfa9ec8a136327275f2c109a8fa0ec08fac767.jpg";
helper.loadRoundImage(mContext, urls, (ImageView) helper.getView(R.id.iv_goods), 50);
helper.setText(R.id.tv_car_type, "奔驰最新款霸道房车");
helper.setText(R.id.tv_out_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_to_time), "2019-7-4"));
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.stampToDate(String.valueOf( dataBean2.getOrderTourDetail().getStartTime())));
helper.setText(R.id.tv_count_person, String.format("%1$s%2$s%2$s", mContext.getString(R.string.rv_to_time), "6", mContext.getString(R.string.rv_person)));
helper.setText(R.id.tv_price, String.format("￥%1$s", "3200000"));
helper.setText(R.id.tv_camp_process, toTravelBean.name);
helper.setText(R.id.tv_camp_process, mContext.getString(R.string.rv_to_pay_for));
helper.addOnClickListener(R.id.tv_camp_process);
helper.setGone(R.id.tv_camp_process, TextUtils.isEmpty(toTravelBean.name) ? false : true);
helper.setGone(R.id.tv_camp_process, TextUtils.isEmpty(dataBean2.getName()) ? false : true);
break;
}
}
......
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/ForPaymentAdapter.java
View file @ cbfd693c
......@@ -9,10 +9,7 @@ import com.ruiwenliu.wrapper.util.BaseGlideHolder;
import com.ruiwenliu.wrapper.util.TimeManager;
import com.rv.home.R;
import com.rv.home.R2;
import com.rv.home.rv.module.ui.main.home.order.bean.ForPaymentBean;
import com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean;
import com.rv.home.rv.module.ui.main.home.order.bean.ToTravelBean;
import java.util.List;
/**
......@@ -21,9 +18,9 @@ import java.util.List;
* Desc:待付款
*/
public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,BaseGlideHolder> {
public static final int TYPE_FOR_PAYMENT=0;
public static final int TYPE_TO_TRAVEL=1;
public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity, BaseGlideHolder> {
public static final int TYPE_FOR_PAYMENT = 1; //1--租车；2--旅游
public static final int TYPE_TO_TRAVEL = 2;
public ForPaymentAdapter(List<MultiItemEntity> data) {
super(data);
......@@ -33,41 +30,53 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
@Override
protected void convert(BaseGlideHolder helper, MultiItemEntity item) {
switch (helper.getItemViewType()){
switch (helper.getItemViewType()) {
case TYPE_FOR_PAYMENT:
OrderListBean.DataBeanX.DataBean dataBean= (OrderListBean.DataBeanX.DataBean) item;
helper.setText(R.id.tv_order_time,String.format("%1$s%2$s",mContext.getString(R.string.rv_order_time),dataBean.getCrtTime()));
helper.setText(R.id.tv_city,dataBean.getDetail().getStart_city_name());
helper.setText(R.id.tv_order_state,mContext.getString(R.string.rv_order_for_payment));
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_get_time, TimeManager.stampToDate(String.valueOf(dataBean.getDetail().getStart_time())));
helper.setText(R.id.tv_get_address,dataBean.getDetail().getStart_addr());
helper.setText(R.id.tv_out_time, TimeManager.stampToDate(String.valueOf(dataBean.getDetail().getEnd_time())));
helper.setText(R.id.tv_out_address,dataBean.getDetail().getEnd_addr());
helper.setText(R.id.tv_price,String.format("￥%1$s",dataBean.getOrderAmount()));
helper.setText(R.id.tv_process,mContext.getString(R.string.rv_to_pay_for));
OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) item;
if (dataBean == null) {
return;
}
helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean.getCrtTime()));
if (dataBean.getOrderRentVehicleDetail() != null && dataBean.getOrderRentVehicleDetail().getStart_city_name() != null) {
helper.setText(R.id.tv_city, dataBean.getOrderRentVehicleDetail().getStart_city_name());
}
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
helper.loadRoundImage(mContext, dataBean.getPicture(), (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_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_address, dataBean.getOrderRentVehicleDetail().getEnd_addr());
helper.setText(R.id.tv_price, String.format("￥%1$s", dataBean.getOrderAmount()));
}
helper.setText(R.id.tv_process, mContext.getString(R.string.rv_to_pay_for));
helper.addOnClickListener(R.id.tv_process);
break;
case TYPE_TO_TRAVEL:
ToTravelBean toTravelBean= (ToTravelBean) item;
helper.setText(R.id.tv_order_time,String.format("%1$s%2$s",mContext.getString(R.string.rv_order_time),"2019-8-12"));
helper.setText(R.id.tv_city,"东莞市");
helper.setText(R.id.tv_order_state,mContext.getString(R.string.rv_order_for_payment));
String urls="https://gss1.bdstatic.com/-vo3dSag_xI4khGkpoWK1HF6hhy/baike/c0%3Dbaike180%2C5%2C5%2C180%2C60/sign=fc8e9183fd03738dca470470d272db34/10dfa9ec8a136327275f2c109a8fa0ec08fac767.jpg";
helper.loadRoundImage(mContext,urls, (ImageView) helper.getView(R.id.iv_goods),50);
helper.setText(R.id.tv_car_type,"奔驰最新款霸道房车");
helper.setText(R.id.tv_out_time,String.format("%1$s%2$s",mContext.getString(R.string.rv_to_time),"2019-7-4"));
helper.setText(R.id.tv_count_person,String.format("%1$s%2$s%2$s",mContext.getString(R.string.rv_to_time),"6",mContext.getString(R.string.rv_person)));
helper.setText(R.id.tv_price,String.format("￥%1$s","3200000"));
helper.setText(R.id.tv_camp_process,toTravelBean.name);
OrderListBean.DataBeanX.DataBean dataBean2 = (OrderListBean.DataBeanX.DataBean) item;
if (dataBean2 == null) {
return;
}
if (dataBean2.getOrderTourDetail() ==null ){
return;
}
helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean2.getCrtTime()));
helper.setText(R.id.tv_city, "东莞市");
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
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.stampToDate(String.valueOf( dataBean2.getOrderTourDetail().getStartTime())));
helper.setText(R.id.tv_count_person, String.format("%1$s%2$s%2$s", mContext.getString(R.string.rv_to_time), "6", mContext.getString(R.string.rv_person)));
helper.setText(R.id.tv_price, String.format("￥%1$s", dataBean2.getOrderAmount()));
helper.setText(R.id.tv_camp_process, mContext.getString(R.string.rv_to_pay_for));
helper.addOnClickListener(R.id.tv_camp_process);
helper.setGone(R.id.tv_camp_process, TextUtils.isEmpty(toTravelBean.name)?false:true);
helper.setGone(R.id.tv_camp_process, TextUtils.isEmpty(dataBean2.getName()) ? false : true);
break;
}
}
public void addNewData(OrderListBean bean){
public void addNewData(OrderListBean bean) {
mData.clear();
addData(bean.getData().getData());
notifyDataSetChanged();
......
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/HaveToTravelAdapter.java
View file @ cbfd693c
......@@ -21,8 +21,8 @@ import java.util.List;
*/
public class HaveToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,BaseGlideHolder> {
public static final int TYPE_FOR_PAYMENT=0;
public static final int TYPE_TO_TRAVEL=1;
public static final int TYPE_FOR_PAYMENT=1;
public static final int TYPE_TO_TRAVEL=2;
public HaveToTravelAdapter(List<MultiItemEntity> data) {
super(data);
......@@ -35,33 +35,45 @@ public class HaveToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEnti
switch (helper.getItemViewType()){
case TYPE_FOR_PAYMENT:
OrderListBean.DataBeanX.DataBean dataBean= (OrderListBean.DataBeanX.DataBean) item;
if (dataBean ==null){
return;
}
helper.setText(R.id.tv_order_time,String.format("%1$s%2$s",mContext.getString(R.string.rv_order_time),dataBean.getCrtTime()));
helper.setText(R.id.tv_city,dataBean.getDetail().getStart_city_name());
if (dataBean.getOrderRentVehicleDetail() !=null && dataBean.getOrderRentVehicleDetail().getStart_city_name()!=null) {
helper.setText(R.id.tv_city, dataBean.getOrderRentVehicleDetail().getStart_city_name());
}
helper.setText(R.id.tv_order_state,mContext.getString(R.string.rv_order_have_travel));
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_get_time, TimeManager.stampToDate(String.valueOf(dataBean.getDetail().getStart_time())));
helper.setText(R.id.tv_get_address,dataBean.getDetail().getStart_addr());
helper.setText(R.id.tv_out_time, TimeManager.stampToDate(String.valueOf(dataBean.getDetail().getEnd_time())));
helper.setText(R.id.tv_out_address,dataBean.getDetail().getEnd_addr());
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_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_address, dataBean.getOrderRentVehicleDetail().getEnd_addr());
}
helper.setText(R.id.tv_price,String.format("￥%1$s",dataBean.getOrderAmount()));
helper.setText(R.id.tv_process,mContext.getString(R.string.rv_to_out_car));
helper.addOnClickListener(R.id.tv_process);
break;
case TYPE_TO_TRAVEL:
ToTravelBean toTravelBean= (ToTravelBean) item;
helper.setText(R.id.tv_order_time,String.format("%1$s%2$s",mContext.getString(R.string.rv_order_time),"2019-8-12"));
helper.setText(R.id.tv_city,"东莞市");
OrderListBean.DataBeanX.DataBean dataBean2 = (OrderListBean.DataBeanX.DataBean) item;
if (dataBean2 == null) {
return;
}
if (dataBean2.getOrderTourDetail() ==null ){
return;
}
helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean2.getCrtTime()));
helper.setText(R.id.tv_city, "东莞市");
helper.setText(R.id.tv_order_state,mContext.getString(R.string.rv_order_for_payment));
String urls="https://gss1.bdstatic.com/-vo3dSag_xI4khGkpoWK1HF6hhy/baike/c0%3Dbaike180%2C5%2C5%2C180%2C60/sign=fc8e9183fd03738dca470470d272db34/10dfa9ec8a136327275f2c109a8fa0ec08fac767.jpg";
helper.loadRoundImage(mContext,urls, (ImageView) helper.getView(R.id.iv_goods),50);
helper.setText(R.id.tv_car_type,"奔驰最新款霸道房车");
helper.setText(R.id.tv_out_time,String.format("%1$s%2$s",mContext.getString(R.string.rv_to_time),"2019-7-4"));
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.stampToDate(String.valueOf( dataBean2.getOrderTourDetail().getStartTime())));
helper.setText(R.id.tv_count_person,String.format("%1$s%2$s%2$s",mContext.getString(R.string.rv_to_time),"6",mContext.getString(R.string.rv_person)));
helper.setText(R.id.tv_price,String.format("￥%1$s","3200000"));
helper.setText(R.id.tv_camp_process,toTravelBean.name);
helper.setText(R.id.tv_price, String.format("￥%1$s", dataBean2.getOrderAmount()));
helper.setText(R.id.tv_camp_process, mContext.getString(R.string.rv_to_pay_for));
helper.addOnClickListener(R.id.tv_camp_process);
helper.setGone(R.id.tv_camp_process, TextUtils.isEmpty(toTravelBean.name)?false:true);
helper.setGone(R.id.tv_camp_process, TextUtils.isEmpty(mContext.getString(R.string.rv_to_pay_for))?false:true);
break;
}
}
......
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/OrderListAdapter.java
View file @ cbfd693c
......@@ -22,8 +22,8 @@ import java.util.List;
*/
public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity, BaseGlideHolder> {
public static final int TYPE_FOR_PAYMENT = 0;
public static final int TYPE_TO_TRAVEL = 1;
public static final int TYPE_FOR_PAYMENT = 1;
public static final int TYPE_TO_TRAVEL = 2;
public OrderListAdapter(List<MultiItemEntity> data) {
super(data);
......@@ -36,14 +36,21 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
switch (helper.getItemViewType()) {
case TYPE_FOR_PAYMENT:
OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) item;
if (dataBean ==null){
return;
}
helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean.getCrtTime()));
helper.setText(R.id.tv_city, dataBean.getDetail().getStart_city_name());
if (dataBean.getOrderRentVehicleDetail() !=null && dataBean.getOrderRentVehicleDetail().getStart_city_name()!=null) {
helper.setText(R.id.tv_city, dataBean.getOrderRentVehicleDetail().getStart_city_name());
}
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_get_time, TimeManager.stampToDate(String.valueOf(dataBean.getDetail().getStart_time())));
helper.setText(R.id.tv_get_address, dataBean.getDetail().getStart_addr());
helper.setText(R.id.tv_out_time, TimeManager.stampToDate(String.valueOf(dataBean.getDetail().getEnd_time())));
helper.setText(R.id.tv_out_address, dataBean.getDetail().getEnd_addr());
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_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_address, dataBean.getOrderRentVehicleDetail().getEnd_addr());
}
helper.setText(R.id.tv_price, String.format("￥%1$s", dataBean.getOrderAmount()));
String orderState = "";
String processName = "";
......@@ -74,19 +81,24 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
helper.addOnClickListener(R.id.tv_process);
break;
case TYPE_TO_TRAVEL:
ToTravelBean toTravelBean = (ToTravelBean) item;
helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), "2019-8-12"));
OrderListBean.DataBeanX.DataBean dataBean2 = (OrderListBean.DataBeanX.DataBean) item;
if (dataBean2 == null) {
return;
}
if (dataBean2.getOrderTourDetail() ==null ){
return;
}
helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean2.getCrtTime()));
helper.setText(R.id.tv_city, "东莞市");
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
String urls = "https://gss1.bdstatic.com/-vo3dSag_xI4khGkpoWK1HF6hhy/baike/c0%3Dbaike180%2C5%2C5%2C180%2C60/sign=fc8e9183fd03738dca470470d272db34/10dfa9ec8a136327275f2c109a8fa0ec08fac767.jpg";
helper.loadRoundImage(mContext, urls, (ImageView) helper.getView(R.id.iv_goods), 50);
helper.setText(R.id.tv_car_type, "奔驰最新款霸道房车");
helper.setText(R.id.tv_out_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_to_time), "2019-7-4"));
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.stampToDate(String.valueOf( dataBean2.getOrderTourDetail().getStartTime())));
helper.setText(R.id.tv_count_person, String.format("%1$s%2$s%2$s", mContext.getString(R.string.rv_to_time), "6", mContext.getString(R.string.rv_person)));
helper.setText(R.id.tv_price, String.format("￥%1$s", "3200000"));
helper.setText(R.id.tv_camp_process, toTravelBean.name);
helper.setText(R.id.tv_camp_process,mContext.getString(R.string.rv_to_pay_for));
helper.addOnClickListener(R.id.tv_camp_process);
helper.setGone(R.id.tv_camp_process, TextUtils.isEmpty(toTravelBean.name) ? false : true);
helper.setGone(R.id.tv_camp_process, TextUtils.isEmpty(mContext.getString(R.string.rv_to_pay_for)) ? false : true);
break;
}
}
......
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/ToTravelAdapter.java
View file @ cbfd693c
......@@ -20,9 +20,9 @@ import java.util.List;
* Desc:待出行
*/
public class ToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,BaseGlideHolder> {
public static final int TYPE_FOR_PAYMENT=0;
public static final int TYPE_TO_TRAVEL=1;
public class ToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity, BaseGlideHolder> {
public static final int TYPE_FOR_PAYMENT = 1;
public static final int TYPE_TO_TRAVEL = 2;
public ToTravelAdapter(List<MultiItemEntity> data) {
super(data);
......@@ -32,41 +32,53 @@ public class ToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,B
@Override
protected void convert(BaseGlideHolder helper, MultiItemEntity item) {
switch (helper.getItemViewType()){
OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) item;
if (dataBean == null) {
return;
}
switch (dataBean.getType()) {
case TYPE_FOR_PAYMENT:
OrderListBean.DataBeanX.DataBean dataBean= (OrderListBean.DataBeanX.DataBean) item;
helper.setText(R.id.tv_order_time,String.format("%1$s%2$s",mContext.getString(R.string.rv_order_time),dataBean.getCrtTime()));
helper.setText(R.id.tv_city,dataBean.getDetail().getStart_city_name());
helper.setText(R.id.tv_order_state,mContext.getString(R.string.rv_order_to_travel));
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_get_time, TimeManager.stampToDate(String.valueOf(dataBean.getDetail().getStart_time())));
helper.setText(R.id.tv_get_address,dataBean.getDetail().getStart_addr());
helper.setText(R.id.tv_out_time, TimeManager.stampToDate(String.valueOf(dataBean.getDetail().getEnd_time())));
helper.setText(R.id.tv_out_address,dataBean.getDetail().getEnd_addr());
helper.setText(R.id.tv_price,String.format("￥%1$s",dataBean.getOrderAmount()));
helper.setText(R.id.tv_process,mContext.getString(R.string.rv_to_get_car));
helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean.getCrtTime()));
if (dataBean.getOrderRentVehicleDetail() != null && dataBean.getOrderRentVehicleDetail().getStart_city_name() != null) {
helper.setText(R.id.tv_city, dataBean.getOrderRentVehicleDetail().getStart_city_name());
}
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_to_travel));
helper.loadRoundImage(mContext, dataBean.getPicture(), (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_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_address, dataBean.getOrderRentVehicleDetail().getEnd_addr());
}
helper.setText(R.id.tv_price, String.format("￥%1$s", dataBean.getOrderAmount()));
helper.setText(R.id.tv_process, mContext.getString(R.string.rv_to_get_car));
helper.addOnClickListener(R.id.tv_process);
break;
case TYPE_TO_TRAVEL:
ToTravelBean toTravelBean= (ToTravelBean) item;
helper.setText(R.id.tv_order_time,String.format("%1$s%2$s",mContext.getString(R.string.rv_order_time),"2019-8-12"));
helper.setText(R.id.tv_city,"东莞市");
helper.setText(R.id.tv_order_state,mContext.getString(R.string.rv_order_for_payment));
String urls="https://gss1.bdstatic.com/-vo3dSag_xI4khGkpoWK1HF6hhy/baike/c0%3Dbaike180%2C5%2C5%2C180%2C60/sign=fc8e9183fd03738dca470470d272db34/10dfa9ec8a136327275f2c109a8fa0ec08fac767.jpg";
helper.loadRoundImage(mContext,urls, (ImageView) helper.getView(R.id.iv_goods),50);
helper.setText(R.id.tv_car_type,"奔驰最新款霸道房车");
helper.setText(R.id.tv_out_time,String.format("%1$s%2$s",mContext.getString(R.string.rv_to_time),"2019-7-4"));
helper.setText(R.id.tv_count_person,String.format("%1$s%2$s%2$s",mContext.getString(R.string.rv_to_time),"6",mContext.getString(R.string.rv_person)));
helper.setText(R.id.tv_price,String.format("￥%1$s","3200000"));
helper.setText(R.id.tv_camp_process,toTravelBean.name);
OrderListBean.DataBeanX.DataBean dataBean2 = (OrderListBean.DataBeanX.DataBean) item;
if (dataBean2 == null) {
return;
}
if (dataBean2.getOrderTourDetail() ==null ){
return;
}
helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean2.getCrtTime()));
helper.setText(R.id.tv_city, "东莞市");
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
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.stampToDate(String.valueOf( dataBean2.getOrderTourDetail().getStartTime())));
helper.setText(R.id.tv_count_person, String.format("%1$s%2$s%2$s", mContext.getString(R.string.rv_to_time), "6", mContext.getString(R.string.rv_person)));
helper.setText(R.id.tv_price, String.format("￥%1$s", "3200000"));
helper.setText(R.id.tv_camp_process, mContext.getString(R.string.rv_to_pay_for));
helper.addOnClickListener(R.id.tv_camp_process);
helper.setGone(R.id.tv_camp_process, TextUtils.isEmpty(toTravelBean.name)?false:true);
helper.setGone(R.id.tv_camp_process, TextUtils.isEmpty(dataBean2.getName()) ? false : true);
break;
}
}
public void addNewData(OrderListBean bean){
public void addNewData(OrderListBean bean) {
mData.clear();
addData(bean.getData().getData());
notifyDataSetChanged();
......
RvHome/src/main/res/layout/activity_order_to_travel.xml
View file @ cbfd693c
......@@ -27,6 +27,7 @@
android:ellipsize="end"
android:gravity="center"
android:maxLines="1"
android:text="订单详情"
android:maxWidth="320dp"
android:textColor="@color/textMain"
android:textSize="@dimen/text_18" />
......
RvHome/src/main/res/values/strings.xml
View file @ cbfd693c
......@@ -165,5 +165,7 @@
<string name="rv_to_evaluate">去评价</string>
<string name="rv_contact_staff">联系工作人员</string>
<string name="deposit_information">押金信息</string>
<string name="order_details_title">订单详情</string>
<string name="rv_charge_details">费用明细</string>
<!--=================================================房车结束========================================-->
</resources>
RvMine/build.gradle
View file @ cbfd693c
......@@ -24,6 +24,7 @@ android {
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
api 'com.jakewharton:butterknife:8.8.1'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
api project(':RvHome')
}
RvMine/src/main/AndroidManifest.xml
View file @ cbfd693c
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.rv.rvmine">
</manifest>
\ No newline at end of file
RvMine/src/main/java/com/rv/rvmine/IDCardCertificationActivity.java deleted 100644 → 0
View file @ bd8fdb5f
package com.rv.rvmine;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.home.rv.module.basic.presenter.PickerPresenter;
public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresenter> {
public static Intent getIntent(Context context) {
return new Intent(context, IDCardCertificationActivity.class);
}
@Override
protected int setLayout() {
return R.layout.activity_idcard_certification;
}
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setTitle(mActivity.getString(R.string.tv_id_card_certrfication_title));
}
@Override
public void onShowResult(int requestType, BaseBean result) {
}
}
RvMine/src/main/java/com/rv/rvmine/MineActivity.java
View file @ cbfd693c
package com.rv.rvmine;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
......@@ -10,8 +12,9 @@ import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.base.utils.base.BaseActivity;
import com.base.utils.tools.android.IntentUtil;
import com.base.utils.ui.image.round.RoundImageView;
import com.frame.base.browse.ActivityImageBrowseInt;
import com.frame.base.glide.GlideManager;
import com.frame.rv.BaseTabLayout;
import com.frame.rv.ModuleChangeUtil;
......@@ -23,10 +26,18 @@ import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.login.LoginRvActivity;
import com.rv.home.rv.module.ui.main.home.order.OrderListActivity;
import com.rv.rvmine.personal.IDCardCertificationActivity;
import com.rv.rvmine.traveler.SettingActivity;
import com.yuyife.banner.Banner;
import com.yuyife.banner.BannerConfig;
import com.yuyife.banner.listener.OnBannerListener;
import com.yuyife.banner.loader.ImageLoader;
import com.yuyife.okgo.OkGoUtil;
import java.util.ArrayList;
import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
public class MineActivity extends BaseStatusActivity<CommonPresenter> {
......@@ -71,6 +82,8 @@ public class MineActivity extends BaseStatusActivity<CommonPresenter> {
RelativeLayout rlItemSetting;
@BindView(R2.id.travel_fragment_layout)
LinearLayout travelFragmentLayout;
@BindView(R2.id.mine_banner)
Banner mineBanner;
@Override
protected int setLayout() {
......@@ -83,20 +96,20 @@ public class MineActivity extends BaseStatusActivity<CommonPresenter> {
showTitle(false);
travelTabLayout.setCurrent(OnModuleChangedListener.MODULE_MINE);
if (TextUtils.isEmpty( OkGoUtil.getToken())) {
setBanner();
if (TextUtils.isEmpty(OkGoUtil.getToken())) {
tvNickname.setVisibility(View.GONE);
ivMember.setVisibility(View.GONE);
tvLogin.setVisibility(View.VISIBLE);
tvVerified.setVisibility(View.GONE);
}else {
} else {
tvNickname.setVisibility(View.VISIBLE);
ivMember.setVisibility(View.VISIBLE);
tvLogin.setVisibility(View.GONE);
tvVerified.setVisibility(View.VISIBLE);
Log.i("Mineactivityty", "initView: " +UtilsManager.getInstance(mActivity).getSPStringCode("city_json","headerurl"));
GlideManager.getInstance(mActivity).loadImage(UtilsManager.getInstance(mActivity).getSPStringCode("city_json","headerurl"), ivAvatar);
tvNickname.setText(UtilsManager.getInstance(mActivity).getSPStringCode("city_json","username"));
// Log.i("Mineactivityty", "initView: " + UtilsManager.getInstance(mActivity).getSPStringCode("city_json", "headerurl"));
GlideManager.getInstance(mActivity).loadImage(UtilsManager.getInstance(mActivity).getSPStringCode("city_json", "headerurl"), ivAvatar);
tvNickname.setText(UtilsManager.getInstance(mActivity).getSPStringCode("city_json", "username"));
}
}
......@@ -110,59 +123,118 @@ public class MineActivity extends BaseStatusActivity<CommonPresenter> {
@OnClick({R2.id.iv_avatar, R2.id.tv_login, R2.id.tv_verified, R2.id.rl_item_to_be_paid, R2.id.rl_item_staying, R2.id.rl_item_traveling, R2.id.rl_item_completed, R2.id.rl_item_all, R2.id.rl_item_collection, R2.id.rl_item_personal_information, R2.id.rl_item_information, R2.id.rl_item_setting})
public void onViewClicked(View view) {
int id = view.getId();
if (id ==R.id.iv_avatar){
if (id == R.id.iv_avatar) {
//头像
if (isLogin()) return;
}else if (id== R.id.tv_login){
//登录
} else if (id == R.id.tv_login) {
//登录
startActivity(LoginRvActivity.getIntent(mActivity));
}else if (id == R.id.tv_verified){
//实名认证
} else if (id == R.id.tv_verified) {
//实名认证
if (isLogin()) return;
startActivity(IDCardCertificationActivity.getIntent(mActivity));
}else if (id == R.id.rl_item_to_be_paid){
} else if (id == R.id.rl_item_to_be_paid) {
//待支付
if (isLogin()) return;
startActivity(OrderListActivity.getIntent(mActivity, 0));
}else if (id == R.id.rl_item_staying){
} else if (id == R.id.rl_item_staying) {
//待出行
if (isLogin()) return;
startActivity(OrderListActivity.getIntent(mActivity, 1));
}else if (id ==R.id.rl_item_traveling){
} else if (id == R.id.rl_item_traveling) {
//出行中
if (isLogin()) return;
startActivity(OrderListActivity.getIntent(mActivity, 2));
}else if (id == R.id.rl_item_completed){
} else if (id == R.id.rl_item_completed) {
//已完成
if (isLogin()) return;
startActivity(OrderListActivity.getIntent(mActivity, 3));
}else if (id ==R.id.rl_item_all){
} else if (id == R.id.rl_item_all) {
//全部
if (isLogin()) return;
startActivity(OrderListActivity.getIntent(mActivity, 4));
}else if (id == R.id.rl_item_collection){
//收藏
} else if (id == R.id.rl_item_collection) {
//收藏
if (isLogin()) return;
showToast("该功能还在开发中");
}else if (id == R.id.rl_item_personal_information){
} else if (id == R.id.rl_item_personal_information) {
//个人资料
if (isLogin()) return;
showToast("该功能还在开发中");
}else if (id == R.id.rl_item_information){
} else if (id == R.id.rl_item_information) {
//信息
if (isLogin()) return;
showToast("该功能还在开发中");
}else if (id ==R.id.rl_item_setting){
//设置
} else if (id == R.id.rl_item_setting) {
//设置
startActivityForResult(SettingActivity.getIntent(mActivity),101);
}
}
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 101 && resultCode ==201){
ivAvatar.setImageResource(R.drawable.common_icon_avatar_default);
tvNickname.setVisibility(View.GONE);
ivMember.setVisibility(View.GONE);
tvLogin.setVisibility(View.VISIBLE);
tvVerified.setVisibility(View.GONE);
}
}
private ArrayList<String> images = new ArrayList<>(); //图片(默认采用网络地址)
private List<String> titles = new ArrayList<>(); //图片标题
private List<Integer> localImages = new ArrayList<>(); //图片(本地资源)
private void setBanner() {
titles.clear();
images.clear();
localImages.clear();
localImages.add(R.drawable.abanner);
localImages.add(R.drawable.abanner);
mineBanner.setImages(localImages);
for (int i = 0; i < localImages.size(); i++) {
titles.add("");
}
mineBanner.isAutoPlay(true)
.setBannerTitles(titles)
.setDelayTime(3000)
.setImageLoader(new ImageLoader() {
@Override
public void displayImage(Context context, Object path, ImageView imageView) {
GlideManager.getInstance(context).loadImage(path, imageView);
}
})
.setOnBannerListener(new OnBannerListener() {
@Override
public void OnBannerClick(int position) {
if (localImages != null && localImages.size() > 0) {
Bundle bundle = new Bundle();
bundle.putInt(ActivityImageBrowseInt.KEY_BACKGROUND, R.color.colorPrimary);
bundle.putIntegerArrayList(ActivityImageBrowseInt.KEY_IMAGE, (ArrayList<Integer>) localImages);
IntentUtil.startActivity(mActivity, ActivityImageBrowseInt.class, bundle);
}
}
})
.start();
mineBanner.updateBannerStyle(BannerConfig.CIRCLE_INDICATOR);
}
/**
* 判断是否登录
*
* @return
*/
private boolean isLogin() {
if (TextUtils.isEmpty( OkGoUtil.getToken())) {
if (TextUtils.isEmpty(OkGoUtil.getToken())) {
startActivity(LoginRvActivity.getIntent(mActivity));
return true;
}
......
RvMine/src/main/res/values/strings.xml
View file @ cbfd693c
......@@ -24,4 +24,14 @@
<string name="tv_negative">反面</string>
<string name="tv_id_card_photo_hint">*您所上传的身份证信息，仅用于欣新房车验证</string>
<string name="tv_id_card_certrfication_title">身份证认证</string>
<string name="setting_title">设置</string>
<string name="et_traveler_name_hint">请输入出游人姓名</string>
<string name="cb_man_hint">男</string>
<string name="cb_girl_hint">女</string>
<string name="et_phone_hint">请输入出游人手机号</string>
<string name="tv_travel_phone">手机号码</string>
<string name="et_id_card_hint">请输入出游人身份证号码</string>
<string name="cb_adult_hint">成人</string>
<string name="cb_child_hint">儿童</string>
<string name="add_a_visitor_title">添加出游人</string>
</resources>
RvTravel/build.gradle
View file @ cbfd693c
......@@ -13,7 +13,6 @@ android {
versionCode 1
versionName "1.0"
javaCompileOptions {
annotationProcessorOptions {
includeCompileClasspath = true
......
RvTravel/src/main/java/com/rv/travel/GoOtherUtil.java
View file @ cbfd693c
......@@ -10,10 +10,13 @@ import com.rv.travel.other.OtherOption;
import com.rv.travel.other.TravelFragmentActivity;
public class GoOtherUtil {
public static String travelDetailId = "0";
//去旅游详情
public static void goTravelDetailWeb(Activity activity) {
String url = "https://xxtest.upyuns.com/h5/appHtml/view/travelDetails.html?id=37";
public static void goTravelDetailWeb(String id, Activity activity) {
GoOtherUtil.travelDetailId = id;
String url = "https://xxtest.upyuns.com/h5/appHtml/view/travelDetails.html?id=" + id;
//TravelFragmentActivity.currentFragment = TravelWebFragment.getInstance(url);
TravelFragmentActivity.currentFragment = TravelWebFragment.getInstance(url);
OtherOption otherOption = new OtherOption();
otherOption.setTitle("详情");
......@@ -34,14 +37,14 @@ public class GoOtherUtil {
}
//去确认订单
public static void goTravelCommitOrder(final Activity activity) {
TravelFragmentActivity.currentFragment = TravelFragmentCommitOrder.getInstance();
public static void goTravelCommitOrder(String data,final Activity activity) {
TravelFragmentActivity.currentFragment = TravelFragmentCommitOrder.getInstance(data);
OtherOption otherOption = new OtherOption();
otherOption.setTitle("确认下单");
otherOption.setClickListener(new OtherClickListener() {
@Override
public void onBack() {
GoOtherUtil.goTravelDetailWeb(activity);
GoOtherUtil.goTravelDetailWeb(GoOtherUtil.travelDetailId, activity);
}
@Override
......
RvTravel/src/main/java/com/rv/travel/TravelActivity.java
View file @ cbfd693c
......@@ -17,9 +17,15 @@ import com.base.utils.base.BaseActivity;
import com.frame.rv.BaseTabLayout;
import com.frame.rv.ModuleChangeUtil;
import com.frame.rv.OnModuleChangedListener;
import com.rv.travel.api.ApiUtil;
import com.rv.travel.api.OnApiResponseCallback;
import com.rv.travel.bean.BeanHot;
import com.rv.travel.bean.BeanTravelMember;
import com.rv.travel.fragment.TravelFragmentHotType;
import com.rv.travel.fragment.TravelFragmentMain;
import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
......@@ -32,10 +38,17 @@ public class TravelActivity extends BaseActivity {
return instance;
}
public void setHotTypeTitle(String name) {
typeText.setText(name);
}
@BindView(R2.id.travel_tab_layout)
BaseTabLayout tabLayout;
@BindView(R2.id.travel_city_layout)
LinearLayout cityLayout;
@BindView(R2.id.travel_type_text)
TextView typeText;
@BindView(R2.id.travel_city_text)
TextView cityText;
@BindView(R2.id.search_input)
......@@ -63,7 +76,10 @@ public class TravelActivity extends BaseActivity {
} else if (id == R.id.travel_hot_type_select) {
travelFragmentHotType.setHotMoreFragment();
} else if (id == R.id.search_commit) {
searchInput.setText("");
String query = searchInput.getText().toString();
if (travelFragmentMain != null) {
travelFragmentMain.getRimData(query);
}
} else if (id == R.id.travel_server_image) {
showToastShort("联系客服");
}
......@@ -87,6 +103,24 @@ public class TravelActivity extends BaseActivity {
@Override
public void onData() {
tabLayout.setCurrent(OnModuleChangedListener.MODULE_TRAVEL);
//13766666666 12345678
//13612688539 12345678
ApiUtil.getToken("13612688539", "12345678", new OnApiResponseCallback<Boolean, String>() {
@Override
public void done(Boolean data, String errorMessage) {
if (data) {
ApiUtil.getTravelMember("1", new OnApiResponseCallback<List<BeanTravelMember>, String>() {
@Override
public void done(List<BeanTravelMember> data, String errorMessage) {
}
});
}
}
});
}
@Override
......@@ -110,6 +144,9 @@ public class TravelActivity extends BaseActivity {
searchCommit.setVisibility(View.VISIBLE);
} else {
searchCommit.setVisibility(View.GONE);
if (travelFragmentMain != null) {
travelFragmentMain.getRimData("");
}
}
}
});
......@@ -137,10 +174,10 @@ public class TravelActivity extends BaseActivity {
private TravelFragmentHotType travelFragmentHotType;
//点击 热门游 弹出列表 点击列表条目，设置
public void setTravelFragmentHotType() {
public void setTravelFragmentHotType(BeanHot bean) {
hotMoreTitleLayout.setVisibility(View.GONE);
hotTypeTitleLayout.setVisibility(View.VISIBLE);
travelFragmentHotType = new TravelFragmentHotType();
travelFragmentHotType = TravelFragmentHotType.getInstance(bean);
setFragment(travelFragmentHotType);
}
......
RvTravel/src/main/java/com/rv/travel/adapter/AdapterHot.java
View file @ cbfd693c
......@@ -3,9 +3,12 @@ package com.rv.travel.adapter;
import android.support.annotation.Nullable;
import android.support.v7.widget.CardView;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.frame.base.glide.GlideManager;
import com.rv.travel.R;
import com.rv.travel.bean.BeanHot;
......@@ -39,15 +42,22 @@ public class AdapterHot extends BaseQuickAdapter<BeanHot, AdapterHot.AdapterView
}
}
});
helper.itemText.setText(item.getName());
GlideManager.getInstance(helper.itemImage.getContext()).loadImage(item.getImg(),helper.itemImage);
}
public class AdapterViewHolder extends BaseViewHolder {
CardView itemRoot;
TextView itemText;
ImageView itemImage;
public AdapterViewHolder(View view) {
super(view);
itemRoot = view.findViewById(R.id.item_hot_card_view);
itemImage = view.findViewById(R.id.item_hot_bg_img);
itemText = view.findViewById(R.id.item_hot_text);
}
}
}
RvTravel/src/main/java/com/rv/travel/adapter/AdapterRim.java
View file @ cbfd693c
......@@ -3,10 +3,12 @@ package com.rv.travel.adapter;
import android.support.annotation.Nullable;
import android.support.v7.widget.CardView;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import com.base.utils.tools.android.IntentUtil;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.frame.base.glide.GlideManager;
import com.rv.travel.R;
import com.rv.travel.bean.BeanRim;
......@@ -40,16 +42,36 @@ public class AdapterRim extends BaseQuickAdapter<BeanRim, AdapterRim.AdapterView
}
}
});
helper.itemTitle.setText(item.getName());
helper.itemPrice.setText(item.getPrice());
helper.itemUnit.setText(item.getUnit());
helper.itemStock.setText(item.getStock());
GlideManager.getInstance(helper.itemImage.getContext()).loadImage(item.getCover(),helper.itemImage);
}
public class AdapterViewHolder extends BaseViewHolder {
CardView itemRoot;
TextView itemPrice;
TextView itemTitle;
TextView itemUnit;
TextView itemAddress;
TextView itemStock;
ImageView itemImage;
public AdapterViewHolder(View view) {
super(view);
itemRoot = view.findViewById(R.id.item_rim_root);
itemPrice = view.findViewById(R.id.item_rim_price);
itemTitle = view.findViewById(R.id.item_rim_title);
itemUnit= view.findViewById(R.id.item_rim_price_unit);
itemAddress= view.findViewById(R.id.item_rim_address);
itemStock= view.findViewById(R.id.item_rim_stock);
itemImage = view.findViewById(R.id.item_rim_image);
}
}
}
RvTravel/src/main/java/com/rv/travel/api/ApiKey.java 0 → 100644
View file @ cbfd693c
package com.rv.travel.api;
public interface ApiKey {
String STATUS_200="200";
String STATUS_500="500";
String MESSAGE="message";
String DATA="data";
String STATUS="status";
String TOTAL="total";
String LIST="list"; //数组的Key
String ERROR_PREFIX="error:";
String ERROR_NO_STATUS="Status is null or empty";
String ERROR_NO_DATA="data is null or empty";
}
RvTravel/src/main/java/com/rv/travel/api/OnApiResponseCallback.java 0 → 100644
View file @ cbfd693c
package com.rv.travel.api;
public interface OnApiResponseCallback<T,V> {
void done(T data, V errorMessage);
}
RvTravel/src/main/java/com/rv/travel/api/TravelApi.java
View file @ cbfd693c
......@@ -3,10 +3,19 @@ package com.rv.travel.api;
import com.frame.rv.RvFrameConfig;
public interface TravelApi extends RvFrameConfig {
//查询公司详情
String QUERY_COMPANY_DETAIL = HOST + ADMIN_POST + "user/querUserBycode";
//查询Banner
String QUERY_BANNER = HOST + "/tourBanner/app/unauth/findBannerlist";
//周边游、推荐路线
//登录 参数拼接在url上然后 post 请求
String TRAVEL_LOGIN = HOST + "/api/auth/jwt/login";
//查询公司详情 直接 在url上 +/ +参数 get
String QUERY_COMPANY_DETAIL = HOST + "/vehicle/branchCompany/app/unauth/detail/";
//查询Banner get
String QUERY_BANNER_MAIN = HOST + "/api/tour/tourBanner/app/unauth/findBannerlist";
String QUERY_BANNER_HOT = HOST + "/api/tour/tourTagBanner/app/unauth/findById/";
//周边游、推荐路线 get 需要传query关键字，没有关键字就""
String QUERY_RIM_LIST = HOST + "/api/tour/tourGood/app/unauth/getGoodList";
//热门游 路线 get
String QUERY_HOT_LIST = HOST + "/api/tour/tourTag/app/unauth/getTagList";
//获取旅游成员 直接 在url上 +/ +参数 get
String QUERY_TRAVEL_MEMBER = HOST + "/api/tour/tourUser/app/unauth/getTourUser/";
//确认下单
String COMMIT_ORDER = HOST + "/api/order/orderTour/add";
}
RvTravel/src/main/java/com/rv/travel/bean/BeanBanner.java 0 → 100644
View file @ cbfd693c
package com.rv.travel.bean;
public class BeanBanner {
private String id;//1,
private String title;//"首页",
private String cover;//"http://quanzilife.oss-cn-shenzhen.aliyuncs.com/zhrs_test/admin/hhBwsHpKHj.png",
private String crtName;//"admin",
private String crtTime;//20180822101653,
private String updTime;//20181229143002,
private String url;//"http://www.sczhrs.gov.cn/app/index/policies/policiesH5?id=5",
private String isDel;//0,
private String rank;//0
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public String getCover() {
return cover;
}
public void setCover(String cover) {
this.cover = cover;
}
public String getCrtName() {
return crtName;
}
public void setCrtName(String crtName) {
this.crtName = crtName;
}
public String getCrtTime() {
return crtTime;
}
public void setCrtTime(String crtTime) {
this.crtTime = crtTime;
}
public String getUpdTime() {
return updTime;
}
public void setUpdTime(String updTime) {
this.updTime = updTime;
}
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
}
public String getIsDel() {
return isDel;
}
public void setIsDel(String isDel) {
this.isDel = isDel;
}
public String getRank() {
return rank;
}
public void setRank(String rank) {
this.rank = rank;
}
}
RvTravel/src/main/java/com/rv/travel/bean/BeanHot.java
View file @ cbfd693c
package com.rv.travel.bean;
public class BeanHot {
private String id;// 1,
private String name;// "上海游",
private String describe;// "测试",
private String isHot;// 1,
private String count;// 0,
private String rank;// 1,
private String isDel;// 0
public String getImg() {
return img;
}
public void setImg(String img) {
this.img = img;
}
private String img;// 0
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getDescribe() {
return describe;
}
public void setDescribe(String describe) {
this.describe = describe;
}
public String getIsHot() {
return isHot;
}
public void setIsHot(String isHot) {
this.isHot = isHot;
}
public String getCount() {
return count;
}
public void setCount(String count) {
this.count = count;
}
public String getRank() {
return rank;
}
public void setRank(String rank) {
this.rank = rank;
}
public String getIsDel() {
return isDel;
}
public void setIsDel(String isDel) {
this.isDel = isDel;
}
}
RvTravel/src/main/java/com/rv/travel/bean/BeanLogin.java 0 → 100644
View file @ cbfd693c
package com.rv.travel.bean;
public class BeanLogin {
// {
// "data":{
// "nickname":"XX_414908",
// "headerurl":"https://xxtest.upyuns.com/image/app/default_%20avatar.png",
// "userid":27,
// "username":"13612688539"
// },
// "message":"操作成功",
// "status":200,
// "token":"eyJhbGciOiJSUzI1NiJ9.eyJzdWIiOiIxMzYxMjY4ODUzOSIsInVzZXJJZCI6IjI3IiwicmVxdWVzdFR5cGUiOiJBUFAiLCJleHAiOjE1NjAxNjMwMDN9.OgIQ7SjmX1DYzLDfsXcH-TUbKcatyEz7odkYFpTZ1wdxRB0iIrEKpXtC3zmf5VNDpaDc4cL-8XILiEfFVIGnfRKz4EDeXkFXVlBrqSORGm4TcqFu01aJ6xWVOmjSRkBp2gDhaGF-qOJXNK6Eufz90aF4t_CQ2tS7mG-UIVDty1s"
// }
}
RvTravel/src/main/java/com/rv/travel/bean/BeanRim.java
View file @ cbfd693c
package com.rv.travel.bean;
public class BeanRim {
private String id;//37,
private String name;//"04-05号 惠州长荣大观园2日游",
private String cover;//"https://xxtest.upyuns.com/image/app/ENRq748FQTq86R8R77J88YEWhnPeZ3.png",
private String price;//880,
private String childPrice;//500,
private String viewCount;//15,
private String saleCount;//6,
private String describe;//"",
private String content;//"
private String introduce;//
private String explain;//
private String rank;//8,
private String status;//1,
private String crtTime;//1556249282,
private String updTime;//1558418424,
private String recommend;//1,
private String isMember;//1,
private String stock;//44,
private String unit;//"元/人",
private String isDel;//0
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getCover() {
return cover;
}
public void setCover(String cover) {
this.cover = cover;
}
public String getPrice() {
return price;
}
public void setPrice(String price) {
this.price = price;
}
public String getChildPrice() {
return childPrice;
}
public void setChildPrice(String childPrice) {
this.childPrice = childPrice;
}
public String getViewCount() {
return viewCount;
}
public void setViewCount(String viewCount) {
this.viewCount = viewCount;
}
public String getSaleCount() {
return saleCount;
}
public void setSaleCount(String saleCount) {
this.saleCount = saleCount;
}
public String getDescribe() {
return describe;
}
public void setDescribe(String describe) {
this.describe = describe;
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
public String getIntroduce() {
return introduce;
}
public void setIntroduce(String introduce) {
this.introduce = introduce;
}
public String getExplain() {
return explain;
}
public void setExplain(String explain) {
this.explain = explain;
}
public String getRank() {
return rank;
}
public void setRank(String rank) {
this.rank = rank;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getCrtTime() {
return crtTime;
}
public void setCrtTime(String crtTime) {
this.crtTime = crtTime;
}
public String getUpdTime() {
return updTime;
}
public void setUpdTime(String updTime) {
this.updTime = updTime;
}
public String getRecommend() {
return recommend;
}
public void setRecommend(String recommend) {
this.recommend = recommend;
}
public String getIsMember() {
return isMember;
}
public void setIsMember(String isMember) {
this.isMember = isMember;
}
public String getStock() {
return stock;
}
public void setStock(String stock) {
this.stock = stock;
}
public String getUnit() {
return unit;
}
public void setUnit(String unit) {
this.unit = unit;
}
public String getIsDel() {
return isDel;
}
public void setIsDel(String isDel) {
this.isDel = isDel;
}
}
RvTravel/src/main/java/com/rv/travel/fragment/AndroidInterface.java 0 → 100644
View file @ cbfd693c
package com.rv.travel.fragment;
import android.webkit.JavascriptInterface;
import com.rv.travel.GoOtherUtil;
/**
* Created by cenxiaozhong on 2017/5/14.
* source code https://github.com/Justson/AgentWeb
*/
public class AndroidInterface {
private TravelWebFragment travelWebFragment;
public AndroidInterface(TravelWebFragment travelWebFragment) {
this.travelWebFragment = travelWebFragment;
}
@JavascriptInterface
public void showButton(String param) {
travelWebFragment.showButtonLayout();
}
@JavascriptInterface
public void readyOrder(String orderJson) {
//travelWebFragment.showToastLong("readyOrder:" + orderJson);
GoOtherUtil.goTravelCommitOrder(orderJson, travelWebFragment.getActivity());
}
}
RvTravel/src/main/java/com/rv/travel/fragment/TravelFragmentCommitOrder.java
View file @ cbfd693c
......@@ -28,8 +28,10 @@ import butterknife.Unbinder;
//确认下单
public class TravelFragmentCommitOrder extends BaseFragment {
public static TravelFragmentCommitOrder getInstance() {
private String data= "";
public static TravelFragmentCommitOrder getInstance(String oderJson) {
TravelFragmentCommitOrder instance = new TravelFragmentCommitOrder();
instance.data = oderJson;
return instance;
}
......
RvTravel/src/main/java/com/rv/travel/fragment/TravelFragmentHotMore.java
View file @ cbfd693c
......@@ -15,6 +15,8 @@ import com.rv.travel.adapter.AdapterHot;
import com.rv.travel.R;
import com.rv.travel.R2;
import com.rv.travel.TravelActivity;
import com.rv.travel.api.ApiUtil;
import com.rv.travel.api.OnApiResponseCallback;
import com.rv.travel.bean.BeanHot;
import java.util.ArrayList;
......@@ -89,26 +91,23 @@ public class TravelFragmentHotMore extends BaseFragment {
private void setHot() {
List<BeanHot> data = new ArrayList<>();
data.add(new BeanHot());
data.add(new BeanHot());
data.add(new BeanHot());
data.add(new BeanHot());
data.add(new BeanHot());
data.add(new BeanHot());
data.add(new BeanHot());
data.add(new BeanHot());
data.add(new BeanHot());
adapterHot = new AdapterHot(R.layout.item_travel_hot_more, data);
adapterHot.setOnItemRootClickListener(new AdapterHot.OnItemRootClickListener() {
@Override
public void onItemClick(BeanHot bean) {
TravelActivity.getInstance().setTravelFragmentHotType();
TravelActivity.getInstance().setHotTypeTitle(bean.getName());
TravelActivity.getInstance().setTravelFragmentHotType(bean);
}
});
GridLayoutManager gridLayoutManager = new GridLayoutManager(baseContext, 3);
hotRecycler.setLayoutManager(gridLayoutManager);
hotRecycler.setAdapter(adapterHot);
ApiUtil.getHotData("1", "1", "50", new OnApiResponseCallback<List<BeanHot>, String>() {
@Override
public void done(List<BeanHot> data, String errorMessage) {
adapterHot.setNewData(data);
}
});
}
......
RvTravel/src/main/java/com/rv/travel/fragment/TravelFragmentHotType.java
View file @ cbfd693c
......@@ -15,17 +15,18 @@ import android.widget.ImageView;
import com.base.utils.base.BaseFragment;
import com.base.utils.tools.android.IntentUtil;
import com.frame.base.browse.ActivityImageBrowseInt;
import com.frame.base.browse.ActivityImageBrowseUrl;
import com.frame.base.glide.GlideManager;
import com.rv.travel.GoOtherUtil;
import com.rv.travel.R;
import com.rv.travel.R2;
import com.rv.travel.TravelActivity;
import com.rv.travel.adapter.AdapterRim;
import com.rv.travel.api.ApiUtil;
import com.rv.travel.api.OnApiResponseCallback;
import com.rv.travel.bean.BeanBanner;
import com.rv.travel.bean.BeanHot;
import com.rv.travel.bean.BeanRim;
import com.rv.travel.other.OtherClickListener;
import com.rv.travel.other.OtherOption;
import com.rv.travel.other.TravelFragmentActivity;
import com.yuyife.banner.Banner;
import com.yuyife.banner.BannerConfig;
import com.yuyife.banner.listener.OnBannerListener;
......@@ -37,6 +38,7 @@ import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
//热门旅游 某个子栏目
public class TravelFragmentHotType extends BaseFragment {
@BindView(R2.id.travel_banner)
......@@ -51,6 +53,14 @@ public class TravelFragmentHotType extends BaseFragment {
@SuppressLint("StaticFieldLeak")
public static FrameLayout hotMoreLayoutStatic;
public static TravelFragmentHotType getInstance(BeanHot beanHot) {
TravelFragmentHotType instance = new TravelFragmentHotType();
instance.currentBeanHot = beanHot;
return instance;
}
private BeanHot currentBeanHot = null;
// @OnClick({R2.id.travel_hot_more_image
// })
// public void onTravelFragmentHotTypeClick(View view) {
......@@ -79,17 +89,27 @@ public class TravelFragmentHotType extends BaseFragment {
onView();
}
@Override
public void onResume() {
super.onResume();
TravelActivity.getInstance().setHotTypeTitle(currentBeanHot.getName());
}
@Override
public void onData() {
setRim();
}
@Override
public void onView() {
setBanner();
ApiUtil.getBannerDataHot(currentBeanHot.getId(), new OnApiResponseCallback<List<BeanBanner>, String>() {
@Override
public void done(List<BeanBanner> data, String errorMessage) {
setBanner(data);
}
});
}
@Override
......@@ -103,66 +123,62 @@ public class TravelFragmentHotType extends BaseFragment {
private void setRim() {
List<BeanRim> data = new ArrayList<>();
data.add(new BeanRim());
data.add(new BeanRim());
data.add(new BeanRim());
data.add(new BeanRim());
data.add(new BeanRim());
data.add(new BeanRim());
data.add(new BeanRim());
data.add(new BeanRim());
data.add(new BeanRim());
adapterRim = new AdapterRim(R.layout.item_travel_rim, data);
adapterRim.setItemRootClickListener(new AdapterRim.OnItemRootClickListener() {
@Override
public void onItemClick(BeanRim bean) {
GoOtherUtil.goTravelDetailWeb(getActivity());
GoOtherUtil.goTravelDetailWeb(bean.getId(), getActivity());
}
});
final LinearLayoutManager linearLayoutManager = new LinearLayoutManager(baseContext);
linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
rimRecycler.setLayoutManager(linearLayoutManager);
rimRecycler.setAdapter(adapterRim);
ApiUtil.getRimData(currentBeanHot.getId(), "", "1", "50", new OnApiResponseCallback<List<BeanRim>, String>() {
@Override
public void done(List<BeanRim> data, String errorMessage) {
adapterRim.setNewData(data);
}
});
}
private ArrayList<String> images = new ArrayList<>(); //图片(默认采用网络地址)
private List<String> titles = new ArrayList<>(); //图片标题
private List<Integer> localImages = new ArrayList<>(); //图片(本地资源)
//private List<Integer> localImages = new ArrayList<>(); //图片(本地资源)
private void setBanner() {
private void setBanner(List<BeanBanner> bannerData) {
titles.clear();
images.clear();
localImages.clear();
localImages.add(R.mipmap.banner_test3);
localImages.add(R.mipmap.banner_test4);
banner.setImages(localImages);
for (int i = 0; i < localImages.size(); i++) {
titles.add("");
if (bannerData != null && bannerData.size() > 0) {
for (BeanBanner bean : bannerData) {
images.add(bean.getCover());
}
for (int i = 0; i < images.size(); i++) {
titles.add("");
}
}
banner.isAutoPlay(true)
.setImages(images)
.setBannerTitles(titles)
.setDelayTime(3000)
.setImageLoader(new ImageLoader() {
@Override
public void displayImage(Context context, Object path, ImageView imageView) {
GlideManager.getInstance(context).loadImage(path, imageView);
}
})
.setOnBannerListener(new OnBannerListener() {
@Override
public void OnBannerClick(int position) {
if (localImages != null && localImages.size() > 0) {
Bundle bundle = new Bundle();
bundle.putInt(ActivityImageBrowseInt.KEY_BACKGROUND, R.color.colorPrimary);
bundle.putIntegerArrayList(ActivityImageBrowseInt.KEY_IMAGE, (ArrayList<Integer>) localImages);
IntentUtil.startActivity(baseContext, ActivityImageBrowseInt.class, bundle);
}
Bundle bundle = new Bundle();
bundle.putInt(ActivityImageBrowseUrl.KEY_BACKGROUND, R.color.colorPrimary);
bundle.putStringArrayList(ActivityImageBrowseUrl.KEY_IMAGE, (ArrayList<String>) images);
IntentUtil.startActivity(baseContext, ActivityImageBrowseUrl.class, bundle);
}
})
.start();
......
RvTravel/src/main/java/com/rv/travel/fragment/TravelFragmentMain.java
View file @ cbfd693c
......@@ -12,11 +12,13 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import com.base.animset.util.NiftyEffects;
import com.base.utils.base.BaseFragment;
import com.base.utils.tools.android.IntentUtil;
import com.frame.base.browse.ActivityImageBrowseInt;
import com.base.utils.tools.android.KeyboardUtil;
import com.base.utils.ui.datetime.selector.util.TextUtil;
import com.frame.base.browse.ActivityImageBrowseUrl;
import com.frame.base.glide.GlideManager;
import com.rv.travel.GoOtherUtil;
......@@ -26,6 +28,8 @@ import com.rv.travel.TravelActivity;
import com.rv.travel.adapter.AdapterHot;
import com.rv.travel.adapter.AdapterRim;
import com.rv.travel.api.ApiUtil;
import com.rv.travel.api.OnApiResponseCallback;
import com.rv.travel.bean.BeanBanner;
import com.rv.travel.bean.BeanHot;
import com.rv.travel.bean.BeanRim;
import com.yuyife.banner.Banner;
......@@ -40,6 +44,7 @@ import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import butterknife.Unbinder;
//主页面
public class TravelFragmentMain extends BaseFragment {
@BindView(R2.id.travel_banner)
......@@ -50,6 +55,8 @@ public class TravelFragmentMain extends BaseFragment {
RecyclerView rimRecycler;
@BindView(R2.id.travel_fragment_hot_more_layout)
FrameLayout hotMoreLayout;
@BindView(R2.id.query_layout)
LinearLayout queryLayout;
@SuppressLint("StaticFieldLeak")
public static FrameLayout hotMoreLayoutStatic;
......@@ -89,6 +96,8 @@ public class TravelFragmentMain extends BaseFragment {
setHot();
query = "";
isQueryMode = false;
setRim();
}
......@@ -98,28 +107,38 @@ public class TravelFragmentMain extends BaseFragment {
setBanner();
ApiUtil.getCompanyData();
ApiUtil.getCompanyData("2", new OnApiResponseCallback<List<BeanBanner>, String>() {
@Override
public void done(List<BeanBanner> data, String errorMessage) {
}
});
}
private AdapterHot adapterHot;
private void setHot() {
List<BeanHot> data = new ArrayList<>();
data.add(new BeanHot());
data.add(new BeanHot());
data.add(new BeanHot());
adapterHot = new AdapterHot(R.layout.item_travel_hot, data);
adapterHot.setOnItemRootClickListener(new AdapterHot.OnItemRootClickListener() {
@Override
public void onItemClick(BeanHot bean) {
TravelActivity.getInstance().setTravelFragmentHotType();
TravelActivity.getInstance().setTravelFragmentHotType(bean);
}
});
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(baseContext);
linearLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
hotRecycler.setLayoutManager(linearLayoutManager);
hotRecycler.setAdapter(adapterHot);
ApiUtil.getHotData("1", "1", "50", new OnApiResponseCallback<List<BeanHot>, String>() {
@Override
public void done(List<BeanHot> data, String errorMessage) {
adapterHot.setNewData(data);
}
});
}
private AdapterRim adapterRim;
......@@ -128,72 +147,89 @@ public class TravelFragmentMain extends BaseFragment {
List<BeanRim> data = new ArrayList<>();
data.add(new BeanRim());
data.add(new BeanRim());
data.add(new BeanRim());
data.add(new BeanRim());
data.add(new BeanRim());
data.add(new BeanRim());
data.add(new BeanRim());
data.add(new BeanRim());
data.add(new BeanRim());
adapterRim = new AdapterRim(R.layout.item_travel_rim, data);
adapterRim.setItemRootClickListener(new AdapterRim.OnItemRootClickListener() {
@Override
public void onItemClick(BeanRim bean) {
GoOtherUtil.goTravelDetailWeb(getActivity());
GoOtherUtil.goTravelDetailWeb(bean.getId(), getActivity());
}
});
final LinearLayoutManager linearLayoutManager = new LinearLayoutManager(baseContext);
linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
rimRecycler.setLayoutManager(linearLayoutManager);
rimRecycler.setAdapter(adapterRim);
ApiUtil.getRimData("", query, "1", "50", new OnApiResponseCallback<List<BeanRim>, String>() {
@Override
public void done(List<BeanRim> data, String errorMessage) {
adapterRim.setNewData(data);
}
});
if (isQueryMode) {
queryLayout.setVisibility(View.GONE);
} else {
queryLayout.setVisibility(View.VISIBLE);
}
}
private String query = "";
private boolean isQueryMode = false;
public void getRimData(String queryInput) {
KeyboardUtil.hideKeyboard(getActivity());
query = queryInput;
isQueryMode = !TextUtil.isEmpty(query);
setRim();
}
private ArrayList<String> images = new ArrayList<>(); //图片(默认采用网络地址)
private List<String> titles = new ArrayList<>(); //图片标题
private List<Integer> localImages = new ArrayList<>(); //图片(本地资源)
//private List<Integer> localImages = new ArrayList<>(); //图片(本地资源)
private void setBanner() {
titles.clear();
images.clear();
localImages.clear();
localImages.add(R.mipmap.banner_test1);
localImages.add(R.mipmap.banner_test2);
//localImages.clear();
banner.setImages(localImages);
for (int i = 0; i < localImages.size(); i++) {
titles.add("");
}
banner.isAutoPlay(true)
.setBannerTitles(titles)
.setDelayTime(3000)
.setImageLoader(new ImageLoader() {
@Override
public void displayImage(Context context, Object path, ImageView imageView) {
GlideManager.getInstance(context).loadImage(path, imageView);
}
})
.setOnBannerListener(new OnBannerListener() {
@Override
public void OnBannerClick(int position) {
if (localImages != null && localImages.size() > 0) {
Bundle bundle = new Bundle();
bundle.putInt(ActivityImageBrowseInt.KEY_BACKGROUND, R.color.colorPrimary);
bundle.putIntegerArrayList(ActivityImageBrowseInt.KEY_IMAGE, (ArrayList<Integer>) localImages);
IntentUtil.startActivity(baseContext, ActivityImageBrowseInt.class, bundle);
}
ApiUtil.getBannerDataMain(new OnApiResponseCallback<List<BeanBanner>, String>() {
@Override
public void done(List<BeanBanner> bannerData, String errorMessage) {
if (bannerData != null && bannerData.size() > 0) {
for (BeanBanner bean : bannerData) {
images.add(bean.getCover());
titles.add("");
}
})
.start();
}
banner.isAutoPlay(true)
.setBannerTitles(titles)
.setImages(images)
.setDelayTime(3000)
.setImageLoader(new ImageLoader() {
@Override
public void displayImage(Context context, Object path, ImageView imageView) {
GlideManager.getInstance(context).loadImage(path, imageView);
}
})
.setOnBannerListener(new OnBannerListener() {
@Override
public void OnBannerClick(int position) {
Bundle bundle = new Bundle();
bundle.putInt(ActivityImageBrowseUrl.KEY_BACKGROUND, R.color.colorPrimary);
bundle.putStringArrayList(ActivityImageBrowseUrl.KEY_IMAGE, (ArrayList<String>) images);
IntentUtil.startActivity(baseContext, ActivityImageBrowseUrl.class, bundle);
}
})
.start();
banner.updateBannerStyle(BannerConfig.CIRCLE_INDICATOR);
}
});
banner.updateBannerStyle(BannerConfig.CIRCLE_INDICATOR);
}
......
RvTravel/src/main/java/com/rv/travel/fragment/TravelWebFragment.java
View file @ cbfd693c
......@@ -7,20 +7,17 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
import com.base.utils.base.BaseFragment;
import com.base.utils.tools.android.IntentUtil;
import com.just.agentweb.AgentWeb;
import com.rv.travel.GoOtherUtil;
import com.rv.travel.R;
import com.rv.travel.R2;
import com.rv.travel.other.OtherClickListener;
import com.rv.travel.other.OtherOption;
import com.rv.travel.other.TravelFragmentActivity;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
//旅游详情
public class TravelWebFragment extends BaseFragment {
......@@ -33,16 +30,29 @@ public class TravelWebFragment extends BaseFragment {
private String URL_ADDRESS = "";
@BindView(R2.id.travel_web_fragment_root)
FrameLayout rootLayout;
@BindView(R2.id.travel_web_button_layout)
LinearLayout buttonLayout;
public void showButtonLayout() {
buttonLayout.setVisibility(View.VISIBLE);
}
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_web, container, false);
unbinder = ButterKnife.bind(this, view);
view.findViewById(R.id.travel_web_go_order).setOnClickListener(new View.OnClickListener() {
view.findViewById(R.id.travel_web_service_button).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
//showToastShort("联系客服");
}
});
view.findViewById(R.id.travel_web_subscribe_button).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
GoOtherUtil.goTravelCommitOrder(getActivity());
//buttonLayout.setVisibility(View.INVISIBLE);
mAgentWeb.getJsAccessEntrace().quickCallJs("openModal");
}
});
return view;
......@@ -62,7 +72,6 @@ public class TravelWebFragment extends BaseFragment {
public void onData() {
}
@Override
......@@ -87,31 +96,8 @@ public class TravelWebFragment extends BaseFragment {
.createAgentWeb()
.ready()
.go(URL_ADDRESS);
}
/**
* 准备确认订单
* @param company 公司名
* @param address 公司地址
* @param aim 目的地
* @param startDate 开始日期
* @param endDate 结束日期
* @param startWeek 开始的星期
* @param endWeek 结束的星期
* */
public void readyOrder(String company,
String address,
String aim,
String startDate,
String endDate,
String startWeek,
String endWeek){
GoOtherUtil.goTravelCommitOrder(getActivity());
}
public void readyOrder(String orderJson){
mAgentWeb.getJsInterfaceHolder().addJavaObject("android", new AndroidInterface(this));
}
}
RvTravel/src/main/res/layout/activity_travel.xml
View file @ cbfd693c
......@@ -127,6 +127,7 @@
android:orientation="horizontal">
<TextView
android:id="@+id/travel_type_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/ui_dimen_margin_h2"
......
RvTravel/src/main/res/layout/fragment_travel_mian.xml
View file @ cbfd693c
......@@ -16,88 +16,96 @@
android:orientation="vertical">
<android.support.v7.widget.CardView
<LinearLayout
android:id="@+id/query_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/ui_dimen_margin_h1"
android:foreground="?android:attr/selectableItemBackground"
app:cardBackgroundColor="@color/colorTop"
app:cardCornerRadius="@dimen/ui_dimen_common"
app:cardElevation="0dp">
<com.yuyife.banner.Banner
android:id="@+id/travel_banner"
android:orientation="vertical">
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="200dp" />
android:layout_height="wrap_content"
android:layout_margin="@dimen/ui_dimen_margin_h1"
android:foreground="?android:attr/selectableItemBackground"
app:cardBackgroundColor="@color/colorTop"
app:cardCornerRadius="@dimen/ui_dimen_common"
app:cardElevation="0dp">
<com.yuyife.banner.Banner
android:id="@+id/travel_banner"
android:layout_width="match_parent"
android:layout_height="200dp" />
</android.support.v7.widget.CardView>
</android.support.v7.widget.CardView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/_ui_height_h6"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/_ui_height_h6"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/ui_dimen_margin_h1"
android:layout_weight="1"
android:text="热门游"
android:textColor="@color/uiTextColorH1"
android:textSize="@dimen/_ui_text_size_h4" />
<ImageView
android:id="@+id/travel_hot_more_image"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginRight="@dimen/ui_dimen_margin_h1"
android:clickable="true"
android:paddingLeft="5dp"
android:scaleType="center"
android:src="@mipmap/rv_common_icon_right_arrow" />
</LinearLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/travel_hot_recycler"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/ui_dimen_margin_h1"
android:layout_weight="1"
android:text="热门游"
android:textColor="@color/uiTextColorH1"
android:textSize="@dimen/_ui_text_size_h4" />
<ImageView
android:id="@+id/travel_hot_more_image"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginRight="@dimen/ui_dimen_margin_h1"
android:clickable="true"
android:paddingLeft="5dp"
android:scaleType="center"
android:src="@mipmap/rv_common_icon_right_arrow" />
</LinearLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/travel_hot_recycler"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/ui_dimen_margin_h1"
android:layout_marginRight="@dimen/ui_dimen_margin_h1" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/_ui_height_h6"
android:gravity="center"
android:orientation="horizontal">
android:layout_marginRight="@dimen/ui_dimen_margin_h1" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/ui_dimen_margin_h1"
android:layout_weight="1"
android:text="周边游"
android:textColor="@color/uiTextColorH1"
android:textSize="@dimen/_ui_text_size_h4" />
<ImageView
android:id="@+id/travel_rim_more_image"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginRight="@dimen/ui_dimen_margin_h1"
android:paddingLeft="5dp"
android:scaleType="center" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/_ui_height_h6"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/ui_dimen_margin_h1"
android:layout_weight="1"
android:text="周边游"
android:textColor="@color/uiTextColorH1"
android:textSize="@dimen/_ui_text_size_h4" />
<ImageView
android:id="@+id/travel_rim_more_image"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginRight="@dimen/ui_dimen_margin_h1"
android:paddingLeft="5dp"
android:scaleType="center" />
</LinearLayout>
</LinearLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/travel_rim_recycler"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/ui_dimen_margin_h1"
android:layout_marginRight="@dimen/ui_dimen_margin_h1"
android:layout_marginTop="@dimen/ui_dimen_common" />
android:layout_marginTop="@dimen/ui_dimen_common"
android:layout_marginRight="@dimen/ui_dimen_margin_h1" />
</LinearLayout>
......
RvTravel/src/main/res/layout/fragment_web.xml
View file @ cbfd693c
......@@ -6,14 +6,57 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/travel_web_fragment_root"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:layout_marginBottom="@dimen/_ui_height_h3" />
</FrameLayout>
<Button
android:id="@+id/travel_web_go_order"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|center"
android:text="确认下单" />
<LinearLayout
android:id="@+id/travel_web_button_layout"
android:layout_width="match_parent"
android:layout_height="@dimen/_ui_height_h3"
android:layout_gravity="bottom"
android:background="@color/colorTop"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/travel_web_service_button"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:clickable="true"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/ui_dimen_margin_h1"
android:layout_marginRight="@dimen/ui_dimen_margin_h1"
android:drawableLeft="@drawable/rv_rentingcar_icon_service_dark"
android:drawablePadding="@dimen/ui_dimen_padding_h1"
android:gravity="center"
android:lines="1"
android:text="联系客服"
android:textColor="@color/colorTextH1"
android:textSize="@dimen/_ui_text_size_h5" />
</LinearLayout>
<TextView
android:id="@+id/travel_web_subscribe_button"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="@dimen/ui_dimen_common"
android:layout_weight="1"
android:background="@drawable/ui_shape_radius_common_primary_h1"
android:clickable="true"
android:gravity="center"
android:lines="1"
android:text="立即预约"
android:textColor="@color/colorTop"
android:textSize="@dimen/_ui_text_size_h3" />
</LinearLayout>
</FrameLayout>
\ No newline at end of file
RvTravel/src/main/res/layout/item_include_hot.xml
View file @ cbfd693c
......@@ -4,12 +4,14 @@
android:layout_height="match_parent">
<ImageView
android:id="@+id/item_hot_bg_img"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@mipmap/banner_test4" />
<TextView
android:id="@+id/item_hot_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
......
RvTravel/src/main/res/layout/item_travel_rim.xml
View file @ cbfd693c
......@@ -32,6 +32,7 @@
app:cardElevation="0dp">
<ImageView
android:id="@+id/item_rim_image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
......@@ -46,6 +47,7 @@
android:orientation="vertical">
<TextView
android:id="@+id/item_rim_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:lines="2"
......@@ -54,6 +56,7 @@
android:textSize="@dimen/_ui_text_size_h6" />
<TextView
android:id="@+id/item_rim_address"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/ui_dimen_margin_h1"
......@@ -72,13 +75,21 @@
android:layout_marginTop="@dimen/ui_dimen_common"
android:orientation="horizontal">
<TextView
android:id="@+id/item_rim_stock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:lines="1"
android:paddingLeft="@dimen/ui_dimen_common"
android:text="20"
android:textColor="@color/colorTextH1"
android:textSize="@dimen/_ui_text_size_h8" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:lines="1"
android:paddingLeft="@dimen/ui_dimen_common"
android:text="20人待出发"
android:text="人待出发"
android:textColor="@color/colorTextH1"
android:textSize="@dimen/_ui_text_size_h8" />
......@@ -91,6 +102,7 @@
android:textSize="@dimen/_ui_text_size_h3" />
<TextView
android:id="@+id/item_rim_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:lines="1"
......@@ -99,6 +111,7 @@
android:textSize="@dimen/_ui_text_size_h3" />
<TextView
android:id="@+id/item_rim_price_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:lines="1"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment