Skip to content

R
RvApp
Commit 47c4d8da authored by jianglx's avatar jianglx
Browse files
Options

Merge branch 'master' of http://113.105.137.151:22280/lify/rvapp into dev-member-john

parents 6bdb5db8 772349fb
Show whitespace changes
Inline Side-by-side
Showing with 194 additions and 123 deletions
Banner/src/main/res/drawable/gray_radius.xml
View file @ 47c4d8da
......@@ -2,6 +2,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid
android:color="#77000000"/>
android:color="#FFB74B"/>
<corners android:radius="5dip" />
</shape>
\ No newline at end of file
RvWrapper/src/main/java/com/ruiwenliu/wrapper/util/glide/GlideManager.java
View file @ 47c4d8da
......@@ -110,6 +110,8 @@ public class GlideManager {
public void loadImage(String url, ImageView image, int x, int y) {
GlideApp.with(mContext)
.load(url)
.placeholder(R.drawable.glide_icon_placeholder)
.error(R.drawable.glide_icon_error)
.apply(new RequestOptions()
.skipMemoryCache(true)
.diskCacheStrategy(DiskCacheStrategy.ALL).override(x, y))
......@@ -126,6 +128,8 @@ public class GlideManager {
public void loadRoundImage(String url, ImageView image, int round) {
GlideApp.with(mContext)
.load(url)
.placeholder(R.drawable.glide_icon_placeholder)
.error(R.drawable.glide_icon_error)
// .apply(RequestOptions.bitmapTransform(new CenterCrop(),new RoundedCorners(round)))
.apply(RequestOptions.bitmapTransform(new GlideRoundTransform(mContext, round)))
.into(image);
......@@ -142,6 +146,8 @@ public class GlideManager {
public void loadRoundImage2(Object url, ImageView image, int round) {
GlideApp.with(mContext)
.load(url)
.placeholder(R.drawable.glide_icon_placeholder)
.error(R.drawable.glide_icon_error)
// .apply(RequestOptions.bitmapTransform(new CenterCrop(),new RoundedCorners(round)))
.apply(RequestOptions.bitmapTransform(new GlideRoundTransform(mContext, round)))
.into(image);
......@@ -161,6 +167,8 @@ public class GlideManager {
GlideApp.with(mContext)
.load(url)
.placeholder(R.drawable.glide_icon_placeholder)
.error(R.drawable.glide_icon_error)
.apply(RequestOptions.bitmapTransform(new RoundedCorners(round)).override(50, 50))
.into(image);
}
......@@ -174,6 +182,8 @@ public class GlideManager {
public void loadCircleImage(String url, ImageView image) {
GlideApp.with(mContext)
.load(url)
.placeholder(R.drawable.glide_icon_placeholder)
.error(R.drawable.glide_icon_error)
.apply(RequestOptions.circleCropTransform()
.diskCacheStrategy(DiskCacheStrategy.NONE)//不做磁盘缓存
.skipMemoryCache(true)//不做内存缓存
......
RvWrapper/src/main/res/drawable/shape_image_view_bg.xml 0 → 100644
View file @ 47c4d8da
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#f2f2f2" />
<corners android:radius="10px" />
</shape>
\ No newline at end of file
component_resource/src/main/res/drawable/shape_rv_bg_translucent_black_half.xml 0 → 100644
View file @ 47c4d8da
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners
android:bottomLeftRadius="8dp"
android:bottomRightRadius="8dp" />
<solid android:color="@color/gray_50000000" />
</shape>
\ No newline at end of file
module_discovery/src/main/java/com/xxfc/discovery/adapter/DiscoveryRecommendAdapter.java
View file @ 47c4d8da
......@@ -25,7 +25,7 @@ public class DiscoveryRecommendAdapter extends BaseQuickAdapter<DiscoveryRecomme
DiscoveryRecommendBean.DataBeanX.DataBean.Body body = item.getBody();
if (body != null) {
if (body.getImages() != null && body.getImages().size() > 0) {
GlideManager.getInstance(mContext).loadImage(body.getImages().get(0).getOurl(), (ImageView) helper.getView(R.id.iv_icon));
GlideManager.getInstance(mContext).loadRoundImage2(body.getImages().get(0).getOurl(), (ImageView) helper.getView(R.id.iv_icon),8);
}
helper.setText(R.id.tv_title, body.getText());
if ("4".equals(body.getType())) { //消息类型 基础属性 1=文字消息、2=图文消息、3=语音消息、4=视频消息、 5=文件消
......
module_discovery/src/main/java/com/xxfc/discovery/fragment/QuestionAndAnswerFragment.java
View file @ 47c4d8da
......@@ -4,7 +4,6 @@ import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import com.alibaba.android.arouter.launcher.ARouter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.frame.base.bus.Observer;
......@@ -24,8 +23,6 @@ import com.xxfc.discovery.bean.DiscoveryAskBean;
import com.xxfc.discovery.event.DiscoveryAddEvent;
import com.xxfc.discovery.presenter.DiscoveryPresenter;
import com.yuyife.okgo.OkGoUtil;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.Map;
......
module_discovery/src/main/res/layout/fragment_pat.xml
View file @ 47c4d8da
......@@ -7,35 +7,18 @@
android:orientation="vertical"
tools:context=".fragment.PatFragment">
<com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/refresh"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v4.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/size_80"
android:scaleType="centerCrop"
android:src="@drawable/icon_fragment_discovery_hint" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_content"
android:layout_width="match_parent"
android:layout_height="wrap_content">
</android.support.v7.widget.RecyclerView>
android:layout_height="wrap_content"></android.support.v7.widget.RecyclerView>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout>
</LinearLayout>
\ No newline at end of file
module_discovery/src/main/res/layout/fragment_recommend.xml
View file @ 47c4d8da
......@@ -13,28 +13,12 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v4.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/size_80"
android:scaleType="centerCrop"
android:src="@drawable/icon_fragment_discovery_hint" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_content"
android:layout_width="match_parent"
android:layout_height="wrap_content">
</android.support.v7.widget.RecyclerView>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout>
</LinearLayout>
\ No newline at end of file
module_discovery/src/main/res/layout/rv_item_discovery_recommend.xml
View file @ 47c4d8da
......@@ -87,7 +87,7 @@
android:layout_width="@dimen/size_15"
android:layout_height="@dimen/size_15"
android:padding="@dimen/size_1"
android:src="@drawable/common_icon_like_unselected" />
android:src="@drawable/icon_discovery_ask_unlike" />
<TextView
android:id="@+id/iv_like_number"
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/AllOrderFragment.java
View file @ 47c4d8da
package com.rv.home.rv.module.ui.main.home.order;
import android.annotation.SuppressLint;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.support.annotation.Nullable;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import com.alipay.sdk.app.PayTask;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.entity.MultiItemEntity;
import com.frame.base.bus.PaymentSuccessfulEvent;
import com.frame.base.bus.RxBus;
import com.frame.rv.config.RvFrameConfig;
import com.frame.rv.widget.PayResult;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseFragment;
import com.ruiwenliu.wrapper.util.ViewHolder;
......@@ -19,6 +28,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.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.main.home.bean.OrderAliPayBean;
import com.rv.home.rv.module.ui.main.home.bean.OrderPayBean;
import com.rv.home.rv.module.ui.main.home.order.adapter.OrderListAdapter;
import com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean;
......@@ -50,6 +60,7 @@ public class AllOrderFragment extends BaseFragment<CommonPresenter> implements B
private int countPage;
private IWXAPI api;
private int payType =1;//选择支付类型
private static final int SDK_ALI_PAY_FLAG = 11;
public static AllOrderFragment getInstance(int type) {
Bundle bundl = new Bundle();
......@@ -140,6 +151,9 @@ public class AllOrderFragment extends BaseFragment<CommonPresenter> implements B
case 1:
pay((OrderPayBean) result);
break;
case 2:
aliPayData((OrderAliPayBean) result);
break;
}
}
......@@ -204,6 +218,7 @@ public class AllOrderFragment extends BaseFragment<CommonPresenter> implements B
* 支付类型选择
*/
private void payShowSelect(final String no, final double orderAmount) {
payType = 1;
PaymentTypeSelection dialog = new PaymentTypeSelection(_mActivity) {
@Override
public void helper(final ViewHolder helper) {
......@@ -226,7 +241,7 @@ public class AllOrderFragment extends BaseFragment<CommonPresenter> implements B
} else if (id == R.id.tv_pay_immediately) {
dismiss();
createOrder(no, 1, 1);
createOrder(no);
}
}
}, R.id.iv_close, R.id.ll_item_wechat, R.id.ll_item_alipay, R.id.tv_pay_immediately);
......@@ -237,10 +252,14 @@ public class AllOrderFragment extends BaseFragment<CommonPresenter> implements B
}
private void createOrder(String orderNo, int payWay, int type) {
private void createOrder(String orderNo) {
Map<String, Object> headMap = new LinkedHashMap<>();
headMap.put("Authorization", OkGoUtil.getToken());
mPresenter.postBodyData(RvFrameConfig.VEHICLE_ORDER, 1, ApiConfig.HTTP_URL_PAY_THE_CALLBACK, OrderPayBean.class, new payBody(orderNo, payWay, type), headMap, true);
if (payType == 1) {
mPresenter.postBodyData(RvFrameConfig.VEHICLE_ORDER, 1, ApiConfig.HTTP_URL_PAY_THE_CALLBACK, OrderPayBean.class, new payBody(orderNo, payType, 1), headMap, true);
}else {
mPresenter.postBodyData(RvFrameConfig.VEHICLE_ORDER, 2, ApiConfig.HTTP_URL_PAY_THE_CALLBACK, OrderAliPayBean.class, new payBody(orderNo, payType, 1), headMap, true);
}
}
......@@ -301,4 +320,55 @@ public class AllOrderFragment extends BaseFragment<CommonPresenter> implements B
}
/**
* 显示支付宝签名
*/
public void aliPayData(final OrderAliPayBean bean) {
Runnable payRunnable = new Runnable() {
@Override
public void run() {
PayTask alipay = new PayTask(_mActivity);
Map<String, String> result = alipay.payV2(bean.getData(), true);
Log.i("msp", result.toString());
Message msg = new Message();
msg.what = SDK_ALI_PAY_FLAG;
msg.obj = result;
mHandler.sendMessage(msg);
}
};
Thread payThread = new Thread(payRunnable);
payThread.start();
}
/**
* 支付宝返回数据handler
*/
@SuppressLint("HandlerLeak")
private Handler mHandler = new Handler() {
public void handleMessage(Message msg) {
switch (msg.what) {
case SDK_ALI_PAY_FLAG: {
@SuppressWarnings("unchecked")
PayResult payResult = new PayResult((Map<String, String>) msg.obj);
String resultStatus = payResult.getResultStatus();
// 判断resultStatus 为9000则代表支付成功
if (TextUtils.equals(resultStatus, "9000")) {
RxBus.post(new PaymentSuccessfulEvent());
} else if ("6001".equals(resultStatus)) {
showToast("支付取消！");
} else {
// 该笔订单真实的支付结果，需要依赖服务端的异步通知。
showToast(payResult.toString());
}
break;
}
}
}
};
}
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/ForPaymentFragment.java
View file @ 47c4d8da
......@@ -252,6 +252,7 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
* 支付类型选择
*/
private void payShowSelect(final String no, final double orderAmount) {
payType = 1;
PaymentTypeSelection dialog = new PaymentTypeSelection(_mActivity) {
@Override
public void helper(final ViewHolder helper) {
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/OrderDetailActivity.java
View file @ 47c4d8da
......@@ -307,6 +307,7 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
* 支付类型选择
*/
private void payShowSelect(final String no, final double orderAmount) {
payType = 1;
PaymentTypeSelection dialog = new PaymentTypeSelection(mActivity) {
@Override
public void helper(final ViewHolder helper) {
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/TravelOrderDetailsActivity.java
View file @ 47c4d8da
......@@ -281,6 +281,7 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
* 支付类型选择
*/
private void payShowSelect(final String no, final double orderAmount) {
payType = 1;
PaymentTypeSelection dialog = new PaymentTypeSelection(mActivity) {
@Override
public void helper(final ViewHolder helper) {
......
module_home/src/main/res/layout/fragment_home.xml
View file @ 47c4d8da
......@@ -282,7 +282,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/size_50"
android:gravity="center_vertical"
android:orientation="horizontal">
......@@ -307,7 +307,6 @@
android:text="租车指南"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
</LinearLayout>
</LinearLayout>
......@@ -606,7 +605,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableRight="@drawable/common_icon_rig_black"
android:drawableRight="@drawable/common_icon_rig_black_gray"
android:drawablePadding="@dimen/size_5"
android:text="全部"
android:textSize="@dimen/text_10" />
......
module_mine/src/main/java/com/rv/rvmine/MineFragment.java
View file @ 47c4d8da
......@@ -392,7 +392,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
@Override
public void displayImage(Context context, Object path, ImageView imageView) {
GlideManager.getInstance(context).loadImage2(path, imageView);
GlideManager.getInstance(context).loadRoundImage2(path, imageView,8);
}
})
.setOnBannerListener(new OnBannerListener() {
......@@ -554,19 +554,6 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
}
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
// TODO: inflate a fragment view
View rootView = super.onCreateView(inflater, container, savedInstanceState);
unbinder = ButterKnife.bind(this, rootView);
return rootView;
}
@Override
public void onDestroyView() {
super.onDestroyView();
unbinder.unbind();
}
@Override
public void onRefresh() {
......
module_tourism/build.gradle
View file @ 47c4d8da
......@@ -44,6 +44,7 @@ dependencies {
api project(':plugin_search')
api project(':RvWrapper')
api project(':component_control')
api project(':component_resource')
api project(':plugin_coupon')
}
module_tourism/src/main/java/com/rv/tourism/other/PopularTourListActivity.java
View file @ 47c4d8da
......@@ -10,21 +10,21 @@ import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.alibaba.android.arouter.facade.annotation.Autowired;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.base.utils.tools.android.IntentUtil;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.ruiwenliu.wrapper.browse.ActivityImageBrowseUrl;
import com.frame.base.url.Constance;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.browse.ActivityImageBrowseUrl;
import com.ruiwenliu.wrapper.util.glide.GlideManager;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.tourism.R;
import com.rv.tourism.R2;
import com.rv.tourism.TourismFragment;
import com.rv.tourism.adapter.AllPopularAdapter;
import com.rv.tourism.adapter.RecommendedRouteAdapter;
import com.rv.tourism.api.TourismApi;
......@@ -59,6 +59,9 @@ public class PopularTourListActivity extends BaseStatusActivity<TourismPresenter
RecyclerView rvPopularMore;
@BindView(R2.id.ll_layout_popular_more)
LinearLayout llLayoutPopularMore;
@BindView(R2.id.tv_item_title)
TextView tvItemTitle;
private RecommendedRouteAdapter mRecommendedRouteAdapter;
private AllPopularAdapter mAllPopularAdapter;
......@@ -86,11 +89,10 @@ public class PopularTourListActivity extends BaseStatusActivity<TourismPresenter
@Override
protected void initView(Bundle savedInstanceState, final TitleView titleView, Intent intent) {
showTitle(false);
name = intent.getStringExtra("name");
titleView.setTitle(name);
titleView.setDividerDrawable(getResources().getDrawable(R.drawable.common_icon_rig_gray));
id = intent.getStringExtra("id");
tvItemTitle.setText(name);
mRecommendedRouteAdapter = new RecommendedRouteAdapter();
rvRecommendedRoute.setLayoutManager(new LinearLayoutManager(mActivity, LinearLayoutManager.VERTICAL, false));
......@@ -101,24 +103,17 @@ public class PopularTourListActivity extends BaseStatusActivity<TourismPresenter
//全部热门旅游
mAllPopularAdapter = new AllPopularAdapter();
rvPopularMore.setLayoutManager(new GridLayoutManager(mActivity, 3));
rvPopularMore.addItemDecoration(new AbSpacesItemDecoration2(20,10));// 分割线。
rvPopularMore.addItemDecoration(new AbSpacesItemDecoration2(20, 10));// 分割线。
// rvPopularMore.setNestedScrollingEnabled(false);
rvPopularMore.setAdapter(mAllPopularAdapter);
titleView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
llLayoutPopularMore.setVisibility(View.VISIBLE);
}
});
mAllPopularAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
BeanPopularBrigadeAll.DataBeanX.DataBean item = (BeanPopularBrigadeAll.DataBeanX.DataBean) adapter.getItem(position);
id = item.getId();
titleView.setTitle(item.getName());
tvItemTitle.setText(item.getName());
mRecommendedRouteAdapter.getData().clear();
loadBannerData();
loadPopularTourListData();
......@@ -132,11 +127,11 @@ public class PopularTourListActivity extends BaseStatusActivity<TourismPresenter
BeanTourAround.DataBeanX.DataBean item = (BeanTourAround.DataBeanX.DataBean) adapter.getItem(position);
ARouter.getInstance()
.build(Constance.ACTIVITY_URL_TRAVELDETAILS)
.withString("id",item.getId())
.withString("name",item.getName())
.withString("content",item.getContent())
.withString("url",item.getCover())
.withDouble("price",Double.valueOf(item.getPrice()))
.withString("id", item.getId())
.withString("name", item.getName())
.withString("content", item.getContent())
.withString("url", item.getCover())
.withDouble("price", Double.valueOf(item.getPrice()))
.navigation();
}
});
......@@ -151,15 +146,19 @@ public class PopularTourListActivity extends BaseStatusActivity<TourismPresenter
getLoadPopularTourListData(mPage);
}
}
},rvRecommendedRoute);
}, rvRecommendedRoute);
}
@OnClick(R2.id.travel_hot_more_close)
// @OnClick({R.id.iv_item_back, R.id.tv_item_title})
@OnClick({R2.id.travel_hot_more_close,R2.id.iv_item_back,R2.id.tv_item_title})
public void onViewClicked(View view) {
int id = view.getId();
if (id == R.id.travel_hot_more_close) {
llLayoutPopularMore.setVisibility(View.GONE);
}else if (id == R.id.iv_item_back){
finish();
}else if (id ==R.id.tv_item_title){
llLayoutPopularMore.setVisibility(View.VISIBLE);
}
}
......@@ -286,12 +285,6 @@ public class PopularTourListActivity extends BaseStatusActivity<TourismPresenter
travelBanner.updateBannerStyle(BannerConfig.CIRCLE_INDICATOR);
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
// @Override
// public void onLoadMoreRequested() {
......@@ -309,7 +302,7 @@ public class PopularTourListActivity extends BaseStatusActivity<TourismPresenter
private int left;
private int right;
public AbSpacesItemDecoration2(int left,int right) {
public AbSpacesItemDecoration2(int left, int right) {
this.left = left;
this.right = right;
}
......@@ -317,17 +310,17 @@ public class PopularTourListActivity extends BaseStatusActivity<TourismPresenter
@Override
public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
int childCount = parent.getChildCount();
if (childCount % 3==1){
if (childCount % 3 == 1) {
outRect.left = left;
outRect.right = right;
outRect.bottom = right;
outRect.top = right;
}else if (childCount % 3 == 2){
} else if (childCount % 3 == 2) {
outRect.left = right;
outRect.right = right;
outRect.bottom = right;
outRect.top = right;
}else if (childCount % 3 ==0){
} else if (childCount % 3 == 0) {
outRect.left = right;
outRect.right = left;
outRect.bottom = right;
......
module_tourism/src/main/res/layout/activity_popular_tour_list.xml
View file @ 47c4d8da
......@@ -9,6 +9,36 @@
android:background="@color/colorWrite"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_55">
<ImageView
android:id="@+id/iv_item_back"
android:layout_width="@dimen/size_32"
android:layout_height="@dimen/size_32"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/size_5"
android:padding="@dimen/size_8"
android:src="@drawable/rv_common_icon_back_dark" />
<TextView
android:id="@+id/tv_item_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:ellipsize="end"
android:gravity="center"
android:drawableRight="@drawable/camp_open_member"
android:drawablePadding="@dimen/size_5"
android:maxWidth="320dp"
android:maxLines="1"
android:textColor="@color/textMain"
android:textSize="@dimen/text_18" />
</RelativeLayout>
<com.yuyife.banner.Banner
android:id="@+id/travel_banner"
android:layout_width="match_parent"
......@@ -16,11 +46,11 @@
<TextView
android:layout_width="match_parent"
android:gravity="center_horizontal"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_20"
android:layout_marginBottom="@dimen/size_20"
android:layout_height="wrap_content"
android:text="— 推荐路线 —"/>
android:gravity="center_horizontal"
android:text="— 推荐路线 —" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_recommended_route"
......@@ -29,27 +59,27 @@
</LinearLayout>
<LinearLayout
android:visibility="gone"
android:id="@+id/ll_layout_popular_more"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_ba242525"
android:orientation="vertical">
android:orientation="vertical"
android:visibility="gone">
<TextView
android:layout_width="match_parent"
android:layout_height="@dimen/size_60"
android:textColor="@color/colorWrite"
android:gravity="center"
android:textSize="@dimen/text_16"
android:text="— 选择旅游类型 —"/>
android:text="— 选择旅游类型 —"
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_16" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_popular_more"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_marginBottom="@dimen/size_40" />
android:layout_marginBottom="@dimen/size_40"
android:layout_weight="1" />
<ImageView
android:id="@+id/travel_hot_more_close"
......
module_tourism/src/main/res/layout/activity_tourism.xml
View file @ 47c4d8da
......@@ -138,6 +138,7 @@
android:id="@+id/iv_popular_brigade_many"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableRight="@drawable/common_icon_rig_black_gray"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15"
android:drawablePadding="@dimen/size_5"
......
module_tourism/src/main/res/layout/rv_item_all_popular.xml
View file @ 47c4d8da
......@@ -17,7 +17,7 @@
android:layout_alignParentBottom="true"
android:paddingBottom="@dimen/size_5"
android:paddingTop="@dimen/size_5"
android:background="@color/gray_50000000"
android:background="@drawable/shape_rv_bg_translucent_black_half"
android:gravity="center"
android:text="新疆游"
android:textColor="@color/colorWrite"
......
module_tourism/src/main/res/layout/rv_item_popular_brigade.xml
View file @ 47c4d8da
......@@ -17,7 +17,7 @@
android:layout_alignParentBottom="true"
android:paddingBottom="@dimen/size_5"
android:paddingTop="@dimen/size_5"
android:background="@color/gray_50000000"
android:background="@drawable/shape_rv_bg_translucent_black_half"
android:gravity="center"
android:text="新疆游"
android:textColor="@color/colorWrite"
......
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