Merge remote-tracking branch 'origin/master'

RvClient/src/main/AndroidManifest.xml

@@ -114,8 +114,8 @@
         tools:ignore="GoogleAppIndexingWarning">
         <activity
             android:name="com.rv.home.rv.module.ui.WelcomeActivity"
-            android:screenOrientation="portrait"
             android:launchMode="singleTask"
+            android:screenOrientation="portrait"
             android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -135,8 +135,8 @@
             android:name="com.baidu.lbsapi.API_KEY"
             android:value="NrMH6EqS8HZLtcYzqIUXQFsw7rZUK9S8" />
         <!--<meta-data-->
-            <!--android:name="android.max_aspect"-->
-            <!--android:value="2.1" />-->
+        <!--android:name="android.max_aspect"-->
+        <!--android:value="2.1" />-->
         <!-- autoSize布局最大分辨率 -->
         <!-- 如果您项目中的所有页面都只需要以高或宽中的一个作为基准进行适配的话, 那就只需要填写高或宽中的一个设计图尺寸即可 -->
         <meta-data
@@ -264,8 +264,12 @@
         <!-- 旅行模块 -->
         <activity
             android:name="com.rv.travel.TravelActivity"
+            android:configChanges="orientation|keyboardHidden"
             android:launchMode="singleTask"
-            android:screenOrientation="portrait" />
+            android:maxAspectRatio="2.4"
+            android:screenOrientation="portrait"
+            android:theme="@style/MyFrameTheme"
+            android:windowSoftInputMode="adjustResize|stateHidden" />
         <!--=================================================================-->
 
 

RvClient/src/main/java/com/test/rv/ModuleUtil.java

@@ -55,6 +55,11 @@ public class ModuleUtil {
                 }
                 currentModule = module;
             }
+
+            @Override
+            public void onClear() {
+                currentModule = -1;
+            }
         });
     }
 }

RvFrame/build.gradle

@@ -48,6 +48,7 @@ android {
         api 'com.android.support.constraint:constraint-layout:1.1.3'
 
         api project(path: ':MyFrame')
+        api project(path: ':Banner')
         //适配器
         api "com.github.CymChad:BaseRecyclerViewAdapterHelper:$rootProject.ext.quickAdapterVersion"
         //微信支付

RvFrame/src/main/java/com/frame/rv/OnModuleChangedListener.java

@@ -7,4 +7,5 @@ public interface OnModuleChangedListener {
     int MODULE_FIND = 3;
     int MODULE_MINE = 4;
     void onChanged(int module);
+    void onClear();
 }

RvFrame/src/main/res/layout/base_tab_layout.xml

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/_ui_height_h2"
-    android:background="@color/colorTop"
+    android:layout_height="@dimen/_ui_height_h3"
+    android:background="@color/colorBottom_"
     android:gravity="center_vertical"
     android:orientation="horizontal">
 
@@ -14,8 +14,8 @@
 
         <ImageView
             android:id="@+id/iv_home"
-            android:layout_width="23dp"
-            android:layout_height="23dp"
+            android:layout_width="22dp"
+            android:layout_height="22dp"
             android:layout_centerHorizontal="true"
             android:src="@drawable/selector_rv_home" />
 
@@ -28,7 +28,7 @@
             android:paddingTop="3dp"
             android:text="首页"
             android:textColor="@color/uiTextColorH3"
-            android:textSize="@dimen/ui_text_size_h7" />
+            android:textSize="@dimen/ui_text_size_h8" />
     </RelativeLayout>
 
     <RelativeLayout
@@ -39,8 +39,8 @@
 
         <ImageView
             android:id="@+id/iv_travel"
-            android:layout_width="23dp"
-            android:layout_height="23dp"
+            android:layout_width="22dp"
+            android:layout_height="22dp"
             android:layout_centerHorizontal="true"
             android:src="@drawable/selector_rv_travel" />
 
@@ -53,7 +53,7 @@
             android:paddingTop="3dp"
             android:text="旅行"
             android:textColor="@color/uiTextColorH3"
-            android:textSize="@dimen/ui_text_size_h7" />
+            android:textSize="@dimen/ui_text_size_h8" />
     </RelativeLayout>
 
     <RelativeLayout
@@ -64,8 +64,8 @@
 
         <ImageView
             android:id="@+id/iv_camp"
-            android:layout_width="23dp"
-            android:layout_height="23dp"
+            android:layout_width="22dp"
+            android:layout_height="22dp"
             android:layout_centerHorizontal="true"
             android:src="@drawable/selector_rv_camp" />
 
@@ -78,7 +78,7 @@
             android:paddingTop="3dp"
             android:text="营地"
             android:textColor="@color/uiTextColorH3"
-            android:textSize="@dimen/ui_text_size_h7" />
+            android:textSize="@dimen/ui_text_size_h8" />
     </RelativeLayout>
 
     <RelativeLayout
@@ -89,8 +89,8 @@
 
         <ImageView
             android:id="@+id/iv_found"
-            android:layout_width="23dp"
-            android:layout_height="23dp"
+            android:layout_width="22dp"
+            android:layout_height="22dp"
             android:layout_centerHorizontal="true"
             android:src="@drawable/selector_rv_found" />
 
@@ -103,7 +103,7 @@
             android:paddingTop="3dp"
             android:text="发现"
             android:textColor="@color/uiTextColorH3"
-            android:textSize="@dimen/ui_text_size_h7" />
+            android:textSize="@dimen/ui_text_size_h8" />
     </RelativeLayout>
 
     <RelativeLayout
@@ -114,8 +114,8 @@
 
         <ImageView
             android:id="@+id/iv_mine"
-            android:layout_width="23dp"
-            android:layout_height="23dp"
+            android:layout_width="22dp"
+            android:layout_height="22dp"
             android:layout_centerHorizontal="true"
             android:src="@drawable/selector_rv_mine" />
 
@@ -128,7 +128,7 @@
             android:paddingTop="3dp"
             android:text="我的"
             android:textColor="@color/uiTextColorH3"
-            android:textSize="@dimen/ui_text_size_h7" />
+            android:textSize="@dimen/ui_text_size_h8" />
     </RelativeLayout>
 
 

RvFrame/src/main/res/values/colors.xml

@@ -15,8 +15,8 @@
     <color name="colorDark">#EFF1F9</color>             <!--暗色-->
     <color name="colorDark_">#90EFF1F9</color>          <!--暗色_按下-->
 
-    <color name="colorBg">#F5F5F5</color>
-    <color name="colorBg_">#F2F2F2</color>      <!--底部导航栏-->
+    <color name="colorBottom">#F5F5F5</color>
+    <color name="colorBottom_">#F2F2F2</color>      <!--底部导航栏-->
 
     <color name="colorTop">#FFFFFF</color>              <!--顶层,最上层-->
 

RvTravel/src/main/java/com/rv/travel/AdapterHot.java

+package com.rv.travel;
+
+import android.support.annotation.Nullable;
+import android.view.View;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+
+import java.util.List;
+
+public class AdapterHot extends BaseQuickAdapter<BeanHot,AdapterHot.AdapterViewHolder> {
+
+    public AdapterHot(int layoutResId, @Nullable List<BeanHot> data) {
+        super(layoutResId, data);
+    }
+
+    @Override
+    protected void convert(AdapterViewHolder helper, BeanHot item) {
+
+    }
+
+    public class AdapterViewHolder extends BaseViewHolder{
+
+        public AdapterViewHolder(View view) {
+            super(view);
+        }
+    }
+}

RvTravel/src/main/java/com/rv/travel/AdapterRim.java

+package com.rv.travel;
+
+import android.support.annotation.Nullable;
+import android.view.View;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+
+import java.util.List;
+
+public class AdapterRim extends BaseQuickAdapter<BeanRim,AdapterRim.AdapterViewHolder> {
+
+    public AdapterRim(int layoutResId, @Nullable List<BeanRim> data) {
+        super(layoutResId, data);
+    }
+
+    @Override
+    protected void convert(AdapterViewHolder helper, BeanRim item) {
+
+    }
+
+    public class AdapterViewHolder extends BaseViewHolder{
+
+        public AdapterViewHolder(View view) {
+            super(view);
+        }
+    }
+}

RvTravel/src/main/java/com/rv/travel/BeanHot.java

+package com.rv.travel;
+
+public class BeanHot {
+}

RvTravel/src/main/java/com/rv/travel/BeanRim.java

+package com.rv.travel;
+
+public class BeanRim {
+}

RvTravel/src/main/java/com/rv/travel/TravelActivity.java

@@ -2,6 +2,7 @@ package com.rv.travel;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -35,19 +36,24 @@ public class TravelActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_travel);
         ButterKnife.bind(this);
+        ModuleChangeUtil.currentActivity = this;
+
         onData();
         onView();
     }
 
     @Override
     public void onData() {
-        ModuleChangeUtil.currentActivity = this;
         tabLayout.setCurrent(OnModuleChangedListener.MODULE_TRAVEL);
     }
 
     @Override
     public void onView() {
 
+        if (travelFragmentMain==null){
+            travelFragmentMain = new TravelFragmentMain();
+        }
+        setFragment(travelFragmentMain);
     }
 
     @Override
@@ -56,4 +62,18 @@ public class TravelActivity extends BaseActivity {
         ModuleChangeUtil.currentActivity = this;
 
     }
+
+    private TravelFragmentMain travelFragmentMain;
+    private void setFragment(Fragment fragment){
+
+        getSupportFragmentManager().beginTransaction().replace(R.id.travel_fragment_layout,fragment).commitAllowingStateLoss();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (ModuleChangeUtil.getOnModuleChangedListener() != null) {
+            ModuleChangeUtil.getOnModuleChangedListener().onClear();
+        }
+    }
 }

RvTravel/src/main/java/com/rv/travel/TravelFragmentMain.java

+package com.rv.travel;
+
+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.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 TravelFragmentMain extends BaseFragment {
+    @BindView(R2.id.travel_banner)
+    Banner banner;
+    @BindView(R2.id.travel_hot_recycler)
+    RecyclerView hotRecycler;
+    @BindView(R2.id.travel_rim_recycler)
+    RecyclerView rimRecycler;
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_travel_mian, 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();
+
+        setRim();
+    }
+
+    @Override
+    public void onView() {
+
+
+        setBanner();
+    }
+
+    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);
+
+        LinearLayoutManager linearLayoutManager = new LinearLayoutManager(baseContext);
+        linearLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
+        hotRecycler.setLayoutManager(linearLayoutManager);
+
+        hotRecycler.setAdapter(adapterHot);
+    }
+
+    private AdapterRim adapterRim;
+
+    private void setRim() {
+
+
+        List<BeanRim> data = new ArrayList<>();
+        data.add(new BeanRim());
+        data.add(new BeanRim());
+        data.add(new BeanRim());
+        adapterRim = new AdapterRim(R.layout.item_travel_rim, data);
+
+        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_test1);
+        localImages.add(R.mipmap.banner_test2);
+
+        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);
+    }
+}

RvTravel/src/main/res/layout/activity_travel.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorBg"
+    android:background="@color/colorBottom"
     android:gravity="center"
     android:orientation="vertical"
     tools:context=".TravelActivity">
@@ -95,12 +95,11 @@
             android:src="@drawable/rv_rentingcar_icon_service_dark" />
     </LinearLayout>
 
-    <LinearLayout
+    <FrameLayout
         android:id="@+id/travel_fragment_layout"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1"
-        android:orientation="vertical" />
+        android:layout_weight="1" />
 
     <com.frame.rv.BaseTabLayout
         android:id="@+id/travel_tab_layout"

RvTravel/src/main/res/layout/fragment_travel_mian.xml

+<?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="match_parent"
+    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: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:paddingLeft="5dp"
+            android:scaleType="center"
+            android:src="@mipmap/rv_common_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">
+
+        <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.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" />
+
+</LinearLayout>
\ No newline at end of file

RvTravel/src/main/res/layout/item_travel_hot.xml

+<?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="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <android.support.v7.widget.CardView
+        android:layout_width="150dp"
+        android:layout_height="100dp"
+        android:layout_marginRight="@dimen/ui_dimen_common"
+        android:foreground="?android:attr/selectableItemBackground"
+        app:cardBackgroundColor="@color/colorTop"
+        app:cardCornerRadius="@dimen/ui_dimen_common"
+        app:cardElevation="0dp">
+
+    </android.support.v7.widget.CardView>
+</LinearLayout>
\ No newline at end of file

RvTravel/src/main/res/layout/item_travel_rim.xml

+<?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:layout_width="match_parent"
+        android:layout_height="100dp"
+        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">
+
+    </android.support.v7.widget.CardView>
+</LinearLayout>
\ No newline at end of file