代码更新

MyFrame/src/main/java/com/frame/base/url/Constance.java

@@ -4,5 +4,5 @@ package com.frame.base.url;
  * ARouter上面的注解需要我们写路径标识
  */
 public final class Constance {
-    public static final String ACTIVITY_URL_ORDERLIST ="/ui/main/home/order/OrderListActivity";
+    public static final String ACTIVITY_URL_ORDERLIST ="/order/OrderListActivity";
 }

MyFrame/src/main/java/com/frame/base/view/StarBar.java

+package com.frame.base.view;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Bitmap;
+import android.graphics.BitmapShader;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+
+import com.yuyife.framebase.R;
+
+public class StarBar extends View {
+    private int starDistance = 0; //星星间距
+    private int starCount = 5;  //星星个数
+    private int starSize;     //星星高度大小，星星一般正方形，宽度等于高度
+    private float starMark = 0.0F;   //评分星星
+    private Bitmap starFillBitmap; //亮星星
+    private Drawable starEmptyDrawable; //暗星星
+    private OnStarChangeListener onStarChangeListener;//监听星星变化接口
+    private Paint paint;         //绘制星星画笔
+    private boolean integerMark = false;
+    public StarBar(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs);
+    }
+
+    public StarBar(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context, attrs);
+    }
+
+    /**
+     * 初始化UI组件
+     *
+     * @param context
+     * @param attrs
+     */
+    private void init(Context context, AttributeSet attrs){
+        setClickable(true);
+        TypedArray mTypedArray = context.obtainStyledAttributes(attrs, R.styleable.RatingBar);
+        this.starDistance = (int) mTypedArray.getDimension(R.styleable.RatingBar_starDistance, 0);
+        this.starSize = (int) mTypedArray.getDimension(R.styleable.RatingBar_starSize, 20);
+        this.starCount = mTypedArray.getInteger(R.styleable.RatingBar_starCount, 5);
+        this.starEmptyDrawable = mTypedArray.getDrawable(R.styleable.RatingBar_starEmpty);
+        this.starFillBitmap =  drawableToBitmap(mTypedArray.getDrawable(R.styleable.RatingBar_starFill));
+        mTypedArray.recycle();
+
+        paint = new Paint();
+        paint.setAntiAlias(true);
+        paint.setShader(new BitmapShader(starFillBitmap, BitmapShader.TileMode.CLAMP, BitmapShader.TileMode.CLAMP));
+    }
+
+    /**
+     * 设置是否需要整数评分
+     * @param integerMark
+     */
+    public void setIntegerMark(boolean integerMark){
+        this.integerMark = integerMark;
+    }
+
+    /**
+     * 设置显示的星星的分数
+     *
+     * @param mark
+     */
+    public void setStarMark(float mark){
+        if (integerMark) {
+            starMark = (int)Math.ceil(mark);
+        }else {
+            starMark = Math.round(mark * 10) * 1.0f / 10;
+        }
+        if (this.onStarChangeListener != null) {
+            this.onStarChangeListener.onStarChange(starMark);  //调用监听接口
+        }
+        invalidate();
+    }
+
+    /**
+     * 获取显示星星的数目
+     *
+     * @return starMark
+     */
+    public float getStarMark(){
+        return starMark;
+    }
+
+
+    /**
+     * 定义星星点击的监听接口
+     */
+    public interface OnStarChangeListener {
+        void onStarChange(float mark);
+    }
+
+    /**
+     * 设置监听
+     * @param onStarChangeListener
+     */
+    public void setOnStarChangeListener(OnStarChangeListener onStarChangeListener){
+        this.onStarChangeListener = onStarChangeListener;
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        setMeasuredDimension(starSize * starCount + starDistance * (starCount - 1), starSize);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        if (starFillBitmap == null || starEmptyDrawable == null) {
+            return;
+        }
+        for (int i = 0;i < starCount;i++) {
+            starEmptyDrawable.setBounds((starDistance + starSize) * i, 0, (starDistance + starSize) * i + starSize, starSize);
+            starEmptyDrawable.draw(canvas);
+        }
+        if (starMark > 1) {
+            canvas.drawRect(0, 0, starSize, starSize, paint);
+            if(starMark-(int)(starMark) == 0) {
+                for (int i = 1; i < starMark; i++) {
+                    canvas.translate(starDistance + starSize, 0);
+                    canvas.drawRect(0, 0, starSize, starSize, paint);
+                }
+            }else {
+                for (int i = 1; i < starMark - 1; i++) {
+                    canvas.translate(starDistance + starSize, 0);
+                    canvas.drawRect(0, 0, starSize, starSize, paint);
+                }
+                canvas.translate(starDistance + starSize, 0);
+                canvas.drawRect(0, 0, starSize * (Math.round((starMark - (int) (starMark))*10)*1.0f/10), starSize, paint);
+            }
+        }else {
+            canvas.drawRect(0, 0, starSize * starMark, starSize, paint);
+        }
+    }
+
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        int x = (int) event.getX();
+        if (x < 0) x = 0;
+        if (x > getMeasuredWidth()) x = getMeasuredWidth();
+        switch(event.getAction()){
+            case MotionEvent.ACTION_DOWN: {
+                setStarMark(x*1.0f / (getMeasuredWidth()*1.0f/starCount));
+                break;
+            }
+            case MotionEvent.ACTION_MOVE: {
+                setStarMark(x*1.0f / (getMeasuredWidth()*1.0f/starCount));
+                break;
+            }
+            case MotionEvent.ACTION_UP: {
+//                setStarMark(x*1.0f / (getMeasuredWidth()*1.0f/starCount));
+                break;
+            }
+        }
+        invalidate();
+        return super.onTouchEvent(event);
+    }
+
+    /**
+     * drawable转bitmap
+     *
+     * @param drawable
+     * @return
+     */
+    private Bitmap drawableToBitmap(Drawable drawable)
+    {
+        if (drawable == null)return null;
+        Bitmap bitmap = Bitmap.createBitmap(starSize, starSize, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        drawable.setBounds(0, 0, starSize, starSize);
+        drawable.draw(canvas);
+        return bitmap;
+    }
+}
\ No newline at end of file

MyFrame/src/main/res/values/attrs.xml

+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="RatingBar">
+        <!--星星间距-->
+        <attr format="dimension" name="starDistance"/>
+        <!--星星大小-->
+        <attr format="dimension" name="starSize"/>
+        <!--星星个数-->
+        <attr format="integer" name="starCount"/>
+        <!--星星空图-->
+        <attr format="reference" name="starEmpty"/>
+        <!--星星满图-->
+        <attr format="reference" name="starFill"/>
+    </declare-styleable>
+
+</resources>
\ No newline at end of file

RvClient/build.gradle

@@ -47,5 +47,6 @@ dependencies {
     api project(path: ':RvHome')
     api project(path: ':RvMine')
     api project(path: ':RvCamp')
+    api project(path: ':module_tourism')
 
 }

RvClient/src/main/AndroidManifest.xml

@@ -428,6 +428,13 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
 
+
+        <!--============================旅游==========================================-->
+        <!--旅游主页-->
+        <activity android:name="com.rv.tourism.TourismActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait" />
+
     </application>
 
 </manifest>
\ No newline at end of file

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

@@ -12,6 +12,7 @@ import com.rv.home.rv.module.ui.main.HomeActivity;
 import com.rv.rvmine.MineActivity;
 import com.rv.rvmine.bean.UserInfoBean;
 import com.rv.rvmine.traveler.AddAVisitorActivity;
+import com.rv.tourism.TourismActivity;
 import com.rv.travel.GoOtherUtil;
 import com.rv.travel.TravelActivity;
 import com.yuyife.okgo.OkGoUtil;
@@ -39,9 +40,9 @@ public class ModuleUtil {
                     case OnModuleEventListener.MODULE_TRAVEL:
                         if (currentModule == OnModuleEventListener.MODULE_TRAVEL) return;
                         if (ModuleEventUtil.currentActivity != null) {
-                            IntentUtil.goActivityWithAnimationAlpha(ModuleEventUtil.currentActivity, TravelActivity.class);
+                            IntentUtil.goActivityWithAnimationAlpha(ModuleEventUtil.currentActivity, TourismActivity.class);
                         } else {
-                            IntentUtil.startActivity(FrameApp.getInstance(), TravelActivity.class);
+                            IntentUtil.startActivity(FrameApp.getInstance(), TourismActivity.class);
                         }
                         break;
                     case OnModuleEventListener.MODULE_CAMP:
@@ -93,7 +94,7 @@ public class ModuleUtil {
                             FrameApp.getMainHandler().postDelayed(new Runnable() {
                                 @Override
                                 public void run() {
-                                    GoOtherUtil.goTravelDetailWeb(GoOtherUtil.travelDetailId, FrameApp.getInstance());
+                                    GoOtherUtil.goTravelDetailWeb(GoOtherUtil.mBean, FrameApp.getInstance());
                                 }
                             }, 500);
                         }

RvFrame/src/main/java/com/frame/rv/widget/BaseTitleBarLayout.java

 package com.frame.rv.widget;
 
 import android.content.Context;
+import android.media.Image;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -31,6 +32,8 @@ public class BaseTitleBarLayout extends RelativeLayout {
     private ImageView backImageView;
     private TextView titleTextView;
     private TextView buttonView;
+    public ImageView buttonCollect;
+    public ImageView buttonShare;
 
     private void init(Context context) {
 
@@ -38,7 +41,21 @@ public class BaseTitleBarLayout extends RelativeLayout {
         backImageView = view.findViewById(R.id.title_bar_back_image_view);
         titleTextView = view.findViewById(R.id.title_bar_text_view);
         buttonView = view.findViewById(R.id.title_bar_button_view);
+        buttonCollect = view.findViewById(R.id.iv_collect);
+        buttonShare = view.findViewById(R.id.iv_share);
         buttonView.setVisibility(GONE);
+        buttonCollect.setVisibility(GONE);
+        buttonShare.setVisibility(GONE);
+    }
+
+    public void setButtonShare(OnClickListener listener){
+        buttonShare.setVisibility(VISIBLE);
+        buttonShare.setOnClickListener(listener);
+    }
+
+    public void setButtonCollect(OnClickListener listener){
+        buttonCollect.setVisibility(VISIBLE);
+        buttonCollect.setOnClickListener(listener);
     }
 
     public void setButtonView(String text,OnClickListener listener) {

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

@@ -42,6 +42,25 @@
                 android:text="button"
                 android:textColor="@color/colorPrimary"
                 android:textSize="@dimen/_ui_text_size_h6" />
+
+            <ImageView
+                android:id="@+id/iv_collect"
+                android:layout_width="34dp"
+                android:layout_height="34dp"
+                android:layout_centerVertical="true"
+                android:src="@drawable/travel_rv_collect"
+                android:padding="5dp"
+                />
+            <ImageView
+                android:id="@+id/iv_share"
+                android:layout_width="34dp"
+                android:layout_height="34dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="4dp"
+                android:layout_centerVertical="true"
+                android:src="@drawable/travel_rv_rentingcar_icon_share"
+                android:padding="5dp"
+                />
         </LinearLayout>
     </LinearLayout>
 

RvHome/src/main/java/com/rv/home/rv/module/ApiConfig.java

@@ -43,7 +43,14 @@ public class ApiConfig {
     public static String HTTP_URL_CAR_TYPE_TRAVELORDERDETAIL = RvFrameConfig.HOST + "/h5/appHtml/view/travelOrderDetail.html";//旅游订单详情页
     public static String HTTP_URL_CAR_TYPE_COSTDETAIL= RvFrameConfig.HOST+"/h5/appHtml/view/costDetail.html";//费用明细
     public static String HTTP_URL_APP_USER_INFO= RvFrameConfig.ADMIN_POST+"app/user/info";//获取用户信息
-    public static String HTTP_URL_CERTIFICATE = RvFrameConfig.VEHICLE_UPLOAD + "certif/app/Certificate";//实名认证
+    public static String HTTP_URL_CERTIFICATE = RvFrameConfig.VEHICLE_UPLOAD + "certif/app/certificate";//实名认证
+    public static String HTTP_URL_UPUSER_EDIT = RvFrameConfig.ADMIN_POST + "app/user/edit";//更新用户信息
+    public static String HTTP_URL_GETTOURUSERLIST = RvFrameConfig.VEHICLE_TOURUSER + "tourUser/app/unauth/getTourUserList";//获得全部出游人信息
+    public static String HTTP_URL_ADDANDUPDATE = RvFrameConfig.VEHICLE_TOURUSER + "tourUser/app/addAndUpdate";//添加和更新出游人信息
+    public static String HTTP_URL_CAR_TYPE_NOTICE= RvFrameConfig.HOST+"/h5/appHtml/view/notice.html";//预定须知
+    public static String HTTP_URL_COLLECTONLIST = RvFrameConfig.ADMIN_POST + "app/user/collect/page";//我的收藏列表
+
+    public static String HTTP_URL_SCORE = RvFrameConfig.HOST + "/vehicle/vehicleUserScore/score";//订单评价保存
 
 
 }

RvHome/src/main/java/com/rv/home/rv/module/basic/presenter/PickerPresenter.java

@@ -21,6 +21,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.Map;
 
 /**
  * Created by Amuse
@@ -70,9 +71,6 @@ public class PickerPresenter extends CommonPresenter {
         }
     }
 
-
-
-
     /**
      * 获得相机存储地址
      *

RvHome/src/main/java/com/rv/home/rv/module/ui/login/BingPhoneActivity.java

@@ -129,17 +129,17 @@ public class BingPhoneActivity extends BaseLoginActivity<CommonPresenter> {
 
     @OnClick({R2.id.iv_clear_phone, R2.id.iv_clear_code, R2.id.tv_get_code, R2.id.tv_bind})
     public void onViewClicked(View view) {
-        if(view.getId()==R2.id.iv_clear_phone){
+        if(view.getId()==R.id.iv_clear_phone){
             clearEditData(etPhone);
-        }else if(view.getId()==R2.id.iv_clear_code){
+        }else if(view.getId()==R.id.iv_clear_code){
             clearEditData(etPhoneCode);
-        }else if(view.getId()==R2.id.tv_get_code){
+        }else if(view.getId()==R.id.tv_get_code){
             if (TextUtils.isEmpty(getPhone())) {
                 showToast(mActivity.getString(R.string.rv_phone_hint));
                 return;
             }
             sendCode(60);
-        }else if(view.getId()==R2.id.tv_get_code){
+        }else if(view.getId()==R.id.tv_get_code){
             checkPhone();
         }
 //        switch (view.getId()) {
@@ -217,14 +217,12 @@ public class BingPhoneActivity extends BaseLoginActivity<CommonPresenter> {
             @Override
             public void afterTextChanged(Editable s) {
                 super.afterTextChanged(s);
-                switch (editText.getId()) {
-                    case R2.id.et_phone:
-                        ivClearPhone.setVisibility(getPhone().length() > 0 ? View.VISIBLE : View.GONE);
-                        break;
-                    case R2.id.et_phone_code:
-                        ivClearCode.setVisibility(getCode().length() > 0 ? View.VISIBLE : View.GONE);
-                        break;
+                if (editText.getId() ==R.id.et_phone ){
+                    ivClearPhone.setVisibility(getPhone().length() > 0 ? View.VISIBLE : View.GONE);
+                }else if (editText.getId() ==R.id.et_phone_code){
+                    ivClearCode.setVisibility(getCode().length() > 0 ? View.VISIBLE : View.GONE);
                 }
+
                 if (etPhone.length() > 0 && etPhoneCode.length() > 0) {
                     tvBind.setEnabled(true);
                     tvBind.setSelected(true);

RvHome/src/main/java/com/rv/home/rv/module/ui/login/ConfirmPwdActivity.java

@@ -139,19 +139,19 @@ public class ConfirmPwdActivity extends BaseLoginActivity<CommonPresenter> {
 
     @OnClick({R2.id.iv_clear_pwd, R2.id.iv_clear_again_pwd, R2.id.tv_agreement, R2.id.tv_registered})
     public void onViewClicked(View view) {
-        if(view.getId()==R2.id.iv_clear_pwd){
+        if(view.getId()==R.id.iv_clear_pwd){
             pwdShow=!pwdShow;
             ivClearPwd.setSelected(pwdShow);
             etPwd.setTransformationMethod(pwdShow? HideReturnsTransformationMethod.getInstance(): PasswordTransformationMethod.getInstance());
-        }else if(view.getId()==R2.id.iv_clear_again_pwd){
+        }else if(view.getId()==R.id.iv_clear_again_pwd){
             confirmShow=!confirmShow;
             ivClearAgainPwd.setSelected(confirmShow);
             etAgainPwd.setTransformationMethod(confirmShow? HideReturnsTransformationMethod.getInstance(): PasswordTransformationMethod.getInstance());
         }
-        else if(view.getId()==R2.id.tv_agreement){
+        else if(view.getId()==R.id.tv_agreement){
 
         }
-        else if(view.getId()==R2.id.tv_registered){
+        else if(view.getId()==R.id.tv_registered){
             if (getPwd().length() < 8) {
                 showToast(mActivity.getString(R.string.rv_pwd_length));
                 return;

RvHome/src/main/java/com/rv/home/rv/module/ui/login/RegisteredActivity.java

@@ -218,7 +218,11 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
     private void sendCode() {
         Map<String, Object> map = new LinkedHashMap<>();
         map.put("username", getPhone());
-        map.put("type", 0);
+        if (mType ==0){
+            map.put("type", 0);
+        }else{
+            map.put("type", 4);
+        }
         mPresenter.postData(0, ApiConfig.HTTP_URL_SEND_CODE, SendCodeBean.class, map, true);
     }
 

RvHome/src/main/java/com/rv/home/rv/module/ui/main/HomeActivity.java

@@ -5,9 +5,11 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
+import android.view.KeyEvent;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.frame.rv.ModuleEventUtil;
 import com.frame.rv.OnModuleEventListener;
@@ -23,6 +25,7 @@ import com.rv.home.rv.module.ui.login.LoginRvActivity;
 import com.rv.home.rv.module.ui.main.adapter.TabAdapter;
 import com.rv.home.rv.module.ui.main.camp.CampFragment;
 import com.rv.home.rv.module.ui.main.found.FoundFragment;
+import com.rv.home.rv.module.ui.main.home.HomeFragment;
 import com.rv.home.rv.module.ui.main.home.HomePageFragment;
 import com.rv.home.rv.module.ui.main.mine.MineFragment;
 import com.rv.home.rv.module.ui.main.travel.TravelFragment;
@@ -65,6 +68,7 @@ public class HomeActivity extends BaseActivity<CommonPresenter> {
     private final int TYPE_CAMP = 2;//营地
     private final int TYPE_FOUND = 3;//旅行
     private final int TYPE_MINE = 4;//我的
+    private long exitTime = 0;
 
     public static Intent getIntent(Context context) {
         return new Intent(context, HomeActivity.class);
@@ -150,7 +154,8 @@ public class HomeActivity extends BaseActivity<CommonPresenter> {
 
     private List<BaseWrapperFragment> getListFragment() {
         List<BaseWrapperFragment> list = new ArrayList<>();
-        list.add(HomePageFragment.getInstance(TYPE_HOME_PAGE));
+//        list.add(HomePageFragment.getInstance(TYPE_HOME_PAGE));
+        list.add(HomeFragment.getInstance(TYPE_HOME_PAGE));
         list.add(TravelFragment.getInstance(TYPE_TRAVEL));
         list.add(CampFragment.getInstance(TYPE_CAMP));
         list.add(FoundFragment.getInstance(TYPE_FOUND));
@@ -179,4 +184,28 @@ public class HomeActivity extends BaseActivity<CommonPresenter> {
         imageView.setSelected(isTrue);
         textView.setTextColor(ContextCompat.getColor(this, isTrue ? R.color.colorAuxiliaryYellow : R.color.textMain));
     }
+
+
+    @Override
+    public boolean dispatchKeyEvent(KeyEvent event) {
+        if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
+            if (event.getAction() == KeyEvent.ACTION_DOWN && event.getRepeatCount() == 0) {
+                exitApp();
+            }
+            return true;
+        }
+        return super.dispatchKeyEvent(event);
+    }
+
+    /**
+     * 退出APP
+     */
+    private void exitApp() {
+        if (System.currentTimeMillis() - exitTime > 2000) {
+            Toast.makeText(this, "再按一次，退出程序", Toast.LENGTH_SHORT).show();
+            exitTime = System.currentTimeMillis();
+        } else {
+            finish();
+        }
+    }
 }

RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/CarDetailActivity.java

@@ -66,9 +66,7 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
                 .putExtra("carBean", carBean)
                 .putExtra("startTime", startTime)
                 .putExtra("endTime", endTime);
-    }
-
-    ;
+    };
 
     public static Intent getIntent(Context context, int type) {
         return new Intent(context, CarDetailActivity.class)
@@ -105,7 +103,7 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
     @Override
     protected void onStart() {
         super.onStart();
-        onShowLoading();
+//        onShowLoading();
     }
 
     @Override
@@ -170,7 +168,8 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
         if(view.getId()==R.id.iv_back){
             finish();
         }else if(view.getId()==R.id.iv_collect){
-
+           //添加收藏
+            addCollection();
         }
         else if(view.getId()==R.id.iv_share){
             if (shareManager != null) {
@@ -211,6 +210,11 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
 //        }
     }
 
+    //添加收藏
+    private void addCollection() {
+
+    }
+
 
     private void initWeb() {
         WebSettings webSettings = mWebView.getSettings();

RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/CarRentalActivity.java

@@ -241,7 +241,7 @@ public class CarRentalActivity extends BaseStatusActivity<CommonPresenter> {
         for (int i = 0; i < 20; i++) {
             list.add("东莞松山湖欣新房车总店" + i);
         }
-        mAdapter.setNewData(list);
+//        mAdapter.setNewData(list);
 
     }
 

RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/ConfirmOrderActivity.java

@@ -10,9 +10,11 @@ import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.PopupWindow;
 import android.widget.RatingBar;
 import android.widget.TextView;
 
@@ -22,10 +24,14 @@ import com.google.gson.Gson;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.util.ViewHolder;
 import com.ruiwenliu.wrapper.weight.TitleView;
+import com.frame.base.bus.PaymentFailedEvent;
+import com.frame.base.bus.PaymentSuccessfulEvent;
+import com.frame.base.bus.RxBus;
 import com.rv.home.R;
 import com.rv.home.R2;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.BaseStatusActivity;
+import com.rv.home.rv.module.basic.WebActivity;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.main.home.bean.CarTypeListBean;
 import com.rv.home.rv.module.ui.main.home.bean.ConfirmOrderBean;
@@ -37,15 +43,13 @@ import com.rv.home.rv.module.ui.main.home.bean.OrderPriceDetailBean;
 import com.rv.home.rv.module.ui.main.home.dialog.OrderPriceDetailPw;
 import com.rv.home.rv.module.ui.main.home.dialog.PaymentTypeSelection;
 import com.rv.home.rv.module.ui.main.home.order.OrderListActivity;
-import com.rv.home.rv.until.bus.PaymentFailedEvent;
-import com.rv.home.rv.until.bus.PaymentSuccessfulEvent;
-import com.rv.home.rv.until.bus.RxBus;
 import com.tencent.mm.opensdk.modelpay.PayReq;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
 import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 import com.yuyife.okgo.OkGoUtil;
 
 import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.Map;
 
 import butterknife.BindView;
@@ -205,6 +209,8 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
                 break;
             case 2:
                 pay((OrderPayBean) result);
+
+
                 break;
             case 3:
                 startActivity(OrderListActivity.getIntent(mActivity, 0));
@@ -235,7 +241,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
     }
 
     @OnClick({R2.id.rl_goods, R2.id.tv_get_time, R2.id.tv_get_week, R2.id.tv_out_time, R2.id.tv_out_week, R2.id.tv_get_car_address, R2.id.tv_out_car_address, R2.id.iv_add_driving, R2.id.tv_give_car_info,
-            R2.id.tv_give_car_content, R2.id.tv_detail, R2.id.tv_confirm_order, R2.id.tv_delete, R2.id.rb_xin_driving, R2.id.rb_user_driving})
+            R2.id.tv_give_car_content, R2.id.tv_detail, R2.id.tv_confirm_order, R2.id.tv_delete, R2.id.rb_xin_driving, R2.id.rb_user_driving,R2.id.tv_contract_agreement})
     public void onViewClicked(View view) {
 
         int i = view.getId();
@@ -247,7 +253,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
         } else if (i == R.id.tv_get_car_address) {
         } else if (i == R.id.tv_out_car_address) {
         } else if (i == R.id.iv_add_driving) {
-            startActivityForResult(DrivingListActivity.getIntent(mActivity), TYPE_REQUEST_DRIVING);
+            startActivityForResult(DrivingListActivity.getIntent(mActivity,drivingListBean), TYPE_REQUEST_DRIVING);
 
         } else if (i == R.id.tv_give_car_info) {
         } else if (i == R.id.tv_give_car_content) {
@@ -277,6 +283,8 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
             }
             getOrderPrice();
 
+        }else if (i == R.id.tv_contract_agreement){
+            startActivity(WebActivity.getIntent(mActivity, mActivity.getString(R.string.rv_contract_agreement), ApiConfig.HTTP_URL_CAR_TYPE_NOTICE));
         }
 
 //        if(view.getId()==R.id.iv_add_driving){
@@ -433,6 +441,25 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
             int offsetY = -(detailPw.getContentView().getMeasuredHeight() + view.getHeight());
             PopupWindowCompat.showAsDropDown(detailPw, view, offsetX, offsetY, Gravity.START);
 
+            /**
+             * 点击popupWindow让背景变暗
+             */
+            final WindowManager.LayoutParams lp = getWindow().getAttributes();
+            lp.alpha = 0.5f;//代表透明程度，范围为0 - 1.0f
+           getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+           getWindow().setAttributes(lp);
+            /**
+             * 退出popupWindow时取消暗背景
+             */
+            detailPw.setOnDismissListener(new PopupWindow.OnDismissListener() {
+                @Override
+                public void onDismiss() {
+                    lp.alpha = 1.0f;
+                   getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+                    getWindow().setAttributes(lp);
+                }
+            });
+
 
         }
 
@@ -462,9 +489,6 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
             req.sign = data.getData().getSign();
             req.extData = "app data"; // optional
             api.sendReq(req);
-
-            showToast("正常调起支付");
-
         } catch (Exception e) {
             showToast("异常");
         }

RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/DrivingListActivity.java

@@ -22,6 +22,7 @@ import com.rv.home.rv.module.ui.main.home.bean.DrivingListBean;
 import com.yuyife.okgo.OkGoUtil;
 
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 
 import butterknife.BindView;
@@ -35,10 +36,14 @@ public class DrivingListActivity extends BaseStatusActivity<CommonPresenter> imp
     private final int TYPE_REQUEST_EDIT = 2;
     private int mPage;
     private int countPage;
+    private DrivingListBean.DataBeanX.DataBean dataBean;
 
-    public static Intent getIntent(Context context) {
-        return new Intent(context, DrivingListActivity.class);
-    };
+    public static Intent getIntent(Context context, DrivingListBean.DataBeanX.DataBean dataBean) {
+        return new Intent(context, DrivingListActivity.class)
+                .putExtra("data", dataBean);
+    }
+
+    ;
 
     @Override
     protected int setLayout() {
@@ -48,6 +53,7 @@ public class DrivingListActivity extends BaseStatusActivity<CommonPresenter> imp
     @Override
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         titleView.setTitle(mActivity.getString(R.string.rv_driving));
+        dataBean = (DrivingListBean.DataBeanX.DataBean) intent.getSerializableExtra("data");
         titleView.setImageResource(R.id.iv_title_right, R.drawable.rv_common_icon_thestaff);
         titleView.setChildClickListener(R.id.iv_title_right, new View.OnClickListener() {
             @Override
@@ -141,6 +147,16 @@ public class DrivingListActivity extends BaseStatusActivity<CommonPresenter> imp
                 mAdapter.setEmptyView(getEmptyView(recyclerView, -1, mActivity.getString(R.string.rv_driving_data_null)));
                 return;
             }
+
+            if (bean.getData() != null && bean.getData().getData().size() > 0) {
+                for (int i = 0; i < bean.getData().getData().size(); i++) {
+                    if (dataBean != null) {
+                        if (dataBean.getId() == bean.getData().getData().get(i).getId()) {
+                             bean.getData().getData().get(i).setCheck(true);
+                        }
+                    }
+                }
+            }
             countPage = bean.getData().getTotalPage();
             mAdapter.setNewData(bean.getData().getData());
             mAdapter.loadMoreComplete();

RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/DrivingUploadActivity.java

@@ -118,10 +118,10 @@ public class DrivingUploadActivity extends BaseStatusActivity<PickerPresenter> {
                     showToast(mActivity.getString(R.string.rv_upload_driving_toast));
                     return;
                 }
-                if (TextUtils.isEmpty(strCardCopy)) {
-                    showToast(mActivity.getString(R.string.rv_upload_driving_copy_toast));
-                    return;
-                }
+//                if (TextUtils.isEmpty(strCardCopy)) {
+//                    showToast(mActivity.getString(R.string.rv_upload_driving_copy_toast));
+//                    return;
+//                }
 
                 processDriving();
             }

RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/HomePageFragment.java

@@ -252,7 +252,7 @@ public class HomePageFragment extends BaseFragment<CommonPresenter> {
         for (int i = 0; i < 20; i++) {
             list.add("东莞松山湖欣新房车总店" + i);
         }
-        mAdapter.setNewData(list);
+//        mAdapter.setNewData(list);
 
     }
 

RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/adapter/DrivingListAdapter.java

@@ -31,6 +31,11 @@ public class DrivingListAdapter extends BaseQuickAdapter<DrivingListBean.DataBea
         helper.setText(R.id.tv_name, item.getName());
         helper.setText(R.id.tv_phone, item.getPhone());
         helper.setText(R.id.tv_id_card, item.getIdCard());
+        if (item.isCheck()) {
+            helper.setChecked(R.id.cb_driving, true);
+        }else {
+            helper.setChecked(R.id.cb_driving, false);
+        }
         helper.addOnClickListener(R.id.tv_edit);
         helper.setOnCheckedChangeListener(R.id.cb_driving, new CompoundButton.OnCheckedChangeListener() {
             @Override

RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/adapter/HotCarTypeAdapter.java

@@ -3,9 +3,11 @@ package com.rv.home.rv.module.ui.main.home.adapter;
 import android.widget.ImageView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.frame.base.glide.GlideManager;
 import com.ruiwenliu.wrapper.util.BaseGlideHolder;
 import com.rv.home.R;
 import com.rv.home.R2;
+import com.rv.travel.bean.BeanHot;
 
 /**
  * Created :Auser
@@ -13,17 +15,23 @@ import com.rv.home.R2;
  * Desc:热门车型适配
  */
 
-public class HotCarTypeAdapter extends BaseQuickAdapter<String,BaseGlideHolder>{
+public class HotCarTypeAdapter extends BaseQuickAdapter<BeanHot,BaseGlideHolder>{
     public HotCarTypeAdapter() {
         super(R.layout.rv_item_hot_car_type);
     }
 
     @Override
-    protected void convert(BaseGlideHolder helper, String item) {
-        String url = "https://ss0.bdstatic.com/94oJfD_bAAcT8t7mm9GUKT-xh_/timg?image&quality=100&size=b4000_4000&sec=1543312516&di=6e4dacdfc8ca2ebd0a18ae25d3154717&src=http://pic1.win4000.com/wallpaper/2018-07-20/5b51756e43021.jpg";
-        helper.loadRoundImage(mContext,url, (ImageView) helper.getView(R.id.iv_goods),10);
-        helper.setText(R.id.tv_name,item);
+    protected void convert(BaseGlideHolder helper, BeanHot bean) {
+        GlideManager.getInstance(mContext).loadImage(bean.getImg(),  (ImageView)helper.getView(R.id.iv_goods));
+//        helper.loadRoundImage(mContext,bean.getImg(), (ImageView) helper.getView(R.id.iv_goods),10);
+        helper.setText(R.id.tv_name,bean.getName());
         helper.setText(R.id.tv_content,"c1、烧烤、麻将、微波炉");
-        helper.setText(R.id.tv_price,String.format("￥%1$s%2$s","332225",mContext.getString(R.string.rv_day)));
+        helper.setText(R.id.tv_price,String.format("￥%1$s%2$s","1000",mContext.getString(R.string.rv_day)));
+    }
+
+
+    @Override
+    public int getItemCount() {
+        return 4;
     }
 }

RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/adapter/RVEnthusiastAdapter.java

+package com.rv.home.rv.module.ui.main.home.adapter;
+
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.frame.base.glide.GlideManager;
+import com.ruiwenliu.wrapper.util.BaseGlideHolder;
+import com.rv.home.R;
+
+import java.util.Random;
+
+public class RVEnthusiastAdapter extends BaseQuickAdapter<String, BaseGlideHolder> {
+
+    public RVEnthusiastAdapter() {
+        super(R.layout.rv_item_rv_enthusiast);
+    }
+
+    @Override
+    protected void convert(BaseGlideHolder helper, String string) {
+        GlideManager.getInstance(mContext).loadImage(string,  (ImageView)helper.getView(R.id.iv_activity));
+
+//        ViewGroup.LayoutParams layoutParams = helper.getView(R.id.ll_item_rv_enthusiast).getLayoutParams();
+//        layoutParams.height = new Random().nextInt(200)+500;
+//        helper.getView(R.id.ll_item_rv_enthusiast).setLayoutParams(layoutParams);
+    }
+}

RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/adapter/RVTourListAdapter.java

+package com.rv.home.rv.module.ui.main.home.adapter;
+
+import android.widget.ImageView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.frame.base.glide.GlideManager;
+import com.ruiwenliu.wrapper.util.BaseGlideHolder;
+import com.rv.home.R;
+import com.rv.travel.bean.BeanHot;
+
+/**
+ * 房车游榜单
+ */
+public class RVTourListAdapter extends BaseQuickAdapter<BeanHot, BaseGlideHolder> {
+
+    public RVTourListAdapter() {
+        super(R.layout.rv_item_rv_tourlist);
+    }
+
+    @Override
+    protected void convert(BaseGlideHolder helper, BeanHot bean) {
+        GlideManager.getInstance(mContext).loadImage(bean.getImg(),  (ImageView)helper.getView(R.id.iv_rv_tour));
+    }
+}

RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/adapter/RVTourListLabelAdapter.java

+package com.rv.home.rv.module.ui.main.home.adapter;
+
+import android.view.Gravity;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.frame.base.glide.GlideManager;
+import com.ruiwenliu.wrapper.util.BaseGlideHolder;
+import com.rv.home.R;
+import com.rv.travel.bean.BeanHot;
+
+import org.w3c.dom.Text;
+
+/**
+ * 房车游榜单  标注
+ */
+public class RVTourListLabelAdapter extends BaseQuickAdapter<BeanHot, BaseGlideHolder> {
+
+    private int selectPosition;
+
+    public RVTourListLabelAdapter() {
+        super(R.layout.rv_item_rv_tourlist_label);
+    }
+
+    @Override
+    protected void convert(BaseGlideHolder helper, BeanHot bean) {
+        helper.setText(R.id.tv_rvtour_label, bean.getName());
+        TextView label = (TextView) helper.getView(R.id.tv_rvtour_label);
+        RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) label.getLayoutParams();
+        if (selectPosition == mData.indexOf(bean)) {
+            layoutParams.width = 200;
+            layoutParams.height =  90;
+            label.setLayoutParams(layoutParams);
+            label.setTextColor(mContext.getResources().getColor(R.color.colorMain));
+//            label.setWidth(R.dimen.size_90);
+//            label.setHeight(R.dimen.size_50);
+        } else {
+//            helper.setChecked(R.id.rg_check,false);
+//            label.setWidth(R.dimen.size_70);
+//            label.setHeight(R.dimen.size_30);
+            layoutParams.width = 140;
+            layoutParams.height = 70;
+            label.setLayoutParams(layoutParams);
+            label.setTextColor(mContext.getResources().getColor(R.color.textGray));
+        }
+
+    }
+
+    public void setSelectPosition(int position) {
+        this.selectPosition = position;
+        notifyDataSetChanged();
+    }
+}

RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/adapter/SelectedEventsAdapter.java

+package com.rv.home.rv.module.ui.main.home.adapter;
+
+import android.widget.ImageView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.frame.base.glide.GlideManager;
+import com.ruiwenliu.wrapper.util.BaseGlideHolder;
+import com.rv.home.R;
+
+public class SelectedEventsAdapter extends BaseQuickAdapter<String, BaseGlideHolder> {
+
+    public SelectedEventsAdapter() {
+        super(R.layout.rv_item_selected_events);
+    }
+
+    @Override
+    protected void convert(BaseGlideHolder helper, String string) {
+        GlideManager.getInstance(mContext).loadImage(string,  (ImageView)helper.getView(R.id.iv_activity));
+    }
+}

RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/bean/DrivingListBean.java

@@ -107,6 +107,7 @@ public class DrivingListBean extends BaseBean{
             private String fimg;
             private int updateTime;
             private int isdel;
+            private boolean check;
 
             public int getId() {
                 return id;
@@ -187,6 +188,14 @@ public class DrivingListBean extends BaseBean{
             public void setIsdel(int isdel) {
                 this.isdel = isdel;
             }
+
+            public boolean isCheck() {
+                return check;
+            }
+
+            public void setCheck(boolean check) {
+                this.check = check;
+            }
         }
     }
 }

RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/HaveToTravelFragment.java

@@ -80,7 +80,7 @@ public class HaveToTravelFragment extends BaseFragment<CommonPresenter>implement
             @Override
             public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
                 int id = view.getId();
-                if (id == R.id.tv_process){
+                if (id == R.id.tv_rvtour_label){
                     OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
                     startActivity(PickUpTheCarQRCodeActivity.getIntent(_mActivity,dataBean));
                 }

RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/OrderListActivity.java

@@ -8,7 +8,9 @@ import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
+import com.alibaba.android.arouter.facade.annotation.Route;
 import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.frame.base.url.Constance;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseFragment;
 import com.rv.home.R;
@@ -26,6 +28,7 @@ import java.util.List;
 
 import butterknife.BindView;
 
+@Route(path = Constance.ACTIVITY_URL_ORDERLIST)
 public class OrderListActivity extends BaseStatusActivity<PickerPresenter> {
 
 

RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/bean/OrderListBean.java

@@ -118,6 +118,7 @@ public class OrderListBean extends BaseBean {
              */
 
             private String no;
+            private int id;
             private int type;
             @SerializedName("status")
             private int statusX;
@@ -138,6 +139,14 @@ public class OrderListBean extends BaseBean {
             private int detailId;
             private String name;
 
+            public int getId() {
+                return id;
+            }
+
+            public void setId(int id) {
+                this.id = id;
+            }
+
             public String getName() {
                 return name;
             }

RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/bean/ScoreBean.java

+package com.rv.home.rv.module.ui.main.home.order.bean;
+
+public class ScoreBean {
+    private String score;
+    private String vehicleScoreType;
+
+    public String getScore() {
+        return score;
+    }
+
+    public void setScore(String score) {
+        this.score = score;
+    }
+
+    public String getVehicleScoreType() {
+        return vehicleScoreType;
+    }
+
+    public void setVehicleScoreType(String vehicleScoreType) {
+        this.vehicleScoreType = vehicleScoreType;
+    }
+}

RvHome/src/main/res/drawable/selector_home_item_button_left.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/icon_home_item_button_left" android:state_selected="true"/>
+    <item android:drawable="@drawable/icon_home_item_button" android:state_selected="false"/>
+</selector>
\ No newline at end of file

RvHome/src/main/res/drawable/selector_home_item_button_right.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/icon_home_item_button_right" android:state_selected="true"/>
+    <item android:drawable="@drawable/icon_home_item_button" android:state_selected="false"/>
+</selector>
\ No newline at end of file

RvHome/src/main/res/drawable/selector_rv_button_home_type.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:topRightRadius="@dimen/size_80"/>
+
+    <solid android:color="@color/colorWrite" />
+</shape>
\ No newline at end of file

RvHome/src/main/res/drawable/shape_rv_bg_crimson_xiao_fang.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners
+        android:topLeftRadius="30dp"
+        android:topRightRadius="30dp"
+        android:bottomRightRadius="30dp"/>
+    <solid android:color="@color/gray_F96363" />
+</shape>
\ No newline at end of file

RvHome/src/main/res/drawable/shape_rv_bg_dark_yellow.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="30dp" />
+    <solid android:color="@color/gray_FFB74B" />
+</shape>
\ No newline at end of file

RvHome/src/main/res/drawable/shape_rv_button_gray.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="8dp" />
+    <solid android:color="@color/colorLine" />
+</shape>
\ No newline at end of file

RvHome/src/main/res/drawable/shape_rv_dark_gray_circle.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="@dimen/size_30" />
+    <solid android:color="@color/colorWrite" />
+    <stroke
+        android:width="@dimen/size_1"
+        android:color="@color/colorGray" />
+</shape>
\ No newline at end of file

RvHome/src/main/res/drawable/shape_rv_textview_home_translucent.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="@dimen/size_8"/>
+    <solid android:color="@color/gray_50ffffff" />
+</shape>
\ No newline at end of file

RvHome/src/main/res/layout/rv_act_evaluation.xml

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:ratingbar="http://schemas.android.com/apk/res-auto"
     android:background="@color/colorWrite"
     tools:context=".rv.module.ui.main.home.order.EvaluationActivity">
 
@@ -71,15 +72,24 @@
             android:textColor="@color/textGray"
             android:textSize="@dimen/text_14" />
 
-        <RatingBar
-            android:id="@+id/rating_serve_bar"
-            style="@style/fiveRatingBar"
+        <com.frame.base.view.StarBar
+            android:id="@+id/starbar1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/tv_context"
             android:layout_marginLeft="@dimen/size_20"
-            android:numStars="5"
-            android:rating="0" />
+            ratingbar:starEmpty="@drawable/rv_vehicle_icon_star_gray"
+            ratingbar:starFill="@drawable/rv_vehicle_icon_star_light"
+            ratingbar:starDistance="5dp"
+            ratingbar:starCount="5"
+            ratingbar:starSize="@dimen/size_20"/>
+
+        <TextView
+            android:id="@+id/tv_hint1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="@dimen/text_10"
+            android:layout_marginLeft="@dimen/size_15"
+            android:textColor="@color/text_Gray" />
     </LinearLayout>
 
     <LinearLayout
@@ -99,15 +109,24 @@
             android:textColor="@color/textGray"
             android:textSize="@dimen/text_14" />
 
-        <RatingBar
-            android:id="@+id/rating_driving_bar"
-            style="@style/fiveRatingBar"
+        <com.frame.base.view.StarBar
+            android:id="@+id/starbar2"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/size_16"
-            android:layout_below="@id/tv_context"
+            android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/size_20"
-            android:numStars="5"
-            android:rating="0" />
+            ratingbar:starEmpty="@drawable/rv_vehicle_icon_star_gray"
+            ratingbar:starFill="@drawable/rv_vehicle_icon_star_light"
+            ratingbar:starDistance="5dp"
+            ratingbar:starCount="5"
+            ratingbar:starSize="@dimen/size_20"/>
+
+        <TextView
+            android:id="@+id/tv_hint2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="@dimen/text_10"
+            android:layout_marginLeft="@dimen/size_15"
+            android:textColor="@color/text_Gray" />
     </LinearLayout>
 
     <LinearLayout
@@ -127,15 +146,24 @@
             android:textColor="@color/textGray"
             android:textSize="@dimen/text_14" />
 
-        <RatingBar
-            android:id="@+id/rating_bar"
-            style="@style/fiveRatingBar"
+        <com.frame.base.view.StarBar
+            android:id="@+id/starbar3"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/size_16"
-            android:layout_below="@id/tv_context"
+            android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/size_20"
-            android:numStars="5"
-            android:rating="0" />
+            ratingbar:starEmpty="@drawable/rv_vehicle_icon_star_gray"
+            ratingbar:starFill="@drawable/rv_vehicle_icon_star_light"
+            ratingbar:starDistance="5dp"
+            ratingbar:starCount="5"
+            ratingbar:starSize="@dimen/size_20"/>
+
+        <TextView
+            android:id="@+id/tv_hint3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="@dimen/text_10"
+            android:layout_marginLeft="@dimen/size_15"
+            android:textColor="@color/text_Gray" />
     </LinearLayout>
 
     <RelativeLayout

RvHome/src/main/res/values/styles.xml

@@ -15,11 +15,11 @@
     <!--       <item   name="android:minHeight">20dp</item>-->
     <!--       <item   name="android:maxHeight">20dp</item>-->
     <!--</style>-->
-    <style name="fiveRatingBar" parent="@android:style/Widget.RatingBar">
+   <!-- <style name="fiveRatingBar" parent="@android:style/Widget.RatingBar">
           <item name="android:progressDrawable">@drawable/layer_stars</item>
           <item name="android:minHeight">@dimen/size_15</item>
         <item name="android:minWidth">@dimen/size_15</item>
-    </style>
+    </style>-->
 
 
 

RvMine/build.gradle

@@ -11,6 +11,15 @@ android {
         versionCode 1
         versionName "1.0"
 
+
+        javaCompileOptions {
+
+            annotationProcessorOptions {
+
+                arguments = [moduleName :project.getName() ]
+
+            } }
+
     }
 
     buildTypes {
@@ -23,8 +32,11 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    api 'com.jakewharton:butterknife:8.8.1'
+    api 'com.jakewharton:butterknife:9.0.0-rc1'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0-rc1'
+    implementation 'com.github.zcweng:switch-button:0.0.3@aar'
+    implementation 'com.contrarywind:Android-PickerView:3.2.7'
     api project(':RvHome')
+    annotationProcessor'com.alibaba:arouter-compiler:1.1.4'
 }

RvMine/src/main/java/com/rv/rvmine/MineActivity.java

@@ -12,11 +12,13 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.base.utils.tools.android.IntentUtil;
 import com.base.utils.ui.image.round.RoundImageView;
 import com.frame.base.browse.ActivityImageBrowseInt;
 import com.frame.base.bus.RxBus;
 import com.frame.base.glide.GlideManager;
+import com.frame.base.url.Constance;
 import com.frame.rv.ModuleEventUtil;
 import com.frame.rv.OnModuleEventListener;
 import com.frame.rv.config.RvFrameConfig;

RvMine/src/main/java/com/rv/rvmine/adapter/CollectionAdapter.java

+package com.rv.rvmine.adapter;
+
+import android.widget.CompoundButton;
+import android.widget.ImageView;
+
+import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.chad.library.adapter.base.entity.MultiItemEntity;
+import com.ruiwenliu.wrapper.util.BaseGlideHolder;
+import com.ruiwenliu.wrapper.util.TimeManager;
+import com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean;
+import com.rv.rvmine.R;
+import com.rv.rvmine.bean.CollectionListBean;
+import com.rv.rvmine.bean.TravelerListBean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 收藏人列表
+ */
+
+public class CollectionAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity, BaseGlideHolder> {
+    public static final int TYPE_COLLECTION_CARRENTAL = 1;
+    public static final int TYPE_COLLECTION_TRAVEL = 2;
+
+    public CollectionAdapter(List<MultiItemEntity> data) {
+        super(data);
+        addItemType(TYPE_COLLECTION_CARRENTAL, R.layout.rv_item_mine_collection_car_rental);
+        addItemType(TYPE_COLLECTION_TRAVEL, R.layout.rv_item_mine_collection_travel);
+    }
+
+    @Override
+    protected void convert(BaseGlideHolder helper, MultiItemEntity item) {
+        switch (helper.getItemViewType()) {
+            case TYPE_COLLECTION_CARRENTAL:
+                CollectionListBean.DataBeanX.DataBean dataBean = (CollectionListBean.DataBeanX.DataBean) item;
+                if (dataBean == null) {
+                    return;
+                }
+                helper.setText(R.id.tv_car_name,dataBean.getName());
+                helper.setText(R.id.tv_car_price, String.format("￥%1$s", dataBean.getPrice()));
+                helper.loadRoundImage(mContext, dataBean.getCover(), (ImageView) helper.getView(R.id.iv_car_icon), 10);
+
+                break;
+            case TYPE_COLLECTION_TRAVEL:
+                CollectionListBean.DataBeanX.DataBean dataBean2 = (CollectionListBean.DataBeanX.DataBean) item;
+                if (dataBean2 == null) {
+                    return;
+                }
+
+                helper.setText(R.id.tv_tour_name,dataBean2.getName());
+                helper.setText(R.id.tv_tour_price, String.format("￥%1$s", dataBean2.getPrice()));
+                helper.loadRoundImage(mContext, dataBean2.getCover(), (ImageView) helper.getView(R.id.iv_tour_icon), 10);
+                break;
+        }
+    }
+    public void addNewData(CollectionListBean bean) {
+        mData.clear();
+        addData(bean.getData().getData());
+        notifyDataSetChanged();
+
+    }
+}

RvMine/src/main/java/com/rv/rvmine/bean/CollectionListBean.java

+package com.rv.rvmine.bean;
+
+import com.chad.library.adapter.base.entity.MultiItemEntity;
+import com.google.gson.annotations.SerializedName;
+import com.ruiwenliu.wrapper.base.BaseBean;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 收藏列表
+ */
+
+public class CollectionListBean extends BaseBean {
+
+
+    private DataBeanX data;
+    private boolean rel;
+
+    public DataBeanX getData() {
+        return data;
+    }
+
+    public void setData(DataBeanX data) {
+        this.data = data;
+    }
+
+    public boolean isRel() {
+        return rel;
+    }
+
+    public void setRel(boolean rel) {
+        this.rel = rel;
+    }
+
+    public static class DataBeanX {
+
+        private int totalCount;
+        private int totalPage;
+        private int pageNum;
+        private int pageSize;
+        private List<DataBean> data;
+
+        public int getTotalCount() {
+            return totalCount;
+        }
+
+        public void setTotalCount(int totalCount) {
+            this.totalCount = totalCount;
+        }
+
+        public int getTotalPage() {
+            return totalPage;
+        }
+
+        public void setTotalPage(int totalPage) {
+            this.totalPage = totalPage;
+        }
+
+        public int getPageNum() {
+            return pageNum;
+        }
+
+        public void setPageNum(int pageNum) {
+            this.pageNum = pageNum;
+        }
+
+        public int getPageSize() {
+            return pageSize;
+        }
+
+        public void setPageSize(int pageSize) {
+            this.pageSize = pageSize;
+        }
+
+        public List<DataBean> getData() {
+            return data;
+        }
+
+        public void setData(List<DataBean> data) {
+            this.data = data;
+        }
+
+        public static class DataBean implements MultiItemEntity,Serializable {
+
+            private int id;
+            private int userId;
+            private int type;
+            private int typeId;
+            private String name;
+            private String cover;
+            private double price;
+            private String unit;
+            private long crtTime;
+            private long updTime;
+            private int status;
+            private int isDel;
+
+
+            @Override
+            public int getItemType() {
+                return type;
+            }
+
+
+            public int getId() {
+                return id;
+            }
+
+            public void setId(int id) {
+                this.id = id;
+            }
+
+            public int getUserId() {
+                return userId;
+            }
+
+            public void setUserId(int userId) {
+                this.userId = userId;
+            }
+
+            public int getType() {
+                return type;
+            }
+
+            public void setType(int type) {
+                this.type = type;
+            }
+
+            public int getTypeId() {
+                return typeId;
+            }
+
+            public void setTypeId(int typeId) {
+                this.typeId = typeId;
+            }
+
+            public String getName() {
+                return name;
+            }
+
+            public void setName(String name) {
+                this.name = name;
+            }
+
+            public String getCover() {
+                return cover;
+            }
+
+            public void setCover(String cover) {
+                this.cover = cover;
+            }
+
+            public double getPrice() {
+                return price;
+            }
+
+            public void setPrice(double price) {
+                this.price = price;
+            }
+
+            public String getUnit() {
+                return unit;
+            }
+
+            public void setUnit(String unit) {
+                this.unit = unit;
+            }
+
+            public long getCrtTime() {
+                return crtTime;
+            }
+
+            public void setCrtTime(long crtTime) {
+                this.crtTime = crtTime;
+            }
+
+            public long getUpdTime() {
+                return updTime;
+            }
+
+            public void setUpdTime(long updTime) {
+                this.updTime = updTime;
+            }
+
+            public int getStatus() {
+                return status;
+            }
+
+            public void setStatus(int status) {
+                this.status = status;
+            }
+
+            public int getIsDel() {
+                return isDel;
+            }
+
+            public void setIsDel(int isDel) {
+                this.isDel = isDel;
+            }
+        }
+    }
+}

RvMine/src/main/java/com/rv/rvmine/personal/SuccessfulCertificationActivity.java

@@ -3,6 +3,9 @@ package com.rv.rvmine.personal;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.frame.base.url.Constance;
 import com.rv.rvmine.R2;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;

RvMine/src/main/java/com/rv/rvmine/traveler/CollectionActivity.java

@@ -2,22 +2,43 @@ package com.rv.rvmine.traveler;
 
 import android.content.Context;
 import android.content.Intent;
+import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.entity.MultiItemEntity;
+import com.frame.rv.config.RvFrameConfig;
+import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
+import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshView;
+import com.rv.home.rv.module.ApiConfig;
+import com.rv.home.rv.module.ui.main.home.bean.DrivingListBean;
+import com.rv.home.rv.module.ui.main.home.order.adapter.ForPaymentAdapter;
 import com.rv.rvmine.R2;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
 import com.rv.rvmine.R;
+import com.rv.rvmine.adapter.CollectionAdapter;
+import com.rv.rvmine.bean.CollectionListBean;
+import com.yuyife.okgo.OkGoUtil;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 import butterknife.BindView;
 
-public class CollectionActivity extends BaseStatusActivity<CommonPresenter> {
+public class CollectionActivity extends BaseStatusActivity<CommonPresenter> implements  BaseQuickAdapter.RequestLoadMoreListener  {
     @BindView(R2.id.recyclerView)
     RecyclerView recyclerView;
+    private int mPage;
+    private int countPage;
+
+    private CollectionAdapter collectionAdapter;
 
 
     public static Intent getIntent(Context context) {
@@ -33,15 +54,74 @@ public class CollectionActivity extends BaseStatusActivity<CommonPresenter> {
     @Override
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
           titleView.setTitle("收藏");
-    }
 
-    @Override
-    public void onShowResult(int requestType, BaseBean result) {
+        recyclerView.setLayoutManager(new LinearLayoutManager(mActivity));
+        collectionAdapter = new CollectionAdapter(new ArrayList<MultiItemEntity>());
+        collectionAdapter.setOnLoadMoreListener(this, recyclerView);
+        recyclerView.setAdapter(collectionAdapter);
+
 
     }
 
     @Override
     protected void loadData(Bundle savedInstanceState, Intent intent) {
         super.loadData(savedInstanceState, intent);
+        onRefresh();
     }
+
+    @Override
+    public void onShowResult(int requestType, BaseBean result) {
+        processData((CollectionListBean) result);
+    }
+
+    @Override
+    public void onLoadMoreRequested() {
+
+        if (mPage >= countPage) {
+            collectionAdapter.loadMoreEnd();
+        } else {
+            mPage++;
+            getDrivingList(mPage);
+        }
+    }
+
+
+    /**
+     * 刷新数据
+     */
+    private void onRefresh() {
+        mPage = 1;
+        getDrivingList(mPage);
+    }
+
+
+    /**
+     * 获取收藏列表
+     */
+    private void getDrivingList(int page) {
+        Map<String, Object> headMap = new LinkedHashMap<>();
+        if (OkGoUtil.getToken() != null)
+            headMap.put("Authorization", OkGoUtil.getToken());
+        Map<String, Object> map = new LinkedHashMap<>();
+        map.put("page", page);
+        mPresenter.getData(RvFrameConfig.ADMIN_POST, 0, ApiConfig.HTTP_URL_COLLECTONLIST, CollectionListBean.class, map,headMap, page == 1 ? true : false);
+    }
+
+
+    private void processData(CollectionListBean bean) {
+        if (mPage == 1) {
+            if (bean.getData().getTotalCount() == 0) {
+                collectionAdapter.setEmptyView(getEmptyView(recyclerView, -1, mActivity.getString(R.string.rv_driving_data_null)));
+                return;
+            }
+
+            countPage = bean.getData().getTotalPage();
+            collectionAdapter.addNewData(bean);
+            collectionAdapter.loadMoreComplete();
+        } else {
+            collectionAdapter.addData(bean.getData().getData());
+            collectionAdapter.loadMoreComplete();
+        }
+    }
+
 }

RvMine/src/main/java/com/rv/rvmine/traveler/SettingActivity.java

@@ -5,6 +5,9 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.frame.base.url.Constance;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.util.UtilsManager;

RvMine/src/main/res/layout/activity_collection.xml

 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+    android:id="@+id/refresh"
     android:layout_height="match_parent">
     <include layout="@layout/common_rv"/>
 </LinearLayout>
\ No newline at end of file

RvMine/src/main/res/layout/rv_item_mine_collection_car_rental.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="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/iv_car_icon"
+            android:layout_width="@dimen/size_120"
+            android:layout_height="@dimen/size_80"
+            android:layout_marginLeft="@dimen/size_15"
+            android:layout_marginTop="@dimen/size_10"
+            android:layout_marginBottom="@dimen/size_10"
+            android:scaleType="centerCrop"
+            android:src="@drawable/aa_ivava" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/size_10"
+            android:layout_marginRight="@dimen/size_15"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tv_car_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxLines="1"
+                android:text="大通自行式C型房车"
+                android:textColor="@color/colorMain"
+                android:textSize="@dimen/text_14" />
+
+            <TextView
+                android:id="@+id/tv_car_address"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/size_5"
+                android:maxLines="1"
+                android:text="东莞市松山湖欣新房车总部"
+                android:textColor="@color/textGray"
+                android:textSize="@dimen/text_10" />
+
+            <TextView
+                android:id="@+id/tv_car_deploy"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/size_3"
+                android:maxLines="1"
+                android:text="烧烤·麻将·微波炉·5"
+                android:textColor="@color/textGray"
+                android:textSize="@dimen/text_10" />
+
+            <TextView
+                android:id="@+id/tv_car_price"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/size_5"
+                android:maxLines="1"
+                android:text="¥3500/天"
+                android:textColor="@color/colorBg"
+                android:textSize="@dimen/text_14" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <include layout="@layout/common_line" />
+
+</LinearLayout>
\ No newline at end of file

RvMine/src/main/res/layout/rv_item_mine_collection_travel.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="wrap_content"
+    android:layout_marginTop="@dimen/size_10"
+    android:layout_marginBottom="@dimen/size_10"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/iv_tour_icon"
+            android:layout_width="@dimen/size_120"
+            android:layout_height="@dimen/size_80"
+            android:layout_marginLeft="@dimen/size_15"
+            android:scaleType="centerCrop"
+            android:src="@drawable/aa_ivava" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="@dimen/size_10"
+            android:layout_marginRight="@dimen/size_15"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tv_tour_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxLines="2"
+                android:text="大通自行式C型房车"
+                android:textColor="@color/colorMain"
+                android:textSize="@dimen/text_14" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/tv_tour_number_of_departures"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:textSize="@dimen/text_10"
+                    android:textColor="@color/textGray"
+                    android:text="20人待出发" />
+
+                <TextView
+                    android:id="@+id/tv_tour_price"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/colorBg"
+                    android:textSize="@dimen/text_14"
+                    android:text="¥5000/人" />
+
+            </LinearLayout>
+        </RelativeLayout>
+    </LinearLayout>
+
+    <include layout="@layout/common_line" />
+
+</LinearLayout>
\ No newline at end of file

RvTravel/build.gradle

@@ -18,6 +18,14 @@ android {
                 includeCompileClasspath = true
             }
         }
+
+        javaCompileOptions {
+
+            annotationProcessorOptions {
+
+                arguments = [moduleName :project.getName() ]
+
+            } }
     }
 
     buildTypes {
@@ -46,5 +54,6 @@ android {
         api 'com.jakewharton:butterknife:9.0.0-rc1'
         annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0-rc1'
         implementation 'com.github.zcweng:switch-button:0.0.3@aar'
+        annotationProcessor'com.alibaba:arouter-compiler:1.1.4'
     }
 }

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

 package com.rv.travel;
 
-import android.app.Activity;
 import android.content.Context;
+import android.widget.ImageView;
+import android.widget.Toast;
 
 import com.base.utils.tools.android.IntentUtil;
+import com.rv.travel.api.ApiUtil;
+import com.rv.travel.api.OnApiResponseCallback;
+import com.rv.travel.bean.BeanCheckCollection;
+import com.rv.travel.bean.BeanOrderPay;
+import com.rv.travel.bean.BeanRim;
 import com.rv.travel.fragment.TravelFragmentCommitOrder;
 import com.rv.travel.fragment.TravelWebFragment;
 import com.rv.travel.other.OtherClickListener;
@@ -12,15 +18,20 @@ import com.rv.travel.other.TravelFragmentActivity;
 
 public class GoOtherUtil {
     public static String travelDetailId = "0";
-
+    public static BeanRim mBean;
+    private static String isCollection = "0";  //0 没有收藏  1 收藏
+    private static String id;
     //去旅游详情
-    public static void goTravelDetailWeb(String id, Context context) {
-        GoOtherUtil.travelDetailId = id;
-        String url = "https://xxtest.upyuns.com/h5/appHtml/view/travelDetails.html?id=" + id;
+    public static void goTravelDetailWeb(final BeanRim bean, final Context context) {
+        GoOtherUtil.travelDetailId = bean.getId();
+        mBean = bean;
+        String url = "https://xxtest.upyuns.com/h5/appHtml/view/travelDetails.html?id=" + bean.getId();
         //TravelFragmentActivity.currentFragment = TravelWebFragment.getInstance(url);
         TravelFragmentActivity.currentFragment = TravelWebFragment.getInstance(url);
-        OtherOption otherOption = new OtherOption();
+        final OtherOption otherOption = new OtherOption();
         otherOption.setTitle("详情");
+        otherOption.setCollect(true);
+        otherOption.setShare(true);
         otherOption.setClickListener(new OtherClickListener() {
             @Override
             public void onBack() {
@@ -32,8 +43,55 @@ public class GoOtherUtil {
             public void onButton() {
 
             }
+
+            @Override
+            public void onButtonCollect(final ImageView buttonCollect) {
+                if ("1".equals(isCollection)) {
+                     ApiUtil.cancelCollection(id, "1", new OnApiResponseCallback<String, String>() {
+                         @Override
+                         public void done(String data, String errorMessage) {
+                             Toast.makeText(context, "取消收藏成功", Toast.LENGTH_SHORT).show();
+                             buttonCollect.setImageResource(R.drawable.travel_rv_collect);
+                             isCollection = "0";
+                         }
+                     });
+
+                }else {
+                    ApiUtil.addCollection("2", bean.getId(), bean.getName(), bean.getCover(), bean.getPrice(), bean.getUnit(), new OnApiResponseCallback<String, String>() {
+                        @Override
+                        public void done(String data, String errorMessage) {
+                            Toast.makeText(context, "收藏成功", Toast.LENGTH_SHORT).show();
+                            buttonCollect.setImageResource(R.drawable.home_icon_campsite_selected);
+                            isCollection = "1";
+                        }
+                    });
+
+                }
+            }
+
+            @Override
+            public void onButtonShare() {
+
+            }
         });
         TravelFragmentActivity.option = otherOption;
+
+
+        ApiUtil.getIsCollection(bean.getId(), new OnApiResponseCallback<BeanCheckCollection, String>() {
+            @Override
+            public void done(BeanCheckCollection data, String errorMessage) {
+                isCollection = data.getStatus();
+                 id = data.getId();
+                ImageView buttonCollect = otherOption.getLayout().buttonCollect;
+                if ("1".equals(data.getStatus())){
+                    buttonCollect.setImageResource(R.drawable.home_icon_campsite_selected);
+                }else {
+                    buttonCollect.setImageResource(R.drawable.travel_rv_collect);
+                }
+            }
+        });
+
+
         IntentUtil.startActivity(context, TravelFragmentActivity.class);
     }
 
@@ -45,13 +103,23 @@ public class GoOtherUtil {
         otherOption.setClickListener(new OtherClickListener() {
             @Override
             public void onBack() {
-                GoOtherUtil.goTravelDetailWeb(GoOtherUtil.travelDetailId, context);
+                GoOtherUtil.goTravelDetailWeb(GoOtherUtil.mBean, context);
             }
 
             @Override
             public void onButton() {
 
             }
+
+            @Override
+            public void onButtonCollect(ImageView buttonCollect) {
+
+            }
+
+            @Override
+            public void onButtonShare() {
+
+            }
         });
         TravelFragmentActivity.option = otherOption;
         IntentUtil.startActivity(context, TravelFragmentActivity.class);

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

@@ -7,6 +7,7 @@ import com.google.gson.reflect.TypeToken;
 import com.lzy.okgo.callback.StringCallback;
 import com.lzy.okgo.model.Response;
 import com.rv.travel.bean.BeanBanner;
+import com.rv.travel.bean.BeanCheckCollection;
 import com.rv.travel.bean.BeanHot;
 import com.rv.travel.bean.BeanOrderPay;
 import com.rv.travel.bean.BeanOrderResponse;
@@ -51,7 +52,6 @@ public class ApiUtil {
                 String token = OkGoUtil.getStringToJson(response.body(), "token");
                 OkGoUtil.setToken(token);
                 callback.done(true, OkGoUtil.getStringToJson(response.body(), ApiKey.MESSAGE));
-
             }
 
             @Override
@@ -491,7 +491,7 @@ public class ApiUtil {
 
 
     /**
-     *订单支付
+     * 订单支付
      */
     public static void payOrder(
             String orderNo,
@@ -540,4 +540,150 @@ public class ApiUtil {
             }
         });
     }
+
+
+    /**
+     * 添加收藏
+     */
+    public static void addCollection(
+            String type,
+            String typeId,
+            String name,
+            String cover,
+            String price,
+            String unit,
+            final OnApiResponseCallback<String, String> callback) {
+        Map<String, String> map = new HashMap<>();
+        map.put("unit", unit);
+        map.put("price", price);
+        map.put("cover", cover);
+        map.put("name", name);
+        map.put("typeId", typeId);
+        map.put("type", type);
+        String url = TravelApi.COMMIT_COLLECT_ADD;
+        OkGoUtil.postJson(url, map, new StringCallback() {
+            @Override
+            public void onSuccess(Response<String> response) {
+
+                LogUtil.e(ApiUtil.class, "onSuccess commitOrder:" + response.body());
+
+                if (callback == null) return;
+                String status = OkGoUtil.getStringToJson(response.body(), ApiKey.STATUS);
+                if (status == null) {
+                    callback.done(null, ApiKey.ERROR_NO_STATUS);
+                    return;
+                }
+                if (!status.equals(ApiKey.STATUS_200)) {
+                    callback.done(null, ApiKey.ERROR_PREFIX + "--status" + status + "--message" + OkGoUtil.getStringToJson(response.body(), ApiKey.MESSAGE));
+                    return;
+                }
+
+                JSONObject data = OkGoUtil.getJsonObjectToJson(response.body(), ApiKey.DATA);
+                String bean = null;
+                if (data != null) {
+                    bean = new Gson().fromJson(data.toString(), new TypeToken<String>() {
+                    }.getType());
+                }
+                callback.done(bean, null);
+            }
+
+            @Override
+            public void onError(Response<String> response) {
+                super.onError(response);
+                LogUtil.e(ApiUtil.class, "onError commitOrder:" + response.body());
+                LogUtil.e(ApiUtil.class, "onError commitOrder:" + response.message());
+                if (callback != null) {
+                    callback.done(null, response.message());
+                }
+            }
+        });
+    }
+
+
+    public static void getIsCollection(String id, final OnApiResponseCallback<BeanCheckCollection, String> callback) {
+        Map<String, String> map = new HashMap<>();
+        map.put("id",id);
+        map.put("type","2");
+        String url = TravelApi.COMMIT_COLLECT_IS;
+        OkGoUtil.getMap(url, map, new StringCallback() {
+            @Override
+            public void onSuccess(Response<String> response) {
+
+                LogUtil.e(ApiUtil.class, "onSuccess getBannerDataHot:" + response.body());
+                if (callback == null) return;
+                String status = OkGoUtil.getStringToJson(response.body(), ApiKey.STATUS);
+                if (status == null) {
+                    callback.done(null, ApiKey.ERROR_NO_STATUS);
+                    return;
+                }
+                if (!status.equals(ApiKey.STATUS_200)) {
+                    callback.done(null, ApiKey.ERROR_PREFIX + "--status" + status + "--message" + OkGoUtil.getStringToJson(response.body(), ApiKey.MESSAGE));
+                    return;
+                }
+
+                JSONObject data = OkGoUtil.getJsonObjectToJson(response.body(), ApiKey.DATA);
+                BeanCheckCollection bean = null;
+                if (data != null) {
+                    bean = new Gson().fromJson(data.toString(), new TypeToken<BeanCheckCollection>() {
+                    }.getType());
+                }
+                callback.done(bean, null);
+            }
+
+            @Override
+            public void onError(Response<String> response) {
+                super.onError(response);
+                LogUtil.e(ApiUtil.class, "onError getBannerDataHot:" + response.body());
+                LogUtil.e(ApiUtil.class, "onError getBannerDataHot:" + response.message());
+                if (callback != null) {
+                    callback.done(null, response.message());
+                }
+            }
+        });
+    }
+
+    /**
+     *取消收藏
+     */
+    public static void cancelCollection(
+            String id,
+            String status,
+            final OnApiResponseCallback<String, String> callback) {
+        Map<String, String> map = new HashMap<>();
+        map.put("id", id);
+        map.put("status", status);
+        String url = TravelApi.COMMIT_COLLECT_REMOVE;
+        OkGoUtil.postJson(url, map, new StringCallback() {
+            @Override
+            public void onSuccess(Response<String> response) {
+
+                LogUtil.e(ApiUtil.class, "onSuccess commitOrder:" + response.body());
+
+                if (callback == null) return;
+                String status = OkGoUtil.getStringToJson(response.body(), ApiKey.STATUS);
+                if (status == null) {
+                    callback.done(null, ApiKey.ERROR_NO_STATUS);
+                    return;
+                }
+                if (!status.equals(ApiKey.STATUS_200)) {
+                    callback.done(null, ApiKey.ERROR_PREFIX + "--status" + status + "--message" + OkGoUtil.getStringToJson(response.body(), ApiKey.MESSAGE));
+                    return;
+                }
+
+                String data = OkGoUtil.getStringToJson(response.body(), ApiKey.DATA);
+                callback.done(data, null);
+            }
+
+            @Override
+            public void onError(Response<String> response) {
+                super.onError(response);
+                LogUtil.e(ApiUtil.class, "onError commitOrder:" + response.body());
+                LogUtil.e(ApiUtil.class, "onError commitOrder:" + response.message());
+                if (callback != null) {
+                    callback.done(null, response.message());
+                }
+            }
+        });
+    }
+
 }

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

@@ -22,4 +22,10 @@ public interface TravelApi extends RvFrameConfig {
     String QUERY_TRAVEL_MONEY_DETAIL = HOST + "/api/order/orderTour/calculate-price";
     //订单支付
     String COMMIT_ORDER_PAY = HOST + "/api/order/baseOrder/pay";
+    //添加收藏
+    String COMMIT_COLLECT_ADD = HOST + "/api/admin/app/user/collect/add";
+    //查看是否已经收藏
+    String COMMIT_COLLECT_IS = HOST + "/api/admin/app/user/collect";
+    //取消收藏
+    String COMMIT_COLLECT_REMOVE = HOST + "/api/admin/app/user/collect/remove";
 }

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

+package com.rv.travel.bean;
+
+public class BeanCheckCollection {
+    private String id;
+    private String status;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+}

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

@@ -275,7 +275,7 @@ public class TravelFragmentCommitOrder extends BaseFragment {
 //                        showToast("333333");
 //                        if (baseContext.getClass().equals(TravelFragmentCommitOrder.class)) {
 //                            startActivity(OrderListActivity.getIntent(getActivity(), 0));
-//                        ARouter.getInstance().build(Constance.ACTIVITY_URL_ORDERLIST).navigation();
+                        ARouter.getInstance().build(Constance.ACTIVITY_URL_ORDERLIST).navigation();
 //                        getActivity().finish();
 //                        }
                     }

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

@@ -131,7 +131,7 @@ public class TravelFragmentHotType extends BaseFragment {
         adapterRim.setItemRootClickListener(new AdapterRim.OnItemRootClickListener() {
             @Override
             public void onItemClick(BeanRim bean) {
-                GoOtherUtil.goTravelDetailWeb(bean.getId(), baseContext);
+                GoOtherUtil.goTravelDetailWeb(bean, baseContext);
             }
         });
         final LinearLayoutManager linearLayoutManager = new LinearLayoutManager(baseContext);

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

@@ -159,7 +159,7 @@ public class TravelFragmentMain extends BaseFragment {
         adapterRim.setItemRootClickListener(new AdapterRim.OnItemRootClickListener() {
             @Override
             public void onItemClick(BeanRim bean) {
-                GoOtherUtil.goTravelDetailWeb(bean.getId(),baseContext);
+                GoOtherUtil.goTravelDetailWeb(bean,baseContext);
             }
         });
         final LinearLayoutManager linearLayoutManager = new LinearLayoutManager(baseContext);

RvTravel/src/main/java/com/rv/travel/other/OtherClickListener.java

 package com.rv.travel.other;
 
+import android.widget.ImageView;
+
 import java.io.Serializable;
 
 public abstract class OtherClickListener implements Serializable {
     public abstract void onBack();
 
     public abstract void onButton();
+
+    public abstract void onButtonCollect(ImageView buttonCollect);
+
+    public abstract void onButtonShare();
 }

RvTravel/src/main/java/com/rv/travel/other/OtherOption.java

 package com.rv.travel.other;
 
+import com.frame.rv.widget.BaseTitleBarLayout;
+
 import java.io.Serializable;
 
 public class OtherOption implements Serializable {
@@ -7,6 +9,9 @@ public class OtherOption implements Serializable {
     private String title;
     private String buttonText;
     private OtherClickListener clickListener;
+    private boolean isCollect;
+    private boolean isShare;
+    private BaseTitleBarLayout layout;
 
     public String getTitle() {
         return title;
@@ -32,4 +37,27 @@ public class OtherOption implements Serializable {
         this.clickListener = clickListener;
     }
 
+    public boolean isCollect() {
+        return isCollect;
+    }
+
+    public void setCollect(boolean collect) {
+        isCollect = collect;
+    }
+
+    public boolean isShare() {
+        return isShare;
+    }
+
+    public void setShare(boolean share) {
+        isShare = share;
+    }
+
+    public BaseTitleBarLayout getLayout() {
+        return layout;
+    }
+
+    public void setLayout(BaseTitleBarLayout layout) {
+        this.layout = layout;
+    }
 }

RvTravel/src/main/java/com/rv/travel/other/TravelFragmentActivity.java

@@ -66,7 +66,8 @@ public class TravelFragmentActivity extends BaseActivity {
 
     //设置参数
     private void applyOption() {
-        if (TravelFragmentActivity.option == null) return;
+        if (TravelFragmentActivity.option == null)
+            return;
         titleBarLayout.setTitleText(TravelFragmentActivity.option.getTitle());
         if (TravelFragmentActivity.option.getClickListener() == null) {
             titleBarLayout.setBackClickListener(null);
@@ -85,6 +86,25 @@ public class TravelFragmentActivity extends BaseActivity {
                     }
                 });
             }
+
+            if (TravelFragmentActivity.option.isCollect()){
+                TravelFragmentActivity.option.setLayout(titleBarLayout);
+                titleBarLayout.setButtonCollect(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        TravelFragmentActivity.option.getClickListener().onButtonCollect(titleBarLayout.buttonCollect);
+                    }
+                });
+            }
+
+            if (TravelFragmentActivity.option.isShare()){
+                titleBarLayout.setButtonShare(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        TravelFragmentActivity.option.getClickListener().onButtonShare();
+                    }
+                });
+            }
         }
 
     }

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

@@ -34,6 +34,8 @@
     <color name="gray_50ffffff">#50ffffff</color>
     <color name="gray_707070">#707070</color>
     <color name="gray_50000000">#50000000</color>
+    <color name="gray_EEEEEE">#EEEEEE</color>
+    <color name="gray_ba242525">#ba242525</color>
 
 
     <!--end-->

RvWrapper/src/main/res/values/dimens.xml

@@ -39,6 +39,8 @@
     <dimen name="size_100">100dp</dimen>
     <dimen name="size_110">100dp</dimen>
     <dimen name="size_120">120dp</dimen>
+    <dimen name="size_130">130dp</dimen>
+    <dimen name="size_140">140dp</dimen>
     <dimen name="size_150">150dp</dimen>
     <dimen name="size_170">170dp</dimen>
     <dimen name="size_180">180dp</dimen>

settings.gradle

 //include ':WXPay'
-include ':RvFrame'
+include ':RvFrame', ':module_tourism'
 include ':RvTravel'
 include ':RvClient'
 include ':RvWrapper'