Merge branch 'master' of http://113.105.137.151:22280/lify/rvapp into dev-member-john

RvClient/build.gradle

@@ -8,8 +8,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
 
-        versionCode 126
-        versionName "1.2.6"
+        versionCode 127
+        versionName "1.2.7"
         multiDexEnabled true
 
         //新版Gradle 是 implementation 为了兼容compile,写上这句话

RvClient/src/main/res/layout/activity_main.xml

@@ -28,8 +28,8 @@
 
             <ImageView
                 android:id="@+id/iv_home"
-                android:layout_width="@dimen/size_22"
-                android:layout_height="@dimen/size_22"
+                android:layout_width="@dimen/size_19"
+                android:layout_height="@dimen/size_19"
                 android:layout_centerHorizontal="true"
                 android:src="@drawable/selector_rv_home" />
 
@@ -41,8 +41,8 @@
                 android:gravity="center"
                 android:paddingTop="@dimen/size_3"
                 android:text="@string/rv_tab_home"
-                android:textColor="@color/textMain"
-                android:textSize="@dimen/text_12" />
+                android:textColor="@color/colorGray"
+                android:textSize="@dimen/text_10" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -53,8 +53,8 @@
 
             <ImageView
                 android:id="@+id/iv_travel"
-                android:layout_width="@dimen/size_22"
-                android:layout_height="@dimen/size_22"
+                android:layout_width="@dimen/size_19"
+                android:layout_height="@dimen/size_19"
                 android:layout_centerHorizontal="true"
                 android:src="@drawable/selector_rv_travel" />
 
@@ -66,8 +66,8 @@
                 android:gravity="center"
                 android:paddingTop="@dimen/size_3"
                 android:text="@string/rv_tab_travel"
-                android:textColor="@color/textMain"
-                android:textSize="@dimen/text_12" />
+                android:textColor="@color/colorGray"
+                android:textSize="@dimen/text_10" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -78,8 +78,8 @@
 
             <ImageView
                 android:id="@+id/iv_camp"
-                android:layout_width="@dimen/size_22"
-                android:layout_height="@dimen/size_22"
+                android:layout_width="@dimen/size_19"
+                android:layout_height="@dimen/size_19"
                 android:layout_centerHorizontal="true"
                 android:src="@drawable/selector_rv_camp" />
 
@@ -91,8 +91,8 @@
                 android:gravity="center"
                 android:paddingTop="@dimen/size_3"
                 android:text="@string/rv_tab_camp"
-                android:textColor="@color/textMain"
-                android:textSize="@dimen/text_12" />
+                android:textColor="@color/colorGray"
+                android:textSize="@dimen/text_10" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -103,8 +103,8 @@
 
             <ImageView
                 android:id="@+id/iv_found"
-                android:layout_width="@dimen/size_22"
-                android:layout_height="@dimen/size_22"
+                android:layout_width="@dimen/size_19"
+                android:layout_height="@dimen/size_19"
                 android:layout_centerHorizontal="true"
                 android:src="@drawable/selector_rv_found" />
 
@@ -116,8 +116,8 @@
                 android:gravity="center"
                 android:paddingTop="@dimen/size_3"
                 android:text="@string/rv_tab_found"
-                android:textColor="@color/textMain"
-                android:textSize="@dimen/text_12" />
+                android:textColor="@color/colorGray"
+                android:textSize="@dimen/text_10" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -128,8 +128,8 @@
 
             <ImageView
                 android:id="@+id/iv_mine"
-                android:layout_width="@dimen/size_22"
-                android:layout_height="@dimen/size_22"
+                android:layout_width="@dimen/size_19"
+                android:layout_height="@dimen/size_19"
                 android:layout_centerHorizontal="true"
                 android:src="@drawable/selector_rv_mine" />
 
@@ -141,8 +141,8 @@
                 android:gravity="center"
                 android:paddingTop="@dimen/size_3"
                 android:text="@string/rv_tab_mine"
-                android:textColor="@color/textMain"
-                android:textSize="@dimen/text_12" />
+                android:textColor="@color/colorGray"
+                android:textSize="@dimen/text_10" />
         </RelativeLayout>
     </LinearLayout>
 </LinearLayout>

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

@@ -13,6 +13,7 @@
     <dimen name="size_15">15dp</dimen>
     <dimen name="size_16">16dp</dimen>
     <dimen name="size_18">18dp</dimen>
+    <dimen name="size_19">19dp</dimen>
     <dimen name="size_20">20dp</dimen>
     <dimen name="size_22">22dp</dimen>
     <dimen name="size_23">23dp</dimen>

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

@@ -46,7 +46,7 @@ public class CompletedAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                     helper.setText(R.id.tv_city, dataBean.getOrderRentVehicleDetail().getStart_city_name());
                 }
                 helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_completed));
-                helper.loadRoundImage(mContext, dataBean.getIcon(), (ImageView) helper.getView(R.id.iv_goods), 10);
+                helper.loadRoundImage(mContext, dataBean.getIcon(), (ImageView) helper.getView(R.id.iv_goods), 8);
                 helper.setText(R.id.tv_car_type, dataBean.getName());
                 if (dataBean.getOrderRentVehicleDetail() !=null) {
                     helper.setText(R.id.tv_get_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getStart_time()));
@@ -69,7 +69,7 @@ public class CompletedAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                 helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean2.getCrtTime()));
                 helper.setText(R.id.tv_city, dataBean2.getOrderTourDetail().getStartCityName());
                 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.loadRoundImage(mContext, dataBean2.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 8);
                 helper.setText(R.id.tv_car_type, dataBean2.getName());
                 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)));
@@ -88,7 +88,7 @@ public class CompletedAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
 
                 helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean3.getCrtTime()));
                 helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_completed));
-                helper.loadRoundImage(mContext, dataBean3.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 10);
+                helper.loadRoundImage(mContext, dataBean3.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 8);
                 helper.setText(R.id.tv_name, dataBean3.getName());
                 helper.setText(R.id.tv_content,dataBean3.getOrderMemberDetail().getContent() );
                 helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean3.getRealAmount()));

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

@@ -54,7 +54,7 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
                 }
 
                 helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
-                helper.loadRoundImage(mContext, dataBean.getIcon(), (ImageView) helper.getView(R.id.iv_goods), 10);
+                helper.loadRoundImage(mContext, dataBean.getIcon(), (ImageView) helper.getView(R.id.iv_goods), 8);
                 helper.setText(R.id.tv_car_type, dataBean.getName());
                 if (dataBean.getOrderRentVehicleDetail() != null) {
                     helper.setText(R.id.tv_get_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getStart_time()));
@@ -77,7 +77,7 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
                 setTimes(Cookie.getLongValue(mContext, "actTour"), helper, (OrderListBean.DataBeanX.DataBean) item);
                 helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean.getCrtTime()));
                 helper.setText(R.id.tv_city, dataBean.getOrderTourDetail().getStartCityName());
-                helper.loadRoundImage(mContext, dataBean.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 10);
+                helper.loadRoundImage(mContext, dataBean.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 8);
                 helper.setText(R.id.tv_car_type, dataBean.getName());
                 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)));
@@ -95,7 +95,7 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
                 }
                 setTimes(Cookie.getLongValue(mContext, "actMember"), helper, (OrderListBean.DataBeanX.DataBean) item);
                 helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean.getCrtTime()));
-                helper.loadRoundImage(mContext, dataBean.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 10);
+                helper.loadRoundImage(mContext, dataBean.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 8);
                 helper.setText(R.id.tv_name, dataBean.getName());
                 helper.setText(R.id.tv_content, dataBean.getOrderMemberDetail().getContent());
                 helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean.getRealAmount()));

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

@@ -46,7 +46,7 @@ public class HaveToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEnti
                     helper.setText(R.id.tv_city, dataBean.getOrderRentVehicleDetail().getStart_city_name());
                 }
                 helper.setText(R.id.tv_order_state,mContext.getString(R.string.rv_order_have_travel));
-                helper.loadRoundImage(mContext,dataBean.getIcon(), (ImageView) helper.getView(R.id.iv_goods),10);
+                helper.loadRoundImage(mContext,dataBean.getIcon(), (ImageView) helper.getView(R.id.iv_goods),8);
                 helper.setText(R.id.tv_car_type,dataBean.getName());
                 if (dataBean.getOrderRentVehicleDetail() !=null) {
                     helper.setText(R.id.tv_get_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getStart_time()));
@@ -69,7 +69,7 @@ public class HaveToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEnti
                 helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean2.getCrtTime()));
                 helper.setText(R.id.tv_city, dataBean2.getOrderTourDetail().getStartCityName());
                 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.loadRoundImage(mContext,dataBean2.getPicture(), (ImageView) helper.getView(R.id.iv_goods),8);
                 helper.setText(R.id.tv_car_type,dataBean2.getName());
                 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)));

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

@@ -48,7 +48,7 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                 if (dataBean.getOrderRentVehicleDetail() != null && dataBean.getOrderRentVehicleDetail().getStart_city_name() != null) {
                     helper.setText(R.id.tv_city, dataBean.getOrderRentVehicleDetail().getStart_city_name());
                 }
-                helper.loadRoundImage(mContext, dataBean.getIcon(), (ImageView) helper.getView(R.id.iv_goods), 10);
+                helper.loadRoundImage(mContext, dataBean.getIcon(), (ImageView) helper.getView(R.id.iv_goods), 8);
                 helper.setText(R.id.tv_car_type, dataBean.getName());
                 if (dataBean.getOrderRentVehicleDetail() != null) {
                     helper.setText(R.id.tv_get_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getStart_time()));
@@ -117,7 +117,7 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                 helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean2.getCrtTime()));
                 helper.setText(R.id.tv_city, dataBean2.getOrderTourDetail().getStartCityName());
 
-                helper.loadRoundImage(mContext, dataBean2.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 50);
+                helper.loadRoundImage(mContext, dataBean2.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 8);
                 helper.setText(R.id.tv_car_type, dataBean2.getName());
                 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)));
@@ -183,7 +183,7 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                 }
 
                 helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean3.getCrtTime()));
-                helper.loadRoundImage(mContext, dataBean3.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 10);
+                helper.loadRoundImage(mContext, dataBean3.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 8);
                 helper.setText(R.id.tv_name, dataBean3.getName());
                 helper.setText(R.id.tv_content,dataBean3.getOrderMemberDetail().getContent() );
                 helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean3.getRealAmount()));

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

@@ -46,7 +46,7 @@ public class ToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                     helper.setText(R.id.tv_city, dataBean.getOrderRentVehicleDetail().getStart_city_name());
                 }
                 helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_to_travel));
-                helper.loadRoundImage(mContext, dataBean.getIcon(), (ImageView) helper.getView(R.id.iv_goods), 10);
+                helper.loadRoundImage(mContext, dataBean.getIcon(), (ImageView) helper.getView(R.id.iv_goods), 8);
                 helper.setText(R.id.tv_car_type, dataBean.getName());
                 if (dataBean.getOrderRentVehicleDetail() != null) {
                     helper.setText(R.id.tv_get_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getStart_time()));
@@ -69,7 +69,7 @@ public class ToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                 helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean2.getCrtTime()));
                 helper.setText(R.id.tv_city, dataBean2.getOrderTourDetail().getStartCityName());
                 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.loadRoundImage(mContext, dataBean2.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 8);
                 helper.setText(R.id.tv_car_type, dataBean2.getName());
                 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)));

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

 package com.rv.rvmine.traveler;
 
 import android.Manifest;
+import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.TextView;
@@ -31,9 +33,12 @@ import com.rv.rvmine.R;
 import com.rv.rvmine.R2;
 import com.rv.rvmine.dialog.ChooseGenderDialog;
 import com.rv.rvmine.rxbusevent.UserInfoEvent;
+import com.umeng.socialize.UMAuthListener;
+import com.umeng.socialize.UMShareAPI;
+import com.umeng.socialize.bean.SHARE_MEDIA;
+import com.umeng.socialize.utils.SocializeUtils;
 import com.yuyife.okgo.OkGoUtil;
 
-
 import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -52,7 +57,7 @@ import okhttp3.RequestBody;
 /**
  * 个人资料
  */
-public class PersonalInformationActivity extends BaseStatusActivity<PickerPresenter> {
+public class PersonalInformationActivity extends BaseStatusActivity<PickerPresenter>  implements UMAuthListener {
 
     @BindView(R2.id.iv_avatar)
     RoundImageView ivAvatar;
@@ -68,11 +73,23 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
     EditText etPhone;
     @BindView(R2.id.et_id_card)
     EditText etIdCard;
+    @BindView(R2.id.tv_binding_qq)
+    TextView tvBindingQq;
+    @BindView(R2.id.tv_binding_wx)
+    TextView tvBindingWx;
     private UserInfoBean.UserInfo info;
     private String ivAvatarUrl;
+    public ProgressDialog dialog;
+    private int mLoginType;
+    private String mName;
 
     private int sex;// 0-女，1-男
 
+    private String mQQOpenid;
+    private String mWXOpenid;
+    private String mUnionid;
+    private String mHeadImg;
+
     public static Intent getIntent(Context context, UserInfoBean.UserInfo info) {
         return new Intent(context, PersonalInformationActivity.class)
                 .putExtra("userinfo", info);
@@ -93,9 +110,14 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
                 upUserinfo();
             }
         });
+        dialog = new ProgressDialog(this);
         info = (UserInfoBean.UserInfo) intent.getSerializableExtra("userinfo");
         if (info != null) {
             ivAvatarUrl = info.getHeadimgurl();
+            mWXOpenid = info.getWxOpenid();
+            mUnionid = info.getUnionid();
+            mQQOpenid =info.getOpenid() ;
+
             GlideManager.getInstance(mActivity).loadImage(info.getHeadimgurl(), ivAvatar);
             if (info.getNickname() != null) {
                 etNickname.setText(info.getNickname());
@@ -123,6 +145,18 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
             if (info.getIdNumber() != null) {
                 etIdCard.setText(info.getIdNumber());
             }
+
+            if (TextUtils.isEmpty(info.getWxOpenid())) {
+                tvBindingWx.setText("去授权绑定微信");
+            } else {
+                tvBindingWx.setText("已绑定");
+            }
+
+            if (TextUtils.isEmpty(info.getOpenid())) {
+                tvBindingQq.setText("去授权绑定QQ");
+            } else {
+                tvBindingQq.setText("已绑定");
+            }
         }
     }
 
@@ -181,13 +215,18 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
 
         } else if (id == R.id.ll_item_binding_qq) {
             //绑定qq
-            showToast("亲，该功能还在开发中。。。");
+            bindThirdParty(SHARE_MEDIA.QQ);
+
         } else if (id == R.id.ll_item_binding_wechat) {
             //绑定微信
-            showToast("亲，该功能还在开发中。。。");
+            bindThirdParty(SHARE_MEDIA.WEIXIN);
         }
     }
 
+    private void bindThirdParty(SHARE_MEDIA share_media) {
+        UMShareAPI.get(mActivity).getPlatformInfo(mActivity, share_media, this);
+    }
+
     private void chooseGender() {
         new ChooseGenderDialog(mActivity) {
             @Override
@@ -331,7 +370,7 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
             showToast("生日不为空！");
             return;
         }
-        mPresenter.postBodyData(RvFrameConfig.ADMIN_POST, 1, ApiConfig.HTTP_URL_UPUSER_EDIT, BaseBean.class, new UserInfo(info.getId() + "", info.getUserid() + "", info.getUsername(), "0", nickName, info.getRealname(), ivAvatarUrl, dataBirth, sex), getHeadMap(), true);
+        mPresenter.postBodyData(RvFrameConfig.ADMIN_POST, 1, ApiConfig.HTTP_URL_UPUSER_EDIT, BaseBean.class, new UserInfo(info.getId() + "", info.getUserid() + "", info.getUsername(), "0", nickName, info.getRealname(), ivAvatarUrl, dataBirth, sex,mWXOpenid,mUnionid,mQQOpenid), getHeadMap(), true);
     }
 
     private Map<String, Object> getHeadMap() {
@@ -341,6 +380,53 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
         return headMap;
     }
 
+    @Override
+    public void onStart(SHARE_MEDIA share_media) {
+        SocializeUtils.safeShowDialog(dialog);
+    }
+
+    @Override
+    public void onComplete(SHARE_MEDIA share_media, int i, Map<String, String> data) {
+        if (dialog != null) {
+            SocializeUtils.safeCloseDialog(dialog);
+        }
+
+        mHeadImg = data.get("iconurl");
+        mLoginType = share_media.getName().equals("qq") ? 1 : 0;
+        if (mLoginType == 0) {
+            mUnionid = data.get("unionid");
+            mWXOpenid = data.get("openid");
+            tvBindingWx.setText("已绑定");
+        }else {
+            mQQOpenid = data.get("openid");
+            tvBindingQq.setText("已绑定");
+        }
+        mName = data.get("name");
+    }
+
+    @Override
+    public void onError(SHARE_MEDIA share_media, int i, Throwable t) {
+        SocializeUtils.safeCloseDialog(dialog);
+        showToast(mActivity.getString(com.rv.home.R.string.rv_login_authorization_failure) + t.getMessage());
+    }
+
+    @Override
+    public void onCancel(SHARE_MEDIA share_media, int i) {
+        SocializeUtils.safeCloseDialog(dialog);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        UMShareAPI.get(mActivity).release();
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        UMShareAPI.get(mActivity).onSaveInstanceState(outState);
+    }
+
 
     private class UserInfo {
         private String id;//":23,
@@ -352,8 +438,11 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
         private String headimgurl;//": "https://xxtest.upyuns.com/image/app/default_%20avatar.png"
         private String birthday;
         private int sex;
+        private String wxOpenid;
+        private String unionid;
+        private String openid;
 
-        public UserInfo(String id, String userid, String username, String status, String nickname, String realname, String headimgurl, String birthday, int sex) {
+        public UserInfo(String id, String userid, String username, String status, String nickname, String realname, String headimgurl, String birthday, int sex, String wxOpenid, String unionid, String openid) {
             this.id = id;
             this.userid = userid;
             this.username = username;
@@ -363,6 +452,9 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
             this.headimgurl = headimgurl;
             this.birthday = birthday;
             this.sex = sex;
+            this.wxOpenid = wxOpenid;
+            this.unionid = unionid;
+            this.openid = openid;
         }
 
         public String getId() {
@@ -436,6 +528,30 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
         public void setSex(int sex) {
             this.sex = sex;
         }
+
+        public String getWxOpenid() {
+            return wxOpenid;
+        }
+
+        public void setWxOpenid(String wxOpenid) {
+            this.wxOpenid = wxOpenid;
+        }
+
+        public String getUnionid() {
+            return unionid;
+        }
+
+        public void setUnionid(String unionid) {
+            this.unionid = unionid;
+        }
+
+        public String getOpenid() {
+            return openid;
+        }
+
+        public void setOpenid(String openid) {
+            this.openid = openid;
+        }
     }
 
 

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

@@ -262,6 +262,7 @@
                 android:textSize="@dimen/text_16" />
 
             <TextView
+                android:id="@+id/tv_binding_qq"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="@dimen/size_15"
@@ -295,6 +296,7 @@
                 android:textSize="@dimen/text_16" />
 
             <TextView
+                android:id="@+id/tv_binding_wx"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="@dimen/size_15"

module_tourism/src/main/java/com/rv/tourism/api/TourismApi.java

@@ -33,4 +33,6 @@ public interface TourismApi extends RvFrameConfig {
 
     public static String HTTP_URL_CAR_TYPE_NOTICE = HOST + "/h5/appHtml/view/notice.html";//预定须知
 
+    String TRAVEL_DETAILS = HOST + "/h5/appHtml/view/travelDetails.html";
+
 }

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

@@ -122,7 +122,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         showTitle(false);
         tvTitleCenter.setText("旅游详情");
-        webUrl = RvFrameConfig.HOST + "/h5/appHtml/view/travelDetails.html?id=" + id;
+        webUrl = TourismApi.TRAVEL_DETAILS +"?id=" + id;
         initWeb();
         initRxbus();
         initShare(webUrl+"&shareType=app", name, content, url);
@@ -196,7 +196,6 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
         Map<String, Object> headMap = new LinkedHashMap<>();
         if (OkGoUtil.getToken() != null) {
             headMap.put("Authorization", OkGoUtil.getToken());
-            Log.i("TravelDetailsactivity", "cancelCollect: 1111111111111111111111111111");
             mPresenter.postBodyData(RvFrameConfig.HOST, 2, TourismApi.COMMIT_COLLECT_REMOVE, BaseBean.class, new CancelCollection(mCollectId, "1"), headMap, true);
         }
     }
@@ -205,7 +204,6 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
         Map<String, Object> headMap = new LinkedHashMap<>();
         if (OkGoUtil.getToken() != null) {
             headMap.put("Authorization", OkGoUtil.getToken());
-            Log.i("TravelDetail", "cancelCollect: 222222222222222222222222222");
             mPresenter.postBodyData(RvFrameConfig.HOST, 1, TourismApi.COMMIT_COLLECT_ADD, BaseBean.class, new AddCollection(id, "2"), headMap, true);
         }
     }