bug修复

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/HomeFragment.java

@@ -430,10 +430,9 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
     }
 
     private void getData() {
-        List<String> list = new ArrayList<>();
-        for (int i = 0; i < 5; i++) {
-            list.add("https://xxtest.upyuns.com/image/app/ENRq748FQTq86R8R77J88YEWhnPeZ3.png");
-        }
+        List<Integer> list = new ArrayList<>();
+        list.add(R.drawable.aaa1);
+        list.add(R.drawable.aaa2);
         mActivityAdapter.setNewData(list);
 //        mRvEnthusiast.setNewData(list);
     }
@@ -575,13 +574,13 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
 //                                if (getSwitchType == 0) {
 //                                    startActivityForResult(SelectShopActivity.getIntent(mActivity, 1,"",getCity.equals(nowCity) && mLatLng!=null?mLatLng.latitude:0,getCity.equals(nowCity)&& mLatLng!=null?mLatLng.longitude:0), TYPE_REQUEST_SHOP);
 //                                } else {
-            startActivityForResult(SelectLocationActivity.getIntent(getContext(), 1, getCity,0, latLatitude, lonLongitude, nowCity,0), TYPE_REQUEST_ADDRESS);
+            startActivityForResult(SelectLocationActivity.getIntent(getContext(), 1, getCity, 0, latLatitude, lonLongitude, nowCity, 0), TYPE_REQUEST_ADDRESS);
         } else if (id == R.id.tv_out_address) {
             String outCity = headTvOutCity.getText().toString().trim();
 //                                if (outSwitchType == 0) {
 //                                    startActivityForResult(SelectShopActivity.getIntent(mActivity, 2,"",outCity.equals(nowCity)&& mLatLng!=null?mLatLng.latitude:0,outCity.equals(nowCity)&& mLatLng!=null?mLatLng.longitude:0), TYPE_REQUEST_SHOP);
 //                                } else {
-            startActivityForResult(SelectLocationActivity.getIntent(getContext(), 2, outCity,0, outLatitude, outLongitude, nowCity,0), TYPE_REQUEST_ADDRESS);
+            startActivityForResult(SelectLocationActivity.getIntent(getContext(), 2, outCity, 0, outLatitude, outLongitude, nowCity, 0), TYPE_REQUEST_ADDRESS);
         } else if (id == R.id.ll_item_select_data) {
             //选择日期
             ARouter.getInstance()
@@ -965,16 +964,12 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
         dataBean.setDayNum(Integer.valueOf(day + ""));
         dataBean.setStartCityName(starCity);
         dataBean.setStartAddr(starAddress);
-        try {
-            dataBean.setStartTime(TimeManager.dateToStamp(getTime));
-            dataBean.setEndTime(TimeManager.dateToStamp(outTime));
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
+        dataBean.setStartTime(DateUtils.StringToTimeMillis2(getTime));
+        dataBean.setEndTime(DateUtils.StringToTimeMillis2(outTime));
         dataBean.setEndCityName(endCity);
         dataBean.setEndAddr(endAddress);
         dataBean.setDriverType(2);
-        startActivity(CarRentalListActivity.getIntent(getContext(), latLatitude, lonLongitude,outLatitude,outLongitude, false, dataBean, startTime, endTime));
+        startActivity(CarRentalListActivity.getIntent(getContext(), latLatitude, lonLongitude, outLatitude, outLongitude, false, dataBean, startTime, endTime));
     }
 
 

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

@@ -7,14 +7,15 @@ import com.ruiwenliu.wrapper.util.BaseGlideHolder;
 import com.ruiwenliu.wrapper.util.glide.GlideManager;
 import com.rv.home.R;
 
-public class SelectedEventsAdapter extends BaseQuickAdapter<String, BaseGlideHolder> {
+public class SelectedEventsAdapter extends BaseQuickAdapter<Integer, BaseGlideHolder> {
 
     public SelectedEventsAdapter() {
         super(R.layout.rv_item_selected_events);
     }
 
     @Override
-    protected void convert(BaseGlideHolder helper, String string) {
-        GlideManager.getInstance(mContext).loadRoundImage(string,  (ImageView)helper.getView(R.id.iv_activity),6);
+    protected void convert(BaseGlideHolder helper, Integer integer) {
+//        GlideManager.getInstance(mContext).loadRoundImage(string,  (ImageView)helper.getView(R.id.iv_activity),6);
+        helper.setImageDrawable(R.id.iv_activity,mContext.getResources().getDrawable(integer));
     }
 }

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/CompletedAdapter.java

@@ -7,6 +7,7 @@ import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
 import com.chad.library.adapter.base.entity.MultiItemEntity;
 import com.ruiwenliu.wrapper.util.BaseGlideHolder;
 import com.ruiwenliu.wrapper.util.TimeManager;
+import com.rv.component.utils.DateUtils;
 import com.rv.home.R;
 import com.rv.home.R2;
 import com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean;
@@ -48,9 +49,9 @@ public class CompletedAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                 helper.loadRoundImage(mContext, dataBean.getIcon(), (ImageView) helper.getView(R.id.iv_goods), 10);
                 helper.setText(R.id.tv_car_type, dataBean.getName());
                 if (dataBean.getOrderRentVehicleDetail() !=null) {
-                    helper.setText(R.id.tv_get_time, TimeManager.stampToDate(String.valueOf(dataBean.getOrderRentVehicleDetail().getStart_time())));
+                    helper.setText(R.id.tv_get_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getStart_time()));
                     helper.setText(R.id.tv_get_address, dataBean.getOrderRentVehicleDetail().getStart_addr());
-                    helper.setText(R.id.tv_out_time, TimeManager.stampToDate(String.valueOf(dataBean.getOrderRentVehicleDetail().getEnd_time())));
+                    helper.setText(R.id.tv_out_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getEnd_time()));
                     helper.setText(R.id.tv_out_address, dataBean.getOrderRentVehicleDetail().getEnd_addr());
                 }
                 helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean.getRealAmount()));
@@ -70,7 +71,7 @@ public class CompletedAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                 helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_completed));
                 helper.loadRoundImage(mContext, dataBean2.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 50);
                 helper.setText(R.id.tv_car_type, dataBean2.getName());
-                helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) +TimeManager.stampToDate2(String.valueOf( dataBean2.getOrderTourDetail().getStartTime())));
+                helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) +DateUtils.timestampToString1(dataBean2.getOrderTourDetail().getStartTime()));
                 helper.setText(R.id.tv_count_person, String.format("%1$s%2$s", mContext.getString(R.string.rv_to_person), dataBean2.getOrderTourDetail().getTotalNumber(), mContext.getString(R.string.rv_person)));
                 helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean2.getRealAmount()));
                 helper.setText(R.id.tv_camp_process, mContext.getString(R.string.rv_to_evaluation));

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/ForPaymentAdapter.java

@@ -9,6 +9,7 @@ import com.chad.library.adapter.base.entity.MultiItemEntity;
 import com.ruiwenliu.wrapper.util.BaseGlideHolder;
 import com.ruiwenliu.wrapper.util.TimeManager;
 import com.rv.component.utils.Cooker;
+import com.rv.component.utils.DateUtils;
 import com.rv.home.R;
 import com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean;
 import com.rv.home.rv.module.ui.main.home.order.view.MyTimerView;
@@ -57,9 +58,9 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
                 helper.loadRoundImage(mContext, dataBean.getIcon(), (ImageView) helper.getView(R.id.iv_goods), 10);
                 helper.setText(R.id.tv_car_type, dataBean.getName());
                 if (dataBean.getOrderRentVehicleDetail() != null) {
-                    helper.setText(R.id.tv_get_time, TimeManager.stampToDate(String.valueOf(dataBean.getOrderRentVehicleDetail().getStart_time())));
+                    helper.setText(R.id.tv_get_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getStart_time()));
                     helper.setText(R.id.tv_get_address, dataBean.getOrderRentVehicleDetail().getStart_addr());
-                    helper.setText(R.id.tv_out_time, TimeManager.stampToDate(String.valueOf(dataBean.getOrderRentVehicleDetail().getEnd_time())));
+                    helper.setText(R.id.tv_out_time,  DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getEnd_time()));
                     helper.setText(R.id.tv_out_address, dataBean.getOrderRentVehicleDetail().getEnd_addr());
                     helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean.getRealAmount()));
                 }
@@ -79,7 +80,7 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
                 helper.setText(R.id.tv_city, dataBean.getOrderTourDetail().getStartCityName());
                 helper.loadRoundImage(mContext, dataBean.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 10);
                 helper.setText(R.id.tv_car_type, dataBean.getName());
-                helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) + TimeManager.stampToDate2(String.valueOf(dataBean.getOrderTourDetail().getStartTime())));
+                helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) +  DateUtils.timestampToString1(dataBean.getOrderTourDetail().getStartTime()));
                 helper.setText(R.id.tv_count_person, String.format("%1$s%2$s", mContext.getString(R.string.rv_to_person), dataBean.getOrderTourDetail().getTotalNumber(), mContext.getString(R.string.rv_person)));
                 helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean.getRealAmount()));
                 helper.setText(R.id.tv_camp_process, mContext.getString(R.string.rv_to_pay_for));

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/HaveToTravelAdapter.java

@@ -7,6 +7,7 @@ import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
 import com.chad.library.adapter.base.entity.MultiItemEntity;
 import com.ruiwenliu.wrapper.util.BaseGlideHolder;
 import com.ruiwenliu.wrapper.util.TimeManager;
+import com.rv.component.utils.DateUtils;
 import com.rv.home.R;
 import com.rv.home.R2;
 import com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean;
@@ -48,9 +49,9 @@ public class HaveToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEnti
                 helper.loadRoundImage(mContext,dataBean.getIcon(), (ImageView) helper.getView(R.id.iv_goods),10);
                 helper.setText(R.id.tv_car_type,dataBean.getName());
                 if (dataBean.getOrderRentVehicleDetail() !=null) {
-                    helper.setText(R.id.tv_get_time, TimeManager.stampToDate(String.valueOf(dataBean.getOrderRentVehicleDetail().getStart_time())));
+                    helper.setText(R.id.tv_get_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getStart_time()));
                     helper.setText(R.id.tv_get_address, dataBean.getOrderRentVehicleDetail().getStart_addr());
-                    helper.setText(R.id.tv_out_time, TimeManager.stampToDate(String.valueOf(dataBean.getOrderRentVehicleDetail().getEnd_time())));
+                    helper.setText(R.id.tv_out_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getEnd_time()));
                     helper.setText(R.id.tv_out_address, dataBean.getOrderRentVehicleDetail().getEnd_addr());
                 }
                 helper.setText(R.id.tv_price,String.format("¥%1$s",dataBean.getRealAmount()));
@@ -70,7 +71,7 @@ public class HaveToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEnti
                 helper.setText(R.id.tv_order_state,mContext.getString(R.string.rv_order_have_travel));
                 helper.loadRoundImage(mContext,dataBean2.getPicture(), (ImageView) helper.getView(R.id.iv_goods),50);
                 helper.setText(R.id.tv_car_type,dataBean2.getName());
-                helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) +TimeManager.stampToDate2(String.valueOf( dataBean2.getOrderTourDetail().getStartTime())));
+                helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) +DateUtils.timestampToString1( dataBean2.getOrderTourDetail().getStartTime()));
                 helper.setText(R.id.tv_count_person, String.format("%1$s%2$s", mContext.getString(R.string.rv_to_person), dataBean2.getOrderTourDetail().getTotalNumber(), mContext.getString(R.string.rv_person)));
                 helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean2.getRealAmount()));
                 helper.setVisible(R.id.tv_camp_process,false);

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/OrderListAdapter.java

@@ -9,6 +9,7 @@ import com.chad.library.adapter.base.entity.MultiItemEntity;
 import com.ruiwenliu.wrapper.util.BaseGlideHolder;
 import com.ruiwenliu.wrapper.util.TimeManager;
 import com.rv.component.utils.Cooker;
+import com.rv.component.utils.DateUtils;
 import com.rv.home.R;
 import com.rv.home.R2;
 import com.rv.home.rv.module.ui.main.home.order.bean.ForPaymentBean;
@@ -54,9 +55,9 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                 helper.loadRoundImage(mContext, dataBean.getIcon(), (ImageView) helper.getView(R.id.iv_goods), 10);
                 helper.setText(R.id.tv_car_type, dataBean.getName());
                 if (dataBean.getOrderRentVehicleDetail() != null) {
-                    helper.setText(R.id.tv_get_time, TimeManager.stampToDate(String.valueOf(dataBean.getOrderRentVehicleDetail().getStart_time())));
+                    helper.setText(R.id.tv_get_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getStart_time()));
                     helper.setText(R.id.tv_get_address, dataBean.getOrderRentVehicleDetail().getStart_addr());
-                    helper.setText(R.id.tv_out_time, TimeManager.stampToDate(String.valueOf(dataBean.getOrderRentVehicleDetail().getEnd_time())));
+                    helper.setText(R.id.tv_out_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getEnd_time()));
                     helper.setText(R.id.tv_out_address, dataBean.getOrderRentVehicleDetail().getEnd_addr());
                 }
                 helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean.getRealAmount()));
@@ -122,7 +123,7 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
 
                 helper.loadRoundImage(mContext, dataBean2.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 50);
                 helper.setText(R.id.tv_car_type, dataBean2.getName());
-                helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) + TimeManager.stampToDate2(String.valueOf(dataBean2.getOrderTourDetail().getStartTime())));
+                helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) + DateUtils.timestampToString1(dataBean2.getOrderTourDetail().getStartTime()));
                 helper.setText(R.id.tv_count_person, String.format("%1$s%2$s", mContext.getString(R.string.rv_to_person), dataBean2.getOrderTourDetail().getTotalNumber(), mContext.getString(R.string.rv_person)));
                 helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean2.getRealAmount()));
 

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/ToTravelAdapter.java

@@ -7,6 +7,7 @@ import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
 import com.chad.library.adapter.base.entity.MultiItemEntity;
 import com.ruiwenliu.wrapper.util.BaseGlideHolder;
 import com.ruiwenliu.wrapper.util.TimeManager;
+import com.rv.component.utils.DateUtils;
 import com.rv.home.R;
 import com.rv.home.R2;
 import com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean;
@@ -48,9 +49,9 @@ public class ToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                 helper.loadRoundImage(mContext, dataBean.getIcon(), (ImageView) helper.getView(R.id.iv_goods), 10);
                 helper.setText(R.id.tv_car_type, dataBean.getName());
                 if (dataBean.getOrderRentVehicleDetail() != null) {
-                    helper.setText(R.id.tv_get_time, TimeManager.stampToDate(String.valueOf(dataBean.getOrderRentVehicleDetail().getStart_time())));
+                    helper.setText(R.id.tv_get_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getStart_time()));
                     helper.setText(R.id.tv_get_address, dataBean.getOrderRentVehicleDetail().getStart_addr());
-                    helper.setText(R.id.tv_out_time, TimeManager.stampToDate(String.valueOf(dataBean.getOrderRentVehicleDetail().getEnd_time())));
+                    helper.setText(R.id.tv_out_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getEnd_time()));
                     helper.setText(R.id.tv_out_address, dataBean.getOrderRentVehicleDetail().getEnd_addr());
                 }
                 helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean.getRealAmount()));
@@ -70,7 +71,7 @@ public class ToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                 helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_to_travel));
                 helper.loadRoundImage(mContext, dataBean2.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 50);
                 helper.setText(R.id.tv_car_type, dataBean2.getName());
-                helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) +TimeManager.stampToDate2(String.valueOf( dataBean2.getOrderTourDetail().getStartTime())));
+                helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) +DateUtils.timestampToString1( dataBean2.getOrderTourDetail().getStartTime()));
                 helper.setText(R.id.tv_count_person, String.format("%1$s%2$s", mContext.getString(R.string.rv_to_person), dataBean2.getOrderTourDetail().getTotalNumber(), mContext.getString(R.string.rv_person)));
                 helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean2.getRealAmount()));
                 helper.setText(R.id.tv_camp_process, mContext.getString(R.string.tv_boarding));

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

@@ -653,8 +653,8 @@ public class OrderListBean extends BaseBean {
                 private String orderId;
                 private String crtTime;//": 1560163254063,
                 private String updTime;//": 1560163254063,
-                private String startTime;//": 1560152144000,
-                private String endTime;//": 1560324944000,
+                private long startTime;//": 1560152144000,
+                private long endTime;//": 1560324944000,
                 private String startAddr;//": "东土",
                 private String endAddr;//": "西天3",
                 private String tourUserIds;//": "4,5",
@@ -703,19 +703,19 @@ public class OrderListBean extends BaseBean {
                     this.updTime = updTime;
                 }
 
-                public String getStartTime() {
+                public long getStartTime() {
                     return startTime;
                 }
 
-                public void setStartTime(String startTime) {
+                public void setStartTime(long startTime) {
                     this.startTime = startTime;
                 }
 
-                public String getEndTime() {
+                public long getEndTime() {
                     return endTime;
                 }
 
-                public void setEndTime(String endTime) {
+                public void setEndTime(long endTime) {
                     this.endTime = endTime;
                 }
 

module_mine/src/main/java/com/rv/rvmine/traveler/AboutUsActivity.java

@@ -2,14 +2,21 @@ package com.rv.rvmine.traveler;
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.view.View;
 
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.frame.base.url.Constance;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.weight.TitleView;
+import com.rv.home.rv.module.ApiConfig;
 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.R2;
+
+import butterknife.ButterKnife;
+import butterknife.OnClick;
 
 /**
  * 关于我们
@@ -35,4 +42,16 @@ public class AboutUsActivity extends BaseStatusActivity<CommonPresenter> {
     public void onShowResult(int requestType, BaseBean result) {
 
     }
+
+    @OnClick({R2.id.rl_item_privacy_policy})
+    public void onViewClicked(View view) {
+        int id = view.getId();
+        if (id == R.id.rl_item_privacy_policy){
+            ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)
+                .withString("title", "隐私政策")
+                .withString("url", ApiConfig.HTTP_URL_CAR_TYPE_NOTICE)
+                .withInt("type", 19)
+                .navigation();
+        }
+    }
 }

module_mine/src/main/res/layout/activity_about_us.xml

@@ -89,6 +89,7 @@
         <include layout="@layout/common_line" />
 
         <RelativeLayout
+            android:id="@+id/rl_item_privacy_policy"
             android:layout_width="match_parent"
             android:layout_height="@dimen/size_50">