1.旅游去掉默认登录

2.加载数据有进度条提示
3.替换加载图和加载错误图

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

+package com.frame.rv;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import java.util.List;
+
+public class BaseTipsLayout extends RelativeLayout {
+    public void setData(List data){
+        if (data!=null&&data.size()>0){
+            this.setVisibility(View.GONE);
+        }else {
+            this.setVisibility(View.VISIBLE);
+            this.progressBar.setVisibility(GONE);
+            this.tipsImageView.setVisibility(VISIBLE);
+            this.buttonView.setVisibility(GONE);
+        }
+    }
+    public BaseTipsLayout(Context context) {
+        super(context);
+        init(context);
+    }
+
+    public BaseTipsLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(context);
+
+    }
+
+    public BaseTipsLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context);
+    }
+
+    private ImageView tipsImageView;
+    private TextView buttonView;
+    private ProgressBar progressBar;
+
+    private void init(Context context) {
+
+        View view = LayoutInflater.from(context).inflate(R.layout.layout_tips, this, true);
+        tipsImageView = view.findViewById(R.id.tips_image_view);
+        buttonView = view.findViewById(R.id.tips_button_view);
+        progressBar = view.findViewById(R.id.tips_progress_bar);
+        buttonView.setVisibility(GONE);
+        tipsImageView.setVisibility(GONE);
+    }
+
+    public void setTipsImageView(Integer res) {
+        tipsImageView.setImageResource(res);
+    }
+
+}

RvFrame/src/main/res/layout/layout_tips.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="match_parent"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <ProgressBar
+        android:id="@+id/tips_progress_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
+        android:layout_marginBottom="5dp" />
+
+
+    <ImageView
+        android:id="@+id/tips_image_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
+        android:layout_marginBottom="5dp"
+        android:scaleType="fitCenter"
+        android:src="@mipmap/resource_image_no_data"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/tips_button_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:background="@drawable/ui_selector_radius_common_primary_h1"
+        android:clickable="true"
+        android:paddingLeft="10dp"
+        android:paddingTop="8dp"
+        android:paddingRight="10dp"
+        android:paddingBottom="8dp"
+        android:text="去添加吧"
+        android:textColor="@color/colorTop"
+        android:textSize="@dimen/_ui_text_size_h5"
+        android:visibility="gone" />
+</LinearLayout>
\ No newline at end of file

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

@@ -106,19 +106,14 @@ public class TravelActivity extends BaseActivity {
         //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) {
-
-                        }
-                    });
-                }
-            }
-        });
+//        ApiUtil.getToken("13612688539", "12345678", new OnApiResponseCallback<Boolean, String>() {
+//            @Override
+//            public void done(Boolean data, String errorMessage) {
+//                if (data) {
+//
+//                }
+//            }
+//        });
 
 
     }

RvTravel/src/main/java/com/rv/travel/api/ApiUtil.java

@@ -308,7 +308,7 @@ public class ApiUtil {
         });
     }
 
-    //获取出游人信息 0-儿童,1-成年人
+    //获取出游人信息 1-儿童,0-成年人
     public static void getTravelMember(String isChild, final OnApiResponseCallback<List<BeanTravelMember>, String> callback) {
         Map<String, String> map = new HashMap<>();
         //map.put("isChild", isChild);

RvTravel/src/main/java/com/rv/travel/bean/BeanOrderParam.java

+package com.rv.travel.bean;
+
+public class BeanOrderParam {
+    private String adultNum;//1,
+    private String childNum;//0,
+    private String time;//"2019-06-20周四~2019-06-22周六",
+    private String endAddr;//"广东省清远市尚林临湖雅居05号商铺",
+    private String startAddr;//"广东省东莞市松山湖",
+    private String startTime;//"2019-06-20",
+    private String startCompanyId;//"0",
+    private String startCompanyName;//"欣新房车控股集团"
+
+    public String getAdultNum() {
+        return adultNum;
+    }
+
+    public void setAdultNum(String adultNum) {
+        this.adultNum = adultNum;
+    }
+
+    public String getChildNum() {
+        return childNum;
+    }
+
+    public void setChildNum(String childNum) {
+        this.childNum = childNum;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+    public String getEndAddr() {
+        return endAddr;
+    }
+
+    public void setEndAddr(String endAddr) {
+        this.endAddr = endAddr;
+    }
+
+    public String getStartAddr() {
+        return startAddr;
+    }
+
+    public void setStartAddr(String startAddr) {
+        this.startAddr = startAddr;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getStartCompanyId() {
+        return startCompanyId;
+    }
+
+    public void setStartCompanyId(String startCompanyId) {
+        this.startCompanyId = startCompanyId;
+    }
+
+    public String getStartCompanyName() {
+        return startCompanyName;
+    }
+
+    public void setStartCompanyName(String startCompanyName) {
+        this.startCompanyName = startCompanyName;
+    }
+
+
+}

RvTravel/src/main/java/com/rv/travel/fragment/TravelFragmentCommitOrder.java

@@ -11,9 +11,16 @@ import android.view.ViewGroup;
 import android.widget.CheckBox;
 
 import com.base.utils.base.BaseFragment;
+import com.base.utils.tools.android.LogUtil;
+import com.base.utils.ui.datetime.selector.util.TextUtil;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import com.rv.travel.R;
 import com.rv.travel.R2;
 import com.rv.travel.adapter.AdapterTravelMember;
+import com.rv.travel.api.ApiUtil;
+import com.rv.travel.api.OnApiResponseCallback;
+import com.rv.travel.bean.BeanOrderParam;
 import com.rv.travel.bean.BeanTravelMember;
 import com.rv.travel.dialog.TravelDialogUtil;
 
@@ -28,10 +35,15 @@ import butterknife.Unbinder;
 //确认下单
 public class TravelFragmentCommitOrder extends BaseFragment {
 
-    private String data= "";
-    public static TravelFragmentCommitOrder getInstance(String oderJson) {
+    private BeanOrderParam beanOrderParam;
+    public static TravelFragmentCommitOrder getInstance(String orderJson) {
         TravelFragmentCommitOrder instance = new TravelFragmentCommitOrder();
-        instance.data = oderJson;
+        LogUtil.e(TravelFragmentCommitOrder.class,"orderJson:"+orderJson);
+        if (!TextUtil.isEmpty(orderJson)){
+            instance.beanOrderParam = new Gson().fromJson(orderJson,
+                    new TypeToken<BeanOrderParam>() {
+                    }.getType());
+        }
         return instance;
     }
 
@@ -127,6 +139,25 @@ public class TravelFragmentCommitOrder extends BaseFragment {
     @Override
     public void onView() {
 
+        getMember();
     }
 
+    List<BeanTravelMember> dataAdult;
+    List<BeanTravelMember> dataChild;
+    private void getMember(){
+        //查成年人
+        ApiUtil.getTravelMember("0", new OnApiResponseCallback<List<BeanTravelMember>, String>() {
+            @Override
+            public void done(List<BeanTravelMember> data, String errorMessage) {
+                dataAdult = data;
+            }
+        });
+        //查儿童
+        ApiUtil.getTravelMember("1", new OnApiResponseCallback<List<BeanTravelMember>, String>() {
+            @Override
+            public void done(List<BeanTravelMember> data, String errorMessage) {
+                dataChild =data;
+            }
+        });
+    }
 }
\ No newline at end of file

RvTravel/src/main/java/com/rv/travel/fragment/TravelFragmentHotMore.java

@@ -11,10 +11,11 @@ import android.view.ViewGroup;
 
 import com.base.animset.util.NiftyEffects;
 import com.base.utils.base.BaseFragment;
-import com.rv.travel.adapter.AdapterHot;
+import com.frame.rv.BaseTipsLayout;
 import com.rv.travel.R;
 import com.rv.travel.R2;
 import com.rv.travel.TravelActivity;
+import com.rv.travel.adapter.AdapterHot;
 import com.rv.travel.api.ApiUtil;
 import com.rv.travel.api.OnApiResponseCallback;
 import com.rv.travel.bean.BeanHot;
@@ -26,6 +27,7 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import butterknife.Unbinder;
+
 //热门旅游  更多
 public class TravelFragmentHotMore extends BaseFragment {
     private String clientClazzName = null;
@@ -39,6 +41,9 @@ public class TravelFragmentHotMore extends BaseFragment {
     @BindView(R2.id.travel_hot_more_recycler)
     RecyclerView hotRecycler;
 
+    @BindView(R2.id.travel_hot_tips)
+    BaseTipsLayout hotTips;
+
     @OnClick({R2.id.travel_hot_more_close
     })
     public void onTravelFragmentHotMoreClick(View view) {
@@ -46,11 +51,11 @@ public class TravelFragmentHotMore extends BaseFragment {
         if (id == R.id.travel_hot_more_close) {
             NiftyEffects.jelly.getAnimator().in(view);
             //关闭
-            if (clientClazzName==null){
+            if (clientClazzName == null) {
 
-            }else if(clientClazzName.equals(TravelFragmentMain.class.getSimpleName())) {
+            } else if (clientClazzName.equals(TravelFragmentMain.class.getSimpleName())) {
                 TravelFragmentMain.hideHotMoreFragment();
-            }else if(clientClazzName.equals(TravelFragmentHotType.class.getSimpleName())) {
+            } else if (clientClazzName.equals(TravelFragmentHotType.class.getSimpleName())) {
                 TravelFragmentHotType.hideHotMoreFragment();
             }
         }
@@ -90,6 +95,8 @@ public class TravelFragmentHotMore extends BaseFragment {
     private AdapterHot adapterHot;
 
     private void setHot() {
+        hotTips.setVisibility(View.VISIBLE);
+
         List<BeanHot> data = new ArrayList<>();
         adapterHot = new AdapterHot(R.layout.item_travel_hot_more, data);
         adapterHot.setOnItemRootClickListener(new AdapterHot.OnItemRootClickListener() {
@@ -106,6 +113,7 @@ public class TravelFragmentHotMore extends BaseFragment {
             @Override
             public void done(List<BeanHot> data, String errorMessage) {
                 adapterHot.setNewData(data);
+                hotTips.setData(data);
             }
         });
     }

RvTravel/src/main/java/com/rv/travel/fragment/TravelFragmentHotType.java

@@ -17,6 +17,7 @@ import com.base.utils.base.BaseFragment;
 import com.base.utils.tools.android.IntentUtil;
 import com.frame.base.browse.ActivityImageBrowseUrl;
 import com.frame.base.glide.GlideManager;
+import com.frame.rv.BaseTipsLayout;
 import com.rv.travel.GoOtherUtil;
 import com.rv.travel.R;
 import com.rv.travel.R2;
@@ -50,6 +51,9 @@ public class TravelFragmentHotType extends BaseFragment {
     @BindView(R2.id.travel_fragment_hot_more_layout)
     FrameLayout hotMoreLayout;
 
+    @BindView(R2.id.travel_rim_tips)
+    BaseTipsLayout rimTips;
+
     @SuppressLint("StaticFieldLeak")
     public static FrameLayout hotMoreLayoutStatic;
 
@@ -121,7 +125,7 @@ public class TravelFragmentHotType extends BaseFragment {
     private AdapterRim adapterRim;
 
     private void setRim() {
-
+        rimTips.setVisibility(View.VISIBLE);
         List<BeanRim> data = new ArrayList<>();
         adapterRim = new AdapterRim(R.layout.item_travel_rim, data);
         adapterRim.setItemRootClickListener(new AdapterRim.OnItemRootClickListener() {
@@ -140,6 +144,7 @@ public class TravelFragmentHotType extends BaseFragment {
             @Override
             public void done(List<BeanRim> data, String errorMessage) {
                 adapterRim.setNewData(data);
+                rimTips.setData(data);
             }
         });
 

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

@@ -21,6 +21,7 @@ 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.frame.rv.BaseTipsLayout;
 import com.rv.travel.GoOtherUtil;
 import com.rv.travel.R;
 import com.rv.travel.R2;
@@ -57,6 +58,10 @@ public class TravelFragmentMain extends BaseFragment {
     FrameLayout hotMoreLayout;
     @BindView(R2.id.query_layout)
     LinearLayout queryLayout;
+    @BindView(R2.id.travel_hot_tips)
+    BaseTipsLayout hotTips;
+    @BindView(R2.id.travel_rim_tips)
+    BaseTipsLayout rimTips;
 
     @SuppressLint("StaticFieldLeak")
     public static FrameLayout hotMoreLayoutStatic;
@@ -120,6 +125,8 @@ public class TravelFragmentMain extends BaseFragment {
     private AdapterHot adapterHot;
 
     private void setHot() {
+        hotTips.setVisibility(View.VISIBLE);
+
         List<BeanHot> data = new ArrayList<>();
         adapterHot = new AdapterHot(R.layout.item_travel_hot, data);
         adapterHot.setOnItemRootClickListener(new AdapterHot.OnItemRootClickListener() {
@@ -137,6 +144,7 @@ public class TravelFragmentMain extends BaseFragment {
             @Override
             public void done(List<BeanHot> data, String errorMessage) {
                 adapterHot.setNewData(data);
+                hotTips.setData(data);
             }
         });
     }
@@ -145,7 +153,7 @@ public class TravelFragmentMain extends BaseFragment {
 
     private void setRim() {
 
-
+        rimTips.setVisibility(View.VISIBLE);
         List<BeanRim> data = new ArrayList<>();
         adapterRim = new AdapterRim(R.layout.item_travel_rim, data);
         adapterRim.setItemRootClickListener(new AdapterRim.OnItemRootClickListener() {
@@ -163,6 +171,7 @@ public class TravelFragmentMain extends BaseFragment {
             @Override
             public void done(List<BeanRim> data, String errorMessage) {
                 adapterRim.setNewData(data);
+                rimTips.setData(data);
             }
         });
 

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

@@ -4,14 +4,24 @@
     android:layout_height="match_parent"
     android:background="@color/colorHotMore">
 
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.frame.rv.BaseTipsLayout
+            android:id="@+id/travel_hot_tips"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
 
         <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" />
+            android:layout_marginRight="@dimen/ui_dimen_common"
+            android:layout_marginBottom="@dimen/ui_dimen_margin_h9" />
+    </FrameLayout>
 
     <ImageView
         android:id="@+id/travel_hot_more_close"

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

@@ -53,13 +53,23 @@
 
             </LinearLayout>
 
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <com.frame.rv.BaseTipsLayout
+                    android:id="@+id/travel_rim_tips"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+
                 <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" />
+            </FrameLayout>
 
 
         </LinearLayout>

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

@@ -66,12 +66,22 @@
                         android:src="@mipmap/rv_common_icon_right_arrow" />
                 </LinearLayout>
 
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <com.frame.rv.BaseTipsLayout
+                        android:id="@+id/travel_hot_tips"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+
                     <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" />
+                </FrameLayout>
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -99,6 +109,15 @@
             </LinearLayout>
 
 
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <com.frame.rv.BaseTipsLayout
+                    android:id="@+id/travel_rim_tips"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/travel_rim_recycler"
                     android:layout_width="match_parent"
@@ -106,6 +125,7 @@
                     android:layout_marginLeft="@dimen/ui_dimen_margin_h1"
                     android:layout_marginTop="@dimen/ui_dimen_common"
                     android:layout_marginRight="@dimen/ui_dimen_margin_h1" />
+            </FrameLayout>
 
 
         </LinearLayout>