Skip to content

R
RvApp
Commit 50ba1e42 authored by lify's avatar lify
Browse files
Options

旅行界面开发.热门游列表，

parent 3c74533f
Show whitespace changes
Inline Side-by-side
Showing with 913 additions and 163 deletions
RvFrame/src/main/res/drawable/selector_common_back.xml
View file @ 50ba1e42
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" <selector xmlns:android="http://schemas.android.com/apk/res/android" android:enterFadeDuration="@integer/selector_duration" android:exitFadeDuration="@integer/selector_duration">
android:enterFadeDuration="@integer/selector_duration" <item android:drawable="@drawable/rv_common_icon_back_white" android:state_checked="true" />
android:exitFadeDuration="@integer/selector_duration" <item android:drawable="@drawable/rv_common_icon_back_dark" android:state_checked="false" />
>
<item android:drawable="@drawable/rv_common_icon_back_white" android:state_checked="false" />
<item android:drawable="@drawable/rv_common_icon_back_dark" android:state_checked="true" />
</selector> </selector>
RvFrame/src/main/res/values/colors.xml
View file @ 50ba1e42
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<color name="colorPrimaryDark">#171413</color> <color name="colorPrimaryDark">#171413</color>
<color name="colorAccent">#171413</color> <!--核心--> <color name="colorAccent">#171413</color> <!--核心-->
<color name="colorH1">#F3DD23</color> <!--彩色2--> <color name="colorH1">#F3DD23</color> <!--彩色2-->
<color name="colorH1_">#90F3DD23</color> <!--彩色2_按下--> <color name="colorH1_">#90F3DD23</color> <!--彩色2_按下-->
......
RvTravel/src/main/java/com/rv/travel/AdapterHot.java
View file @ 50ba1e42
package com.rv.travel; package com.rv.travel;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.v7.widget.CardView;
import android.view.View; import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
...@@ -8,21 +9,43 @@ import com.chad.library.adapter.base.BaseViewHolder; ...@@ -8,21 +9,43 @@ import com.chad.library.adapter.base.BaseViewHolder;
import java.util.List; import java.util.List;
public class AdapterHot extends BaseQuickAdapter<BeanHot,AdapterHot.AdapterViewHolder> { public class AdapterHot extends BaseQuickAdapter<BeanHot, AdapterHot.AdapterViewHolder> {
public interface OnItemClickListener {
void onItemClick(BeanHot bean);
}
private OnItemClickListener itemClickListener;
public void setItemClickListener(OnItemClickListener itemClickListener) {
this.itemClickListener = itemClickListener;
}
public AdapterHot(int layoutResId, @Nullable List<BeanHot> data) { public AdapterHot(int layoutResId, @Nullable List<BeanHot> data) {
super(layoutResId, data); super(layoutResId, data);
} }
@Override @Override
protected void convert(AdapterViewHolder helper, BeanHot item) { protected void convert(AdapterViewHolder helper, final BeanHot item) {
helper.item.setTag(item);
helper.item.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (itemClickListener != null) {
BeanHot beanHot = (BeanHot) v.getTag();
itemClickListener.onItemClick(beanHot);
}
} }
});
}
public class AdapterViewHolder extends BaseViewHolder {
public class AdapterViewHolder extends BaseViewHolder{ CardView item;
public AdapterViewHolder(View view) { public AdapterViewHolder(View view) {
super(view); super(view);
item = view.findViewById(R.id.item_hot_card_view);
} }
} }
} }
RvTravel/src/main/java/com/rv/travel/TravelActivity.java
View file @ 50ba1e42
package com.rv.travel; package com.rv.travel;
import android.annotation.SuppressLint;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.view.View;
import android.widget.EditText; import android.widget.EditText;
import android.widget.FrameLayout;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
...@@ -15,8 +18,15 @@ import com.frame.rv.OnModuleChangedListener; ...@@ -15,8 +18,15 @@ import com.frame.rv.OnModuleChangedListener;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick;
public class TravelActivity extends BaseActivity { public class TravelActivity extends BaseActivity {
@SuppressLint("StaticFieldLeak")
private static TravelActivity instance;
public static TravelActivity getInstance() {
return instance;
}
@BindView(R2.id.travel_tab_layout) @BindView(R2.id.travel_tab_layout)
BaseTabLayout tabLayout; BaseTabLayout tabLayout;
...@@ -30,14 +40,36 @@ public class TravelActivity extends BaseActivity { ...@@ -30,14 +40,36 @@ public class TravelActivity extends BaseActivity {
TextView searchCommit; TextView searchCommit;
@BindView(R2.id.travel_server_image) @BindView(R2.id.travel_server_image)
ImageView serverImage; ImageView serverImage;
@BindView(R2.id.travel_hot_more_layout)
LinearLayout hotMoreTitleLayout;
@BindView(R2.id.travel_hot_type_layout)
FrameLayout hotTypeTitleLayout;
@OnClick({
R2.id.travel_hot_type_back,
R2.id.travel_hot_type_select,
})
public void onTravelActivityClick(View view) {
int id = view.getId();
if (id == R.id.travel_hot_type_back) {
setTravelFragmentMain();
} else if (id == R.id.travel_hot_type_select) {
travelFragmentHotType.setHotMoreFragment();
}
}
@SuppressLint("StaticFieldLeak")
public static LinearLayout hotMoreTitleLayoutStatic;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_travel); setContentView(R.layout.activity_travel);
ButterKnife.bind(this); ButterKnife.bind(this);
instance = this;
ModuleChangeUtil.currentActivity = this; ModuleChangeUtil.currentActivity = this;
hotMoreTitleLayoutStatic = hotMoreTitleLayout;
onData(); onData();
onView(); onView();
} }
...@@ -49,11 +81,7 @@ public class TravelActivity extends BaseActivity { ...@@ -49,11 +81,7 @@ public class TravelActivity extends BaseActivity {
@Override @Override
public void onView() { public void onView() {
setTravelFragmentMain();
if (travelFragmentMain==null){
travelFragmentMain = new TravelFragmentMain();
}
setFragment(travelFragmentMain);
} }
@Override @Override
...@@ -64,14 +92,37 @@ public class TravelActivity extends BaseActivity { ...@@ -64,14 +92,37 @@ public class TravelActivity extends BaseActivity {
} }
private TravelFragmentMain travelFragmentMain; private TravelFragmentMain travelFragmentMain;
private void setFragment(Fragment fragment){
getSupportFragmentManager().beginTransaction().replace(R.id.travel_fragment_layout,fragment).commitAllowingStateLoss(); //主页面，点击 热门游 更多 弹出列表
public void setTravelFragmentMain() {
hotMoreTitleLayout.setVisibility(View.GONE);
hotTypeTitleLayout.setVisibility(View.GONE);
if (travelFragmentMain == null) {
travelFragmentMain = new TravelFragmentMain();
}
setFragment(travelFragmentMain);
}
private TravelFragmentHotType travelFragmentHotType;
//点击 热门游 弹出列表 点击列表条目，设置
public void setTravelFragmentHotType() {
hotMoreTitleLayout.setVisibility(View.GONE);
hotTypeTitleLayout.setVisibility(View.VISIBLE);
travelFragmentHotType = new TravelFragmentHotType();
setFragment(travelFragmentHotType);
}
private void setFragment(Fragment fragment) {
getSupportFragmentManager().beginTransaction().replace(R.id.travel_fragment_layout, fragment).commitAllowingStateLoss();
} }
@Override @Override
protected void onDestroy() { protected void onDestroy() {
super.onDestroy(); super.onDestroy();
instance = null;
hotMoreTitleLayoutStatic = null;
if (ModuleChangeUtil.getOnModuleChangedListener() != null) { if (ModuleChangeUtil.getOnModuleChangedListener() != null) {
ModuleChangeUtil.getOnModuleChangedListener().onClear(); ModuleChangeUtil.getOnModuleChangedListener().onClear();
} }
......
RvTravel/src/main/java/com/rv/travel/TravelFragmentHotMore.java 0 → 100644
View file @ 50ba1e42
package com.rv.travel;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.base.animset.util.NiftyEffects;
import com.base.utils.base.BaseFragment;
import java.util.ArrayList;
import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import butterknife.Unbinder;
public class TravelFragmentHotMore extends BaseFragment {
private String clientClazzName = null;
public static TravelFragmentHotMore getInstance(String clientClazzName) {
TravelFragmentHotMore instance = new TravelFragmentHotMore();
instance.clientClazzName = clientClazzName;
return instance;
}
@BindView(R2.id.travel_hot_more_recycler)
RecyclerView hotRecycler;
@OnClick({R2.id.travel_hot_more_close
})
public void onTravelFragmentHotMoreClick(View view) {
int id = view.getId();
if (id == R.id.travel_hot_more_close) {
NiftyEffects.jelly.getAnimator().in(view);
//关闭
if (clientClazzName==null){
}else if(clientClazzName.equals(TravelFragmentMain.class.getSimpleName())) {
TravelFragmentMain.hideHotMoreFragment();
}else if(clientClazzName.equals(TravelFragmentHotType.class.getSimpleName())) {
TravelFragmentHotType.hideHotMoreFragment();
}
}
}
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_travel_hot_more, container, false);
unbinder = ButterKnife.bind(this, view);
return view;
}
Unbinder unbinder;
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
onData();
onView();
}
@Override
public void onData() {
setHot();
}
@Override
public void onView() {
}
private AdapterHot adapterHot;
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.setItemClickListener(new AdapterHot.OnItemClickListener() {
@Override
public void onItemClick(BeanHot bean) {
TravelActivity.getInstance().setTravelFragmentHotType();
}
});
GridLayoutManager gridLayoutManager = new GridLayoutManager(baseContext, 3);
hotRecycler.setLayoutManager(gridLayoutManager);
hotRecycler.setAdapter(adapterHot);
}
}
RvTravel/src/main/java/com/rv/travel/TravelFragmentHotType.java 0 → 100644
View file @ 50ba1e42
package com.rv.travel;
import android.annotation.SuppressLint;
import android.content.Context;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.ImageView;
import com.base.utils.base.BaseFragment;
import com.frame.base.glide.GlideManager;
import com.yuyife.banner.Banner;
import com.yuyife.banner.BannerConfig;
import com.yuyife.banner.listener.OnBannerListener;
import com.yuyife.banner.loader.ImageLoader;
import java.util.ArrayList;
import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
public class TravelFragmentHotType extends BaseFragment {
@BindView(R2.id.travel_banner)
Banner banner;
@BindView(R2.id.travel_rim_recycler)
RecyclerView rimRecycler;
@BindView(R2.id.travel_fragment_hot_more_layout)
FrameLayout hotMoreLayout;
@SuppressLint("StaticFieldLeak")
public static FrameLayout hotMoreLayoutStatic;
// @OnClick({R2.id.travel_hot_more_image
// })
// public void onTravelFragmentHotTypeClick(View view) {
// int id = view.getId();
// if (id == R.id.travel_hot_more_image) {
// NiftyEffects.jelly.getAnimator().in(view);
//
// }
// }
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_travel_hot_type, container, false);
unbinder = ButterKnife.bind(this, view);
return view;
}
Unbinder unbinder;
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
hotMoreLayoutStatic = hotMoreLayout;
onData();
onView();
}
@Override
public void onData() {
setRim();
}
@Override
public void onView() {
setBanner();
}
@Override
public void onDestroyView() {
super.onDestroyView();
hotMoreLayoutStatic = null;
}
private AdapterRim adapterRim;
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);
final LinearLayoutManager linearLayoutManager = new LinearLayoutManager(baseContext);
linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
rimRecycler.setLayoutManager(linearLayoutManager);
rimRecycler.setAdapter(adapterRim);
}
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.mipmap.banner_test3);
localImages.add(R.mipmap.banner_test4);
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) {
}
})
.start();
banner.updateBannerStyle(BannerConfig.CIRCLE_INDICATOR);
}
private TravelFragmentHotMore travelFragmentHotMore;
public void setHotMoreFragment() {
TravelActivity.hotMoreTitleLayoutStatic.setVisibility(View.VISIBLE);
hotMoreLayoutStatic.setVisibility(View.VISIBLE);
if (travelFragmentHotMore == null) {
travelFragmentHotMore = TravelFragmentHotMore.getInstance(TravelFragmentHotType.class.getSimpleName());
}
getChildFragmentManager().beginTransaction().replace(R.id.travel_fragment_hot_more_layout, travelFragmentHotMore).commitAllowingStateLoss();
}
public static void hideHotMoreFragment() {
TravelActivity.hotMoreTitleLayoutStatic.setVisibility(View.GONE);
hotMoreLayoutStatic.setVisibility(View.GONE);
}
}
RvTravel/src/main/java/com/rv/travel/TravelFragmentMain.java
View file @ 50ba1e42
package com.rv.travel; package com.rv.travel;
import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
...@@ -9,8 +10,10 @@ import android.support.v7.widget.RecyclerView; ...@@ -9,8 +10,10 @@ import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.ImageView; import android.widget.ImageView;
import com.base.animset.util.NiftyEffects;
import com.base.utils.base.BaseFragment; import com.base.utils.base.BaseFragment;
import com.frame.base.glide.GlideManager; import com.frame.base.glide.GlideManager;
import com.yuyife.banner.Banner; import com.yuyife.banner.Banner;
...@@ -23,6 +26,7 @@ import java.util.List; ...@@ -23,6 +26,7 @@ import java.util.List;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick;
import butterknife.Unbinder; import butterknife.Unbinder;
public class TravelFragmentMain extends BaseFragment { public class TravelFragmentMain extends BaseFragment {
...@@ -32,6 +36,21 @@ public class TravelFragmentMain extends BaseFragment { ...@@ -32,6 +36,21 @@ public class TravelFragmentMain extends BaseFragment {
RecyclerView hotRecycler; RecyclerView hotRecycler;
@BindView(R2.id.travel_rim_recycler) @BindView(R2.id.travel_rim_recycler)
RecyclerView rimRecycler; RecyclerView rimRecycler;
@BindView(R2.id.travel_fragment_hot_more_layout)
FrameLayout hotMoreLayout;
@SuppressLint("StaticFieldLeak")
public static FrameLayout hotMoreLayoutStatic;
@OnClick({R2.id.travel_hot_more_image
})
public void onTravelFragmentMainClick(View view) {
int id = view.getId();
if (id == R.id.travel_hot_more_image) {
NiftyEffects.jelly.getAnimator().in(view);
setHotMoreFragment();
}
}
@Nullable @Nullable
@Override @Override
...@@ -46,6 +65,8 @@ public class TravelFragmentMain extends BaseFragment { ...@@ -46,6 +65,8 @@ public class TravelFragmentMain extends BaseFragment {
@Override @Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState); super.onViewCreated(view, savedInstanceState);
hotMoreLayoutStatic = hotMoreLayout;
hideHotMoreFragment();
onData(); onData();
onView(); onView();
} }
...@@ -62,7 +83,6 @@ public class TravelFragmentMain extends BaseFragment { ...@@ -62,7 +83,6 @@ public class TravelFragmentMain extends BaseFragment {
@Override @Override
public void onView() { public void onView() {
setBanner(); setBanner();
} }
...@@ -74,7 +94,12 @@ public class TravelFragmentMain extends BaseFragment { ...@@ -74,7 +94,12 @@ public class TravelFragmentMain extends BaseFragment {
data.add(new BeanHot()); data.add(new BeanHot());
data.add(new BeanHot()); data.add(new BeanHot());
adapterHot = new AdapterHot(R.layout.item_travel_hot, data); adapterHot = new AdapterHot(R.layout.item_travel_hot, data);
adapterHot.setItemClickListener(new AdapterHot.OnItemClickListener() {
@Override
public void onItemClick(BeanHot bean) {
TravelActivity.getInstance().setTravelFragmentHotType();
}
});
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(baseContext); LinearLayoutManager linearLayoutManager = new LinearLayoutManager(baseContext);
linearLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); linearLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
hotRecycler.setLayoutManager(linearLayoutManager); hotRecycler.setLayoutManager(linearLayoutManager);
...@@ -91,13 +116,20 @@ public class TravelFragmentMain extends BaseFragment { ...@@ -91,13 +116,20 @@ public class TravelFragmentMain extends BaseFragment {
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());
data.add(new BeanRim());
data.add(new BeanRim());
data.add(new BeanRim());
adapterRim = new AdapterRim(R.layout.item_travel_rim, data); adapterRim = new AdapterRim(R.layout.item_travel_rim, data);
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(baseContext); final LinearLayoutManager linearLayoutManager = new LinearLayoutManager(baseContext);
linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL); linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
rimRecycler.setLayoutManager(linearLayoutManager); rimRecycler.setLayoutManager(linearLayoutManager);
rimRecycler.setAdapter(adapterRim); rimRecycler.setAdapter(adapterRim);
} }
...@@ -137,4 +169,30 @@ public class TravelFragmentMain extends BaseFragment { ...@@ -137,4 +169,30 @@ public class TravelFragmentMain extends BaseFragment {
banner.updateBannerStyle(BannerConfig.CIRCLE_INDICATOR); banner.updateBannerStyle(BannerConfig.CIRCLE_INDICATOR);
} }
private TravelFragmentHotMore travelFragmentHotMore;
private void setHotMoreFragment() {
TravelActivity.hotMoreTitleLayoutStatic.setVisibility(View.VISIBLE);
hotMoreLayoutStatic.setVisibility(View.VISIBLE);
if (travelFragmentHotMore == null) {
travelFragmentHotMore = TravelFragmentHotMore.getInstance(TravelFragmentMain.class.getSimpleName());
}
getChildFragmentManager().beginTransaction().replace(R.id.travel_fragment_hot_more_layout, travelFragmentHotMore).commitAllowingStateLoss();
}
@Override
public void onDestroyView() {
super.onDestroyView();
hotMoreLayoutStatic = null;
}
public static void hideHotMoreFragment() {
TravelActivity.hotMoreTitleLayoutStatic.setVisibility(View.GONE);
hotMoreLayoutStatic.setVisibility(View.GONE);
}
} }
RvTravel/src/main/res/layout/activity_travel.xml
View file @ 50ba1e42
...@@ -8,6 +8,10 @@ ...@@ -8,6 +8,10 @@
android:orientation="vertical" android:orientation="vertical"
tools:context=".TravelActivity"> tools:context=".TravelActivity">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="@dimen/_ui_height_h5">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/_ui_height_h5" android:layout_height="@dimen/_ui_height_h5"
...@@ -36,7 +40,7 @@ ...@@ -36,7 +40,7 @@
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@mipmap/common_icon_dow_triangle" /> android:src="@drawable/rv_common_icon_up_arrow" />
</LinearLayout> </LinearLayout>
...@@ -55,7 +59,7 @@ ...@@ -55,7 +59,7 @@
android:layout_height="15dp" android:layout_height="15dp"
android:layout_marginLeft="@dimen/ui_dimen_margin_h1" android:layout_marginLeft="@dimen/ui_dimen_margin_h1"
android:layout_marginRight="@dimen/ui_dimen_common_small" android:layout_marginRight="@dimen/ui_dimen_common_small"
android:src="@mipmap/common_icon_search" /> android:src="@mipmap/rv_common_icon_search" />
<EditText <EditText
android:id="@+id/search_input" android:id="@+id/search_input"
...@@ -95,6 +99,70 @@ ...@@ -95,6 +99,70 @@
android:src="@drawable/rv_rentingcar_icon_service_dark" /> android:src="@drawable/rv_rentingcar_icon_service_dark" />
</LinearLayout> </LinearLayout>
<FrameLayout
android:id="@+id/travel_hot_type_layout"
android:layout_width="match_parent"
android:layout_height="@dimen/_ui_height_h5"
android:background="@color/colorTop"
android:visibility="gone">
<ImageView
android:id="@+id/travel_hot_type_back"
android:layout_width="40dp"
android:layout_height="match_parent"
android:clickable="true"
android:scaleType="centerInside"
android:src="@drawable/selector_common_back" />
<LinearLayout
android:id="@+id/travel_hot_type_select"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center"
android:clickable="true"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/ui_dimen_common"
android:text="新疆游"
android:textColor="@color/colorTextH1"
android:textSize="@dimen/_ui_text_size_h4"
android:textStyle="bold" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/rv_common_icon_up_arrow" />
</LinearLayout>
</FrameLayout>
<LinearLayout
android:id="@+id/travel_hot_more_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorHotMore"
android:gravity="center"
android:orientation="horizontal"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="选择旅游类型"
android:textColor="@color/colorTop"
android:textSize="@dimen/_ui_text_size_h3" />
</LinearLayout>
</FrameLayout>
<FrameLayout <FrameLayout
android:id="@+id/travel_fragment_layout" android:id="@+id/travel_fragment_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
......
RvTravel/src/main/res/layout/fragment_travel_hot_more.xml 0 → 100644
View file @ 50ba1e42
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorHotMore">
<android.support.v7.widget.RecyclerView
android:id="@+id/travel_hot_more_recycler"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/ui_dimen_margin_h9"
android:layout_marginLeft="@dimen/ui_dimen_margin_h1"
android:layout_marginRight="@dimen/ui_dimen_common" />
<ImageView
android:id="@+id/travel_hot_more_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/ui_dimen_margin_h2"
android:padding="@dimen/ui_dimen_padding_h1"
android:scaleType="centerInside"
android:src="@mipmap/rv_common_icon_close" />
</RelativeLayout>
\ No newline at end of file
RvTravel/src/main/res/layout/fragment_travel_hot_type.xml 0 → 100644
View file @ 50ba1e42
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
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"
android:scrollbars="none">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<android.support.v7.widget.CardView
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:layout_width="match_parent"
android:layout_height="200dp" />
</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"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/ui_dimen_margin_h1"
android:layout_weight="1"
android:gravity="center"
android:text="-推荐路线-"
android:textColor="@color/uiTextColorH1"
android:textSize="@dimen/_ui_text_size_h4" />
</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" />
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
<FrameLayout
android:id="@+id/travel_fragment_hot_more_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone" />
</FrameLayout>
RvTravel/src/main/res/layout/fragment_travel_mian.xml
View file @ 50ba1e42
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v4.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scrollbars="none">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<android.support.v7.widget.CardView <android.support.v7.widget.CardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -18,8 +29,11 @@ ...@@ -18,8 +29,11 @@
android:id="@+id/travel_banner" android:id="@+id/travel_banner"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="200dp" /> android:layout_height="200dp" />
</android.support.v7.widget.CardView> </android.support.v7.widget.CardView>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/_ui_height_h6" android:layout_height="@dimen/_ui_height_h6"
...@@ -40,9 +54,10 @@ ...@@ -40,9 +54,10 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginRight="@dimen/ui_dimen_margin_h1" android:layout_marginRight="@dimen/ui_dimen_margin_h1"
android:clickable="true"
android:paddingLeft="5dp" android:paddingLeft="5dp"
android:scaleType="center" android:scaleType="center"
android:src="@mipmap/rv_common_right_arrow" /> android:src="@mipmap/rv_common_icon_right_arrow" />
</LinearLayout> </LinearLayout>
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
...@@ -81,6 +96,18 @@ ...@@ -81,6 +96,18 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/ui_dimen_margin_h1" android:layout_marginLeft="@dimen/ui_dimen_margin_h1"
android:layout_marginRight="@dimen/ui_dimen_margin_h1" /> android:layout_marginRight="@dimen/ui_dimen_margin_h1"
android:layout_marginTop="@dimen/ui_dimen_common" />
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</LinearLayout> <FrameLayout
\ No newline at end of file android:id="@+id/travel_fragment_hot_more_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone" />
</FrameLayout>
\ No newline at end of file
RvTravel/src/main/res/layout/item_include_hot.xml 0 → 100644
View file @ 50ba1e42
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@mipmap/banner_test4" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="@color/colorHotMore"
android:gravity="center"
android:paddingBottom="@dimen/ui_dimen_common"
android:paddingTop="@dimen/ui_dimen_common"
android:text="新疆游"
android:textColor="@color/colorTop"
android:textSize="@dimen/_ui_text_size_h6" />
</RelativeLayout>
\ No newline at end of file
RvTravel/src/main/res/layout/item_travel_hot.xml
View file @ 50ba1e42
...@@ -6,13 +6,18 @@ ...@@ -6,13 +6,18 @@
android:orientation="vertical"> android:orientation="vertical">
<android.support.v7.widget.CardView <android.support.v7.widget.CardView
android:id="@+id/item_hot_card_view"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="100dp" android:layout_height="100dp"
android:layout_marginBottom="@dimen/ui_dimen_common"
android:layout_marginRight="@dimen/ui_dimen_common" android:layout_marginRight="@dimen/ui_dimen_common"
android:layout_marginTop="@dimen/ui_dimen_common"
android:clickable="true"
android:foreground="?android:attr/selectableItemBackground" android:foreground="?android:attr/selectableItemBackground"
app:cardBackgroundColor="@color/colorTop" app:cardBackgroundColor="@color/colorTop"
app:cardCornerRadius="@dimen/ui_dimen_common" app:cardCornerRadius="@dimen/ui_dimen_common"
app:cardElevation="0dp"> app:cardElevation="0dp">
<include layout="@layout/item_include_hot" />
</android.support.v7.widget.CardView> </android.support.v7.widget.CardView>
</LinearLayout> </LinearLayout>
\ No newline at end of file
RvTravel/src/main/res/layout/item_travel_hot_more.xml 0 → 100644
View file @ 50ba1e42
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<android.support.v7.widget.CardView
android:id="@+id/item_hot_card_view"
android:layout_width="match_parent"
android:layout_height="100dp"
android:layout_marginBottom="@dimen/ui_dimen_common"
android:layout_marginRight="@dimen/ui_dimen_common"
android:layout_marginTop="@dimen/ui_dimen_common"
android:clickable="true"
android:foreground="?android:attr/selectableItemBackground"
app:cardBackgroundColor="@color/colorTop"
app:cardCornerRadius="@dimen/ui_dimen_common"
app:cardElevation="0dp">
<include layout="@layout/item_include_hot" />
</android.support.v7.widget.CardView>
</LinearLayout>
\ No newline at end of file
RvTravel/src/main/res/layout/item_travel_rim.xml
View file @ 50ba1e42
...@@ -7,12 +7,105 @@ ...@@ -7,12 +7,105 @@
<android.support.v7.widget.CardView <android.support.v7.widget.CardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="100dp" android:layout_height="110dp"
android:layout_marginBottom="@dimen/ui_dimen_margin_h1" android:layout_marginBottom="@dimen/ui_dimen_margin_h1"
android:foreground="?android:attr/selectableItemBackground" android:foreground="?android:attr/selectableItemBackground"
app:cardBackgroundColor="@color/colorTop" app:cardBackgroundColor="@color/colorTop"
app:cardCornerRadius="@dimen/ui_dimen_common" app:cardCornerRadius="@dimen/ui_dimen_common"
app:cardElevation="0dp"> app:cardElevation="0dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
<android.support.v7.widget.CardView
android:layout_width="100dp"
android:layout_height="match_parent"
android:layout_margin="@dimen/ui_dimen_common"
android:layout_marginBottom="@dimen/ui_dimen_margin_h1"
android:foreground="?android:attr/selectableItemBackground"
app:cardBackgroundColor="@color/colorTop"
app:cardCornerRadius="@dimen/ui_dimen_common"
app:cardElevation="0dp">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@mipmap/banner_test2" />
</android.support.v7.widget.CardView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/ui_dimen_common"
android:gravity="center|start"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:lines="2"
android:text="草原大漠6天5晚，穿越沙漠+宗教人文+房车露营"
android:textColor="@color/colorTextH1"
android:textSize="@dimen/_ui_text_size_h6" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/ui_dimen_margin_h1"
android:background="@drawable/ui_selector_radius_common_dark"
android:paddingBottom="@dimen/ui_dimen_common_small"
android:paddingLeft="@dimen/ui_dimen_common"
android:paddingRight="@dimen/ui_dimen_common"
android:paddingTop="@dimen/ui_dimen_common_small"
android:text="东莞出发"
android:textColor="@color/uiTextColorH2"
android:textSize="@dimen/_ui_text_size_h8" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/ui_dimen_common"
android:orientation="horizontal">
<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:textColor="@color/colorTextH1"
android:textSize="@dimen/_ui_text_size_h8" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:lines="1"
android:text="¥"
android:textColor="@color/uiColorLittle"
android:textSize="@dimen/_ui_text_size_h3" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:lines="1"
android:text="5000"
android:textColor="@color/uiColorLittle"
android:textSize="@dimen/_ui_text_size_h3" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:lines="1"
android:text="/人"
android:textColor="@color/uiColorLittle"
android:textSize="@dimen/_ui_text_size_h3" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView> </android.support.v7.widget.CardView>
</LinearLayout> </LinearLayout>
\ No newline at end of file
RvTravel/src/main/res/values/colors.xml
View file @ 50ba1e42
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="colorPrimary">#008577</color> <color name="colorHotMore">#ba242525</color>
<color name="colorPrimaryDark">#00574B</color>
<color name="colorAccent">#D81B60</color>
</resources> </resources>
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