bug修复

OkGo/src/main/java/com/yuyife/okgo/OkGoUtil.java

@@ -44,6 +44,11 @@ public class OkGoUtil {
 
     final private static  String SP_KEY_USERINFO ="userinfo";
 
+    public static  String getYkId(){
+        String ykid = "yk_"+ (int)((Math.random()*9+1)*100000);
+        return ykid;
+    }
+
     //保存Token
     public static void setToken(String token) {
         if (application == null) return;

RvClient/build.gradle

@@ -8,8 +8,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         flavorDimensions "default"
-        versionCode 138
-        versionName "1.3.8"
+        versionCode 139
+        versionName "1.3.9"
         multiDexEnabled true
 
         //新版Gradle 是 implementation 为了兼容compile,写上这句话

RvClient/src/main/java/com/xxfc/rv/MainActivity.java

@@ -53,7 +53,7 @@ import butterknife.BindView;
 import butterknife.OnClick;
 
 
-public class MainActivity extends BaseActivity<CommonPresenter>{
+public class MainActivity extends BaseActivity<CommonPresenter> {
 
     //    @BindView(R2.id.pager_view_fragment)
     CustomScrollViewPager viewPager;
@@ -86,7 +86,6 @@ public class MainActivity extends BaseActivity<CommonPresenter>{
     private long exitTime = 0;
 
 
-
     private UpdateAppUtils updateAppUtils;
     private PromotionDialog promotionDialog;
 
@@ -162,10 +161,12 @@ public class MainActivity extends BaseActivity<CommonPresenter>{
                 final ActBean actBean = (ActBean) result;
                 if (actBean != null && actBean.isRel() && actBean.getData() != null && actBean.getData().size() > 0) {
                     final ActBean.Act act = actBean.getData().get(0);
+                    mPresenter.saveOnclick("0", String.valueOf(act.getId()));
                     promotionDialog = new PromotionDialog.Builder(this, new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {
                             promotionDialog.dismiss();
+                            mPresenter.saveOnclick("1", String.valueOf(act.getId()));
                             postActivityPopup(act.getId());
                             startActivity(WebViewActivity.getIntent(getApplicationContext(), act.getUrl(), act.getName()));
                         }

RvClient/src/main/java/com/xxfc/rv/WelcomeActivity.java

@@ -6,6 +6,7 @@ import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.view.View;
 
+import com.ruiwenliu.wrapper.SPConstance;
 import com.ruiwenliu.wrapper.base.BaseActivity;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.util.UtilsManager;
@@ -42,7 +43,6 @@ public class WelcomeActivity extends BaseActivity<CommonPresenter> {
         interval();
 
         LogUtil.d("start");
-
     }
 
     @Override

RvFrame/src/dev/java/com/frame/rv/config/RvFrameConfig.java

@@ -9,7 +9,7 @@ package com.frame.rv.config;
 
 public interface RvFrameConfig extends RvFrameConstant {
 //    String HOST = "https://xxtest.upyuns.com";
-//    String HOST = "http://10.1.37.192:8765";
+//    String HOST = "http://10.1.37.244:8765";
 //    String HOST = "http://10.1.37.245:10000";
     String HOST = "https://dev.dfangche.com";
     String HOST_H5_DETAIL = HOST;

RvFrame/src/main/java/com/frame/rv/config/CommonApi.java

+package com.frame.rv.config;
+
+public interface CommonApi extends RvFrameConfig{
+
+    //行为记录保存
+    public static String RVENTHUSIAST_APP_UNAUTH_SAVE = RvFrameConfig.HOST + "/api/user/behavior/customerBehaviorNotes/app/unauth/save";
+}

RvWrapper/src/main/java/com/ruiwenliu/wrapper/base/presenter/CommonPresenter.java

 package com.ruiwenliu.wrapper.base.presenter;
 
+import com.frame.rv.config.CommonApi;
 import com.frame.rv.config.RvFrameConfig;
+import com.ruiwenliu.wrapper.SPConstance;
+import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.presenter.MvpPresenter;
+import com.rv.component.utils.Cookie;
+import com.yuyife.okgo.OkGoUtil;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 /**
  * Created by Amuse
@@ -18,4 +26,76 @@ public class CommonPresenter extends MvpPresenter {
     public String getBaseUrl() {
         return RvFrameConfig.AUTH_POST;
     }
+
+    /**
+     * 行为记录保存
+     *
+     * @param type   行为类型
+     * @param typeid 活动id
+     */
+    public void saveOnclick(String type, String typeid) {
+        Map<String, Object> headMap = new LinkedHashMap<>();
+        headMap.put("Content-type", "application/json;charset=UTF-8");
+
+        String customertype = "";
+        String customerid = "";
+        if (OkGoUtil.getToken() != null) {
+            headMap.put("Authorization", OkGoUtil.getToken());
+            customertype = "2";  // 1是游客 2是用户
+        } else {
+            customerid = OkGoUtil.getYkId();
+            customertype = "1";
+        }
+        postBodyData(RvFrameConfig.HOST, 20, CommonApi.RVENTHUSIAST_APP_UNAUTH_SAVE, BaseBean.class, new SaveOnClick(customertype,customerid,type,typeid), headMap, false);
+    }
+
+
+    private class SaveOnClick {
+        private String customerType;
+        private String customerId;
+        private String type;
+        private String typeId;
+
+        public SaveOnClick(String customerType, String customerId, String type, String typeId) {
+            this.customerType = customerType;
+            this.customerId = customerId;
+            this.type = type;
+            this.typeId = typeId;
+        }
+
+        public String getCustomerType() {
+            return customerType;
+        }
+
+        public void setCustomerType(String customerType) {
+            this.customerType = customerType;
+        }
+
+        public String getCustomerId() {
+            return customerId;
+        }
+
+        public void setCustomerId(String customerId) {
+            this.customerId = customerId;
+        }
+
+        public String getType() {
+            return type;
+        }
+
+        public void setType(String type) {
+            this.type = type;
+        }
+
+        public String getTypeId() {
+            return typeId;
+        }
+
+        public void setTypeId(String typeId) {
+            this.typeId = typeId;
+        }
+    }
+
 }
+
+

RvWrapper/src/main/java/com/ruiwenliu/wrapper/base/presenter/PickerPresenter.java

@@ -156,8 +156,8 @@ public class PickerPresenter extends CommonPresenter {
         }
         intent.setDataAndType(uri, "image/*");
         intent.putExtra("crop", "true");
-        intent.putExtra("aspectX", 1);
-        intent.putExtra("aspectY", 1.8);
+        intent.putExtra("aspectX", 783);
+        intent.putExtra("aspectY", 1074);
         intent.putExtra("outputX",600);
         intent.putExtra("outputY", 950);
         intent.putExtra("scale", true);

build.gradle

@@ -50,7 +50,7 @@ ext {
     compileSdkVersion = 28
     buildToolsVersion = "28.0.3"
     minSdkVersion = 19
-    targetSdkVersion = 24
+    targetSdkVersion = 28
     versionCode = 1
     versionName = "1.0"
     supportVersion = '28.0.0'

module_discovery/src/main/java/com/xxfc/discovery/other/DetailPatActivity.java

@@ -30,12 +30,14 @@ import com.frame.base.url.Constance;
 import com.frame.rv.config.RvFrameConfig;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
+import com.ruiwenliu.wrapper.SPConstance;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.browse.ActivityImageBrowseUrl;
 import com.ruiwenliu.wrapper.util.um.CustomShareListener;
 import com.ruiwenliu.wrapper.util.um.ShareManager;
 import com.ruiwenliu.wrapper.weight.TitleView;
+import com.rv.component.utils.Cookie;
 import com.rv.component.utils.DateUtils;
 import com.umeng.socialize.bean.SHARE_MEDIA;
 import com.umeng.socialize.shareboard.SnsPlatform;
@@ -117,7 +119,8 @@ public class DetailPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
         initWeb();
 
         if (!TextUtils.isEmpty(title) && !TextUtils.isEmpty(iconUrl)) {
-            initShare(webUrl + "&shareType=app", title, "【滴房车】开着房车去旅行，一样的旅途，不一样的精彩", iconUrl);
+            String code = Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_CODE, "");
+            initShare(webUrl + "&shareType=app&code=" + code, title, "【滴房车】开着房车去旅行，一样的旅途，不一样的精彩", iconUrl);
         }
 
     }
@@ -265,14 +268,14 @@ public class DetailPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
         }
 
         @JavascriptInterface
-        public void showImage(int selectPosition,String imageJson) {
+        public void showImage(int selectPosition, String imageJson) {
             if (!TextUtil.isEmpty(imageJson)) {
                 List<String> imagesList = new Gson().fromJson(imageJson,
                         new TypeToken<List<String>>() {
                         }.getType());
                 Bundle bundle = new Bundle();
                 bundle.putInt(ActivityImageBrowseUrl.KEY_BACKGROUND, R.color.colorPrimary);
-                bundle.putInt(ActivityImageBrowseUrl.KEY_SELECTPOSITION,selectPosition);
+                bundle.putInt(ActivityImageBrowseUrl.KEY_SELECTPOSITION, selectPosition);
                 bundle.putStringArrayList(ActivityImageBrowseUrl.KEY_IMAGE, (ArrayList<String>) imagesList);
                 IntentUtil.startActivity(mActivity, ActivityImageBrowseUrl.class, bundle);
             }
@@ -304,11 +307,11 @@ public class DetailPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
                 if (snsPlatform.mShowWord.equals("生成海报")) {
                     ARouter.getInstance()
                             .build(Constance.ACTIVITY_URL_PATGENERATEPOSTER)
-                            .withString("iconUrl",iconUrl)
-                            .withString("content",title)
-                            .withString("url",webUrl + "&shareType=app")
-                            .withString("userName",userName)
-                            .withString("userUrl",userUrl)
+                            .withString("iconUrl", iconUrl)
+                            .withString("content", title)
+                            .withString("url", webUrl + "&shareType=app")
+                            .withString("userName", userName)
+                            .withString("userUrl", userUrl)
                             .navigation();
 
                 } else if (snsPlatform.mShowWord.equals("复制链接")) {
@@ -347,7 +350,7 @@ public class DetailPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
                             }
                         });
             }
-        }, "rv_um_share_bill","rv_um_share_copy");
+        }, "rv_um_share_bill", "rv_um_share_copy");
     }
 
 
@@ -358,7 +361,8 @@ public class DetailPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
         if (myClipboard == null) {
             myClipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
         }
-        ClipData myClip = ClipData.newPlainText("text", webUrl + "&shareType=app");
+        String code = Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_CODE, "");
+        ClipData myClip = ClipData.newPlainText("text", webUrl+ "&shareType=app&code=" + code);
         myClipboard.setPrimaryClip(myClip);
         showToast("复制成功！");
     }

module_discovery/src/main/java/com/xxfc/discovery/other/PatGeneratePosterActivity.java

@@ -7,6 +7,9 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -57,7 +60,7 @@ public class PatGeneratePosterActivity extends BaseStatusActivity<PickerPresente
     @BindView(R2.id.tv_content)
     TextView tvContent;
     @BindView(R2.id.ring_header)
-    RoundImageView ringHeader;
+    ImageView ringHeader;
     @BindView(R2.id.img_qrcode)
     ImageView imgQrcode;
     @BindView(R2.id.ll_bill_content)
@@ -99,9 +102,8 @@ public class PatGeneratePosterActivity extends BaseStatusActivity<PickerPresente
 
         GlideManager.getInstance(mActivity).loadRoundImage(iconUrl, imgBillTop, 8);
         tvContent.setText(content);
-        GlideManager.getInstance(mActivity).loadImage(userUrl, ringHeader);
+        GlideManager.getInstance(mActivity).loadCircleImage(userUrl, ringHeader);
         tvUsername.setText(userName);
-
     }
 
     @Override
@@ -246,7 +248,6 @@ public class PatGeneratePosterActivity extends BaseStatusActivity<PickerPresente
                 @Override
                 public void onclick(SnsPlatform snsPlatform, SHARE_MEDIA share_media) {
 
-
                     shareManager.showShareImage(share_media, bitmap, new CustomShareListener(mActivity) {
                         @Override
                         public void onResult(SHARE_MEDIA platform) {
@@ -272,7 +273,6 @@ public class PatGeneratePosterActivity extends BaseStatusActivity<PickerPresente
                                     showToast(platform + "分享成功啦");
 
                                 }
-
                             }
 
                         }

module_discovery/src/main/res/layout/activity_pat_generate_poster.xml

@@ -61,7 +61,7 @@
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
-                <com.base.utils.ui.image.round.RoundImageView
+                <ImageView
                     android:id="@+id/ring_header"
                     android:layout_width="@dimen/size_50"
                     android:layout_height="@dimen/size_50" />

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

@@ -39,6 +39,7 @@ import com.ruiwenliu.wrapper.util.UtilsManager;
 import com.ruiwenliu.wrapper.util.um.CustomShareListener;
 import com.ruiwenliu.wrapper.util.um.ShareManager;
 import com.ruiwenliu.wrapper.weight.TitleView;
+import com.rv.component.utils.Cookie;
 import com.rv.home.R;
 import com.rv.home.R2;
 import com.rv.home.rv.module.ApiConfig;
@@ -115,7 +116,8 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
         webUrl = ApiConfig.HTTP_URL_CAR_TYPE_DETAIL + "?id=" + mCarBean.getVehicleModel().getId() + "&companyId=" + mCarBean.getCompany().getId();
         initWeb();
         initRxbus();
-        initShare(webUrl + "&shareType=app", mCarBean.getVehicleModel().getName(), mCarBean.getVehicleModel().getKeyword(), mCarBean.getVehicleModel().getIcon());
+        String code = Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_CODE, "");
+        initShare(webUrl + "&shareType=app&code=" + code, mCarBean.getVehicleModel().getName(), mCarBean.getVehicleModel().getKeyword(), mCarBean.getVehicleModel().getIcon());
     }
 
     private void initRxbus() {
@@ -351,9 +353,16 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
             public void onclick(SnsPlatform snsPlatform, SHARE_MEDIA share_media) {
 
                 if (snsPlatform.mShowWord.equals("生成海报")) {
+                    String icon = "";
+                    if (TextUtils.isEmpty(mCarBean.getVehicleModel().getPosterBackground())) {
+                        icon = mCarBean.getVehicleModel().getIcon();
+                    } else {
+                        icon = mCarBean.getVehicleModel().getPosterBackground();
+                    }
+
                     ARouter.getInstance()
                             .build(Constance.ACTIVITY_URL_SHAREIMAGE)
-                            .withString("icon", mCarBean.getVehicleModel().getIcon())
+                            .withString("icon", icon)
                             .withString("name", mCarBean.getVehicleModel().getName())
                             .withString("keyword", mCarBean.getVehicleModel().getKeyword())
                             .withDouble("price", mCarBean.getVehicleModel().getPrice())
@@ -450,7 +459,8 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
         if (myClipboard == null) {
             myClipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
         }
-        ClipData myClip = ClipData.newPlainText("text", webUrl);
+        String code = Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_CODE, "");
+        ClipData myClip = ClipData.newPlainText("text", webUrl+ "&shareType=app&code=" + code);
         myClipboard.setPrimaryClip(myClip);
         showToast("复制成功！");
     }

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

@@ -330,7 +330,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
         });
 
         recyclerViewRvEnthusiast.setLayoutManager(staggeredGridLayoutManager);
-        recyclerViewRvEnthusiast.addItemDecoration(new AbSpacesItemDecoration2(20,10));// 分割线。
+        recyclerViewRvEnthusiast.addItemDecoration(new AbSpacesItemDecoration2(20, 10));// 分割线。
         recyclerViewRvEnthusiast.setNestedScrollingEnabled(false);
         recyclerViewRvEnthusiast.setAdapter(mRvEnthusiast);
 
@@ -418,23 +418,22 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
         });
 
 
-
         //房车发烧友
         mRvEnthusiast.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 HomeRecommendBean.DataBeanX.DataBean item = (HomeRecommendBean.DataBeanX.DataBean) adapter.getItem(position);
-                if (item !=null){
-                    if ("2".equals(item.getBody().getType())){
+                if (item != null) {
+                    if ("2".equals(item.getBody().getType())) {
                         ARouter.getInstance()
                                 .build(Constance.ACTIVITY_URL_DETAILPAT)
                                 .withString("id", item.getMsgId())
-                                .withString("title",item.getBody().getText())
-                                .withString("iconUrl",item.getBody().getImages().get(0).getOurl())
-                                .withString("userName",item.getNickname())
-                                .withString("userUrl",item.getPicUrl())
+                                .withString("title", item.getBody().getText())
+                                .withString("iconUrl", item.getBody().getImages().get(0).getOurl())
+                                .withString("userName", item.getNickname())
+                                .withString("userUrl", item.getPicUrl())
                                 .navigation();
-                    }else if ("4".equals(item.getBody().getType())){
+                    } else if ("4".equals(item.getBody().getType())) {
                         showToast("亲，该功能还在开发中。。。");
                     }
                 }
@@ -550,7 +549,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
     private void loadDisCovery(int page) {
         Map<String, Object> map = new LinkedHashMap<>();
         map.put("page", page);
-        mPresenter.postData( 5, ApiConfig.RVENTHUSIAST_HOTMSG_LIST, HomeRecommendBean.class, map, false);
+        mPresenter.postData(5, ApiConfig.RVENTHUSIAST_HOTMSG_LIST, HomeRecommendBean.class, map, false);
     }
 
     /**
@@ -1039,6 +1038,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
 
                         if (listsBanners.size() > 0) {
                             BeanHomeBanner.DataBean bean = listsBanners.get(position);
+                            mPresenter.saveOnclick("1", bean.getId());
                             if (bean != null && !TextUtils.isEmpty(bean.getUrl())) {
                                 mPresenter.toTarget(getActivity(), bean.getUrl(), bean.getTitle());
                             }

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

@@ -168,6 +168,7 @@ public class CarTypeListBean extends BaseBean implements Serializable {
                 private int rentDiscountStatus;//租车优惠状态 0–没有优惠;1–会员折扣;2–固定值
                 private int score;
                 private String coverPic;
+                private String posterBackground;
 
                 public double getSum() {
                     BeanUserInfo.UserInfo info = null;
@@ -317,6 +318,14 @@ public class CarTypeListBean extends BaseBean implements Serializable {
                 public void setCoverPic(String coverPic) {
                     this.coverPic = coverPic;
                 }
+
+                public String getPosterBackground() {
+                    return posterBackground;
+                }
+
+                public void setPosterBackground(String posterBackground) {
+                    this.posterBackground = posterBackground;
+                }
             }
 
             public static class CompanyBean implements Serializable {

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

@@ -177,6 +177,7 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
                 tvPickUpTheCar.setText(mActivity.getString(R.string.rv_return_car));
                 break;
             case 6:
+            case 7:
                 if (dataBean.getType() == 3) {
                     tvCancelOrder.setVisibility(View.GONE);
                 }
@@ -280,6 +281,7 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
                 startActivity(PickUpTheCarQRCodeActivity.getIntent(mActivity, dataBean));
                 break;
             case 6:
+            case 7:
                 startActivityForResult(EvaluationActivity.getIntent(mActivity, dataBean), TYPE_REQUEST_EVALUATION);
                 break;
         }
@@ -298,6 +300,7 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
                 startActivity(intent);
                 break;
             case 6:
+            case 7:
                startActivity(DepositefundProgressDetailsActivity.getIntent(mActivity,no));
                 break;
         }

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

@@ -75,6 +75,7 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                  4–待出行
                  5–出行中（进行中）
                  6–已完成
+                 7 - 定损
                  */
                 switch (dataBean.getStatusX()) {
                     case 0:
@@ -106,6 +107,9 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                         helper.setText(R.id.tv_process, mContext.getString(R.string.rv_to_evaluation));
                         helper.setVisible(R.id.tv_process, true);
                         break;
+                    case 7:
+                        helper.setText(R.id.tv_order_state, "定损中");
+                        helper.setVisible(R.id.tv_process, false);
                     default:
 
                         break;

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

@@ -269,7 +269,7 @@
                                 android:clickable="false"
                                 android:gravity="center"
                                 android:orientation="vertical"
-                                android:visibility="visible">
+                                android:visibility="gone">
 
                                 <ImageView
                                     android:layout_width="@dimen/size_25"

module_tourism/src/main/java/com/rv/tourism/TourismFragment.java

@@ -173,6 +173,7 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements S
                         .withString("name", dataBean.getName())
                         .withString("content", dataBean.getContent())
                         .withString("url", dataBean.getCover())
+                        .withString("posterBackground", dataBean.getPosterBackground())
                         .withDouble("price", Double.valueOf(dataBean.getPrice()))
                         .navigation();
             }

module_tourism/src/main/java/com/rv/tourism/bean/BeanTourAround.java

@@ -97,6 +97,7 @@ public class BeanTourAround extends BaseBean {
             private String stock;//44,
             private String unit;//"元/人",
             private String isDel;//0
+            private String posterBackground;
 
             public String getId() {
                 return id;
@@ -258,6 +259,13 @@ public class BeanTourAround extends BaseBean {
                 this.isDel = isDel;
             }
 
+            public String getPosterBackground() {
+                return posterBackground;
+            }
+
+            public void setPosterBackground(String posterBackground) {
+                this.posterBackground = posterBackground;
+            }
         }
     }
 }

module_tourism/src/main/java/com/rv/tourism/other/PopularTourListActivity.java

@@ -7,6 +7,7 @@ import android.os.Bundle;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -131,6 +132,7 @@ public class PopularTourListActivity extends BaseStatusActivity<TourismPresenter
                         .withString("name", item.getName())
                         .withString("content", item.getContent())
                         .withString("url", item.getCover())
+                        .withString("posterBackground", item.getPosterBackground())
                         .withDouble("price", Double.valueOf(item.getPrice()))
                         .navigation();
             }

module_tourism/src/main/java/com/rv/tourism/other/TravelDetailsActivity.java

@@ -33,12 +33,14 @@ import com.frame.base.url.Constance;
 import com.frame.rv.config.RvFrameConfig;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
+import com.ruiwenliu.wrapper.SPConstance;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.bean.BeanUserInfo;
 import com.ruiwenliu.wrapper.util.um.CustomShareListener;
 import com.ruiwenliu.wrapper.util.um.ShareManager;
 import com.ruiwenliu.wrapper.weight.TitleView;
+import com.rv.component.utils.Cookie;
 import com.rv.tourism.R;
 import com.rv.tourism.R2;
 import com.rv.tourism.api.TourismApi;
@@ -107,8 +109,10 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
     String url;
 
     @Autowired()
-    double price;
+    String posterBackground;
 
+    @Autowired()
+    double price;
 
 //    public static Intent getIntent(Context context, BeanTourAround.DataBeanX.DataBean dataBean) {
 //        return new Intent(context, TravelDetailsActivity.class)
@@ -128,7 +132,8 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
         initWeb();
         initRxbus();
         if (!TextUtils.isEmpty(name) && !TextUtils.isEmpty(url)) {
-            initShare(webUrl + "&shareType=app", name, " ", url);
+            String code = Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_CODE, "");
+            initShare(webUrl + "&shareType=app&code=" + code, name, " ", url);
         }
 
         mWebView.loadUrl("JavaScript:getTourStock()"); // Android调用h5
@@ -367,9 +372,16 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
             public void onclick(SnsPlatform snsPlatform, SHARE_MEDIA share_media) {
 
                 if (snsPlatform.mShowWord.equals("生成海报")) {
+                    String icon = "";
+                    if (TextUtils.isEmpty(posterBackground)) {
+                        icon = url;
+                    } else {
+                        icon = posterBackground;
+                    }
+
                     ARouter.getInstance()
                             .build(Constance.ACTIVITY_URL_SHAREIMAGE)
-                            .withString("icon", url)
+                            .withString("icon", icon)
                             .withString("name", name)
                             .withString("keyword", content)
                             .withDouble("price", price)
@@ -405,7 +417,6 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
                                         showToast("分享成功啦");
 
                                     }
-
                                 }
 
                             }
@@ -414,12 +425,20 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
         }, "rv_um_share_bill", "rv_um_share_copy");
     }
     
-
     /**
      * 与h5交互
      */
     public class AndroidJs {
 
+        @JavascriptInterface
+        public String getToken() {
+            String token = OkGoUtil.getToken();
+            if (TextUtils.isEmpty(token)){
+                ARouter.getInstance().build(Constance.ACTIVITY_URL_LOGINRV).navigation();
+            }
+            return token;
+        }
+
         @JavascriptInterface
         public void showButton() {
             mWebView.post(new Runnable() {
@@ -434,6 +453,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
 
         @JavascriptInterface
         public void hideButton() {
+
             mWebView.post(new Runnable() {
                 @Override
                 public void run() {
@@ -596,7 +616,8 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
         if (myClipboard == null) {
             myClipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
         }
-        ClipData myClip = ClipData.newPlainText("text", webUrl + "&shareType=app");
+        String code = Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_CODE, "");
+        ClipData myClip = ClipData.newPlainText("text", webUrl + "&shareType=app&code=" + code);
         myClipboard.setPrimaryClip(myClip);
         showToast("复制成功！");
     }

plugin_member/src/main/java/com/rv.member/ConsumeRecordActivity.java

@@ -50,10 +50,10 @@ public class ConsumeRecordActivity extends BaseStatusActivity<CommonPresenter> i
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         titleView.setTitle("消费记录");
         recyclerView.setLayoutManager(new LinearLayoutManager(mActivity));
-        OrderListBean bean = (OrderListBean) RvCache.getInstance(getApplicationContext()).get(CacheEnum.CONSUMER_RECORD);
-        if (bean != null && bean.getData() != null && bean.getData().getData() != null) {
-            lists.addAll(bean.getData().getData());
-        }
+//        OrderListBean bean = (OrderListBean) RvCache.getInstance(getApplicationContext()).get(CacheEnum.CONSUMER_RECORD);
+//        if (bean != null && bean.getData() != null && bean.getData().getData() != null) {
+//            lists.addAll(bean.getData().getData());
+//        }
         adapter = new ConsumeRecordListAdapter(lists, mClickListener);
         adapter.setEmptyView(getEmptyView(recyclerView, -1, getString(R.string.tv_no_consume_data)));
         adapter.setOnLoadMoreListener(this, recyclerView);
@@ -65,40 +65,49 @@ public class ConsumeRecordActivity extends BaseStatusActivity<CommonPresenter> i
 
     @Override
     public void onShowResult(int requestType, BaseBean result) {
-
-        lists.clear();
-        if (requestType == 1) {   // 下拉刷新数据
         simpleRefreshLayout.onRefreshComplete();
-        } else if (requestType == 2) {   // 上拉加载更多
-            simpleRefreshLayout.onLoadMoreComplete();
-        }
         OrderListBean listBean = (OrderListBean) result;
-        RvCache.getInstance(getApplicationContext()).save(listBean, CacheEnum.CONSUMER_RECORD);
-        if (listBean != null && listBean.getData() != null) {
-            pageCount = listBean.getData().getTotalPage();
-            lists.addAll(listBean.getData().getData());
+//        RvCache.getInstance(getApplicationContext()).save(listBean, CacheEnum.CONSUMER_RECORD);
+//        if (listBean != null && listBean.getData() != null) {
+//            pageCount = listBean.getData().getTotalPage();
+//            lists.addAll(listBean.getData().getData());
+//            adapter.notifyDataSetChanged();
+//        }
+
+        if (mPage == 1) {
+            if (listBean.getData().getTotalCount() == 0) {
+                adapter.setEmptyView(getEmptyView(recyclerView, -1, getString(R.string.tv_no_consume_data)));
                 adapter.notifyDataSetChanged();
+                return;
+            }
+
+            pageCount = listBean.getData().getTotalPage();
+            adapter.setNewData(listBean.getData().getData());
+            adapter.loadMoreComplete();
+        } else {
+            adapter.addData(listBean.getData().getData());
+            adapter.loadMoreComplete();
         }
     }
 
     @Override
     protected void loadData(Bundle savedInstanceState, Intent intent) {
         super.loadData(savedInstanceState, intent);
-        getConsumeRecordData(0);
+        getConsumeRecordData(mPage);
     }
 
-    private void getConsumeRecordData(int position) {
+    private void getConsumeRecordData(int page) {
         Map<String, Object> headMap = new LinkedHashMap<>();
         if (OkGoUtil.getToken() != null)
             headMap.put("Authorization", OkGoUtil.getToken());
         Map<String, Object> bodyMap = new LinkedHashMap<>();
         bodyMap.put("page", mPage);
         bodyMap.put("limit", 10);
-//        bodyMap.put("status", "3");
+//        bodyMap.put("status", "3"); 4567
         bodyMap.put("hasMemberRight", 1);
         bodyMap.put("type", 1);
-//        bodyMap.put("multiStatus", "3,4,5,6");
-        mPresenter.getData(RvFrameConfig.VEHICLE_ORDER, position, ApiConfig.HTTP_URL_ORDER_LIST, OrderListBean.class, bodyMap, headMap, mPage == 1 ? true : false);
+        bodyMap.put("multiStatus", "4,5,6,7");
+        mPresenter.getData(RvFrameConfig.VEHICLE_ORDER, 0, ApiConfig.HTTP_URL_ORDER_LIST, OrderListBean.class, bodyMap, headMap, mPage == 1 ? true : false);
     }
 
     private ConsumeRecordListAdapter.ConsumeListener mClickListener = new ConsumeRecordListAdapter.ConsumeListener() {
@@ -122,7 +131,7 @@ public class ConsumeRecordActivity extends BaseStatusActivity<CommonPresenter> i
             adapter.loadMoreEnd();
         } else {
             mPage += 1;
-            getConsumeRecordData(2);
+            getConsumeRecordData(mPage);
         }
     }
 }