租车确认订单和bug修复

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

@@ -42,6 +42,8 @@ public class OkGoUtil {
     //把Token保存到SP文件中的Key
     final private static String SP_KEY_TOKEN = "sp_key_token";
 
+    final private static  String SP_KEY_USERINFO ="userinfo";
+
     //保存Token
     public static void setToken(String token) {
         if (application == null) return;
@@ -72,7 +74,7 @@ public class OkGoUtil {
     }
 
     @SuppressLint("StaticFieldLeak")
-    private static Context application = null;
+    public static Context application = null;
     private static boolean addToken = false;
 
     public static void initOkGo(Application app, boolean addToken) {

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

@@ -9,6 +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.248:8765";
 //    String HOST = "http://10.1.37.244:9527";
     String ADMIN_POST =HOST + "/api/admin/";

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

@@ -12,6 +12,7 @@ public interface RvFrameConstant {
     int HTTP_STATE_NOT_REGISTERED = 1003;//用户未注册
     int HTTP_STATE_USER_SP = 1002;//用户已存在
     int HTTP_STATE_SUCCESS = 200;//请求成功
+    int HTTP_STATE_DATA_ALREADY_EXISTS = 1001;
     /**
      * 请求错误类型
      */

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

@@ -17,7 +17,6 @@ import android.widget.LinearLayout;
 import com.base.animset.util.NiftyEffects;
 import com.base.utils.base.BaseFragment;
 import com.base.utils.tools.android.IntentUtil;
-import com.base.utils.tools.android.KeyboardUtil;
 import com.base.utils.ui.datetime.selector.util.TextUtil;
 import com.frame.base.browse.ActivityImageBrowseUrl;
 import com.frame.rv.widget.BaseTipsLayout;
@@ -185,7 +184,6 @@ public class TravelFragmentMain extends BaseFragment {
     private boolean isQueryMode = false;
 
     public void getRimData(String queryInput) {
-        KeyboardUtil.hideKeyboard(getActivity());
         query = queryInput;
         isQueryMode = !TextUtil.isEmpty(query);
         setRim();

RvWrapper/src/main/java/com/ruiwenliu/wrapper/SPConstance.java

@@ -9,4 +9,5 @@ public final class SPConstance {
     public static final String USER_JSON_IMTOKEN ="imToken";
     public static final String USER_JSON_IMUSERID ="imUserId";
     public static final String USER_JSON_ISCERTIFICATIONSTATUS ="CertificationStatus";
+    public static final String USER_JSON_USERINFO ="userinfo";
 }

RvWrapper/src/main/java/com/ruiwenliu/wrapper/http/RxRequestResult.java

@@ -53,6 +53,8 @@ public class RxRequestResult<T extends BaseBean, V extends BaseView<T>> extends
                     case RvFrameConstant.HTTP_STATE_NOT_REGISTERED:
                         baseView.onShowError("", RvFrameConstant.HTTP_STATE_NOT_REGISTERED);
                         break;
+                    case RvFrameConstant.HTTP_STATE_DATA_ALREADY_EXISTS:
+                        break;
                     default:
                         baseView.onShowError(bean.message, bean.status);
                         break;

component_control/.gitignore

+/build

component_control/build.gradle

+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 28
+
+
+    defaultConfig {
+        minSdkVersion 19
+        targetSdkVersion 28
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+}

component_control/proguard-rules.pro

+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

component_control/src/main/AndroidManifest.xml

+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.rv.component.control" />

component_control/src/main/res/values/strings.xml

+<resources>
+    <string name="app_name">component_control</string>
+</resources>

component_control/src/main/res/values/switch_button_attrs.xml

+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="SwitchButton">
+        <attr name="sb_shadow_radius" format="reference|dimension"/>       阴影半径
+        <attr name="sb_shadow_offset" format="reference|dimension"/>       阴影偏移
+        <attr name="sb_shadow_color" format="reference|color"/>            阴影颜色
+        <attr name="sb_uncheck_color" format="reference|color"/>           关闭颜色
+        <attr name="sb_checked_color" format="reference|color"/>           开启颜色
+        <attr name="sb_border_width" format="reference|dimension"/>        边框宽度
+        <attr name="sb_checkline_color" format="reference|color"/>         开启指示器颜色
+        <attr name="sb_checkline_width" format="reference|dimension"/>     开启指示器线宽
+        <attr name="sb_uncheckcircle_color" format="reference|color"/>     关闭指示器颜色
+        <attr name="sb_uncheckcircle_width" format="reference|dimension"/> 关闭指示器线宽
+        <attr name="sb_uncheckcircle_radius" format="reference|dimension"/>关闭指示器半径
+        <attr name="sb_checked" format="reference|boolean"/>               是否选中
+        <attr name="sb_shadow_effect" format="reference|boolean"/>         是否启用阴影
+        <attr name="sb_effect_duration" format="reference|integer"/>       动画时间，默认300ms
+        <attr name="sb_button_color" format="reference|color"/>            按钮颜色
+        <attr name="sb_show_indicator" format="reference|boolean"/>        是否显示指示器，默认true：显示
+        <attr name="sb_background" format="reference|color"/>              背景色，默认白色
+        <attr name="sb_enable_effect" format="reference|boolean"/>         是否启用特效，默认true
+    </declare-styleable>
+</resources>
\ No newline at end of file

component_resource/src/main/res/drawable/shape_rv_bg_shallow_yellow_small_circle.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/colorBgYellow" />
+</shape>
\ No newline at end of file

Utils/src/main/java/com/base/utils/tools/android/KeyboardUtil.java → component_utils/src/main/java/com/rv/component/utils/KeyboardUtil.java

-package com.base.utils.tools.android;
+package com.rv.component.utils;
 
 import android.app.Activity;
 import android.content.Context;

module_camp/src/main/java/com/rv/camp/CampFragment.java

 package com.rv.camp;
 
+import android.Manifest;
 import android.graphics.Rect;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
@@ -8,11 +10,16 @@ import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.baidu.location.BDAbstractLocationListener;
+import com.baidu.location.BDLocation;
+import com.baidu.mapapi.model.LatLng;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.frame.base.url.Constance;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseFragment;
+import com.ruiwenliu.wrapper.util.LocationManager;
+import com.ruiwenliu.wrapper.util.permission.RxPermission;
 import com.rv.camp.adapter.CampListAdapter;
 import com.rv.camp.adapter.CampTypeListAdapter;
 import com.rv.camp.api.CampApi;
@@ -27,6 +34,7 @@ import java.util.Map;
 
 import butterknife.BindView;
 import butterknife.OnClick;
+import io.reactivex.functions.Consumer;
 
 /**
  * 营地
@@ -46,6 +54,10 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
     private int mPage;
     private int countPage;
     private String type = null;
+    private double latLatitude = 0;
+    private double lonLongitude;
+    private LatLng mLatLng;//当前城市经纬度
+    private LocationManager locationManager;
 
 
     public static CampFragment getInstance(int type) {
@@ -64,6 +76,7 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
 
     @Override
     protected void initView(Bundle savedInstanceState) {
+        permissionProcess();
         campAdapter = new CampListAdapter();
         rvContent.setLayoutManager(new GridLayoutManager(_mActivity, 2));
         rvContent.addItemDecoration(new AbSpacesItemDecoration(15));// 分割线。
@@ -94,8 +107,8 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
                 ARouter.getInstance()
                         .build(Constance.ACTIVITY_URL_CAMPDETAIL)
                         .withString("id", data.getId())
-                        .withString("longitude", data.getLongitude())
-                        .withString("latitude", data.getLatitude())
+                        .withString("longitude", String.valueOf(lonLongitude))
+                        .withString("latitude",String.valueOf(latLatitude))
                         .navigation();
             }
         });
@@ -210,6 +223,65 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
         }
     }
 
+    /**
+     * 定位权限处理
+     */
+    private void permissionProcess() {
+
+        /**
+         * 6.0以上手机做权限处理
+         */
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            new RxPermission(getActivity()).request(
+                    Manifest.permission.ACCESS_COARSE_LOCATION,
+                    Manifest.permission.ACCESS_FINE_LOCATION
+            ).subscribe(new Consumer<Boolean>() {
+                @Override
+                public void accept(Boolean aBoolean) throws Exception {
+                    if (aBoolean == true) {
+                        initGps();
+                    } else {
+                        getActivity().finish();
+                    }
+                }
+            });
+        } else {
+            initGps();
+        }
+    }
+
+    /**
+     * 初始化定位
+     */
+    public void initGps() {
+        locationManager = new LocationManager(getContext());
+        locationManager.getLocationDetail(new BDAbstractLocationListener() {
+            @Override
+            public void onReceiveLocation(BDLocation location) {
+                //此处的BDLocation为定位结果信息类，通过它的各种get方法可获取定位相关的全部结果
+                //以下只列举部分获取经纬度相关（常用）的结果信息
+                //更多结果信息获取说明，请参照类参考中BDLocation类中的说明
+
+                //获取定位精度，默认值为0.0f
+                float radius = location.getRadius();
+                //获取经纬度坐标类型，以LocationClientOption中设置过的坐标类型为准
+                String coorType = location.getCoorType();
+                //获取定位类型、定位错误返回码，具体信息可参照类参考中BDLocation类中的说明
+                int errorCode = location.getLocType();
+//                setGpsContent("count=:",String.valueOf(count));
+//                setGpsContent("latitude:",String.valueOf(location.getLatitude()));
+//                setGpsContent("longitude:",String.valueOf(location.getLongitude()));
+//                setGpsContent("城市:",location.getCity());
+//                setGpsContent("街道:",location.getAddrStr());
+//                setGpsContent("当前位置:",location.getLocationDescribe());
+                latLatitude = location.getLatitude();
+                lonLongitude = location.getLongitude();
+                mLatLng = new LatLng(location.getLatitude(), location.getLongitude());
+                locationManager.stopLocation();
+            }
+        });
+    }
+
 
     public class AbSpacesItemDecoration extends RecyclerView.ItemDecoration {
 

module_home/src/main/java/com/rv/home/rv/module/basic/BaseLoginActivity.java

@@ -6,17 +6,20 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.alibaba.fastjson.JSON;
 import com.frame.base.bus.LoginSuccessfulEvent;
 import com.frame.base.bus.RxBus;
 import com.frame.base.url.Constance;
 import com.frame.rv.OnModuleEventListener;
 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.ruiwenliu.wrapper.util.UtilsManager;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.home.R;
 import com.rv.home.rv.module.ApiConfig;
+import com.rv.home.rv.module.basic.bean.BeanUserInfo;
 import com.rv.home.rv.module.ui.login.bean.RegisteredBean;
 import com.rv.home.rv.module.ui.main.home.CarDetailActivity;
 import com.umeng.socialize.UMAuthListener;
@@ -81,6 +84,11 @@ public abstract class BaseLoginActivity<P extends MvpPresenter> extends BaseStat
         UMShareAPI.get(mActivity).getPlatformInfo(mActivity, share_media, this);
     }
 
+
+    public void setDataUser(BeanUserInfo data) {
+        UtilsManager.getInstance(OkGoUtil.application).setSharePreferencesSave(SPConstance.USER_JSON).putString(SPConstance.USER_JSON_USERINFO, JSON.toJSONString(data.getData())).commit();
+    }
+
     /**
      * 第三方登录
      *
@@ -109,21 +117,27 @@ public abstract class BaseLoginActivity<P extends MvpPresenter> extends BaseStat
     }
 
     public void processLoginData(RegisteredBean bean) {
-        RegisteredBean registeredBean = bean;
-        UtilsManager.getInstance(mActivity).setSharePreferencesSave(SPConstance.USER_JSON).putString(SPConstance.USER_JSON_NAME, registeredBean.getData().getUsername()).commit();
-        UtilsManager.getInstance(mActivity).setSharePreferencesSave(SPConstance.USER_JSON).putString(SPConstance.USER_JSON_HEADERURL, registeredBean.getData().getHeaderurl()).commit();
-        UtilsManager.getInstance(mActivity).setSharePreferencesSave(SPConstance.USER_JSON).putString(SPConstance.USER_JSON_USERID, registeredBean.getData().getUserId()).commit();
-        UtilsManager.getInstance(mActivity).setSharePreferencesSave(SPConstance.USER_JSON).putString(SPConstance.USER_JSON_TOKEN, registeredBean.getToken()).commit();
-        UtilsManager.getInstance(mActivity).setSharePreferencesSave(SPConstance.USER_JSON).putString(SPConstance.USER_JSON_IMUSERID, registeredBean.getData().getImUserId()).commit();
-        UtilsManager.getInstance(mActivity).setSharePreferencesSave(SPConstance.USER_JSON).putString(SPConstance.USER_JSON_IMTOKEN, registeredBean.getData().getImToken()).commit();
-        UtilsManager.getInstance(mActivity).setSharePreferencesSave(SPConstance.USER_JSON).putString(SPConstance.USER_JSON_ISCERTIFICATIONSTATUS, registeredBean.getData().getCertificationStatus()).commit();
 
+        RegisteredBean registeredBean = bean;
+        UtilsManager.getInstance(OkGoUtil.application).setSharePreferencesSave(SPConstance.USER_JSON).putString(SPConstance.USER_JSON_NAME, registeredBean.getData().getUsername()).commit();
+        UtilsManager.getInstance(OkGoUtil.application).setSharePreferencesSave(SPConstance.USER_JSON).putString(SPConstance.USER_JSON_HEADERURL, registeredBean.getData().getHeaderurl()).commit();
+        UtilsManager.getInstance(OkGoUtil.application).setSharePreferencesSave(SPConstance.USER_JSON).putString(SPConstance.USER_JSON_USERID, registeredBean.getData().getUserId()).commit();
+        UtilsManager.getInstance(OkGoUtil.application).setSharePreferencesSave(SPConstance.USER_JSON).putString(SPConstance.USER_JSON_TOKEN, registeredBean.getToken()).commit();
+        UtilsManager.getInstance(OkGoUtil.application).setSharePreferencesSave(SPConstance.USER_JSON).putString(SPConstance.USER_JSON_IMUSERID, registeredBean.getData().getImUserId()).commit();
+        UtilsManager.getInstance(OkGoUtil.application).setSharePreferencesSave(SPConstance.USER_JSON).putString(SPConstance.USER_JSON_IMTOKEN, registeredBean.getData().getImToken()).commit();
+        UtilsManager.getInstance(OkGoUtil.application).setSharePreferencesSave(SPConstance.USER_JSON).putString(SPConstance.USER_JSON_ISCERTIFICATIONSTATUS, registeredBean.getData().getCertificationStatus()).commit();
+
+        Map<String, Object> headMap = new LinkedHashMap<>();
+        if (registeredBean.getToken() != null) {
+            headMap.put("Authorization", registeredBean.getToken());
+            mPresenter.getDataHead(RvFrameConfig.ADMIN_POST, 10, ApiConfig.HTTP_URL_APP_USER_INFO, BeanUserInfo.class, headMap, false);
+        }
             OkGoUtil.setToken(registeredBean.getToken());
             switch (RvFrameConfig.RvFrameInfo.TYPE_LOGIN) {
                 case 1:
-                if ("0".equals(bean.getData().getCertificationStatus())){   //实名认证状态:0-未认证，1-已认证
+                    if ("0".equals(bean.getData().getCertificationStatus())) {   //实名认证状态:0-未认证，1-已认证
                         ARouter.getInstance().build(Constance.ACTIVITY_URL_IDCARDCERTIFICATION).navigation();
-                }else {
+                    } else {
                         startActivity(CarDetailActivity.getIntent(mActivity, 1));
                     }
                     break;
@@ -136,4 +150,4 @@ public abstract class BaseLoginActivity<P extends MvpPresenter> extends BaseStat
             finish();
         }
 
-}
+    }

module_home/src/main/java/com/rv/home/rv/module/basic/WebActivity.java

@@ -12,6 +12,7 @@ import com.ruiwenliu.wrapper.weight.webview.SafeWebView;
 import com.rv.home.R;
 import com.rv.home.rv.module.basic.presenter.PickerPresenter;
 import com.rv.home.R2;
+
 import butterknife.BindView;
 
 public class WebActivity extends BaseStatusActivity<PickerPresenter> {
@@ -21,8 +22,14 @@ public class WebActivity extends BaseStatusActivity<PickerPresenter> {
     @BindView(R2.id.lay_web)
     LinearLayout mRoot;
 
+    String title;
+    String url;
+    int type;
+
     public static Intent getIntent(Context context, String title, String url) {
-        return new Intent(context, WebActivity.class).putExtra("title", title).putExtra("url", url);
+        return new Intent(context, WebActivity.class)
+                .putExtra("title", title)
+                .putExtra("url", url);
     }
 
 
@@ -40,7 +47,12 @@ public class WebActivity extends BaseStatusActivity<PickerPresenter> {
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         titleView.setTitle(intent.getStringExtra("title"));
         String url = intent.getStringExtra("url");
+        if (0 == type) {
             mWebView.loadUrl(url);
+        } else {
+            String baseUrl = url + "?type=" + type;
+            mWebView.loadUrl(baseUrl);
+        }
     }
 
     @Override
@@ -49,7 +61,6 @@ public class WebActivity extends BaseStatusActivity<PickerPresenter> {
     }
 
 
-
     @Override
     public void onResume() {
         super.onResume();

module_home/src/main/java/com/rv/home/rv/module/basic/bean/BeanUserInfo.java

+package com.rv.home.rv.module.basic.bean;
+
+import com.ruiwenliu.wrapper.base.BaseBean;
+
+import java.io.Serializable;
+
+/**
+ * 获取用户信息
+ */
+public class BeanUserInfo extends BaseBean {
+    private UserInfo data;
+    private boolean rel;
+
+    public UserInfo getData() {
+        return data;
+    }
+
+    public void setData(UserInfo data) {
+        this.data = data;
+    }
+
+    public boolean isRel() {
+        return rel;
+    }
+
+    public void setRel(boolean rel) {
+        this.rel = rel;
+    }
+
+    public static class UserInfo implements Serializable {
+        private Integer id;
+
+        //用户id
+        private Integer userid;
+        //imid
+        private Integer imUserid;
+        ///账号（手机号）
+        private String username;
+        //微信openid
+        private String wxOpenid;
+        //微信unionid
+        private String unionid;
+        //qq
+        private String openid;
+        //状态：0-启用，1-禁用
+        private Integer status;
+        //身份证号
+        private String idNumber;
+        //实名认证状态:0-未认证，1-已认证
+        private Integer certificationStatus;
+        //会员
+        private Integer isMember;  // 是否为会员 0-普通用户  1-会员
+        //昵称
+        private String nickname;
+        //真实姓名
+        private String realname;
+        //头像
+        private String headimgurl;
+        //邮箱
+        private String email;
+        //性别 0-女，1-男
+        private Integer sex;
+        //生日
+        private String birthday;
+        //个性签名
+        private String personSign;
+        //备注
+        private String remark;
+        // 剩余天数
+        private int  rentFreeDays ;
+        // 会员消费次数
+        private int payCount;
+        // 购买会员册数
+        private int buyCount ;
+        // 会员等级
+        private int memberLevel;
+
+        private int discount;
+
+        public Integer getId() {
+            return id;
+        }
+
+        public void setId(Integer id) {
+            this.id = id;
+        }
+
+        public Integer getUserid() {
+            return userid;
+        }
+
+        public void setUserid(Integer userid) {
+            this.userid = userid;
+        }
+
+        public Integer getImUserid() {
+            return imUserid;
+        }
+
+        public void setImUserid(Integer imUserid) {
+            this.imUserid = imUserid;
+        }
+
+        public String getUsername() {
+            return username;
+        }
+
+        public void setUsername(String username) {
+            this.username = username;
+        }
+
+        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;
+        }
+
+        public Integer getStatus() {
+            return status;
+        }
+
+        public void setStatus(Integer status) {
+            this.status = status;
+        }
+
+        public String getIdNumber() {
+            return idNumber;
+        }
+
+        public void setIdNumber(String idNumber) {
+            this.idNumber = idNumber;
+        }
+
+        public Integer getCertificationStatus() {
+            return certificationStatus;
+        }
+
+        public void setCertificationStatus(Integer certificationStatus) {
+            this.certificationStatus = certificationStatus;
+        }
+
+        public Integer getIsMember() {
+            return isMember;
+        }
+
+        public void setIsMember(Integer isMember) {
+            this.isMember = isMember;
+        }
+
+        public String getNickname() {
+            return nickname;
+        }
+
+        public void setNickname(String nickname) {
+            this.nickname = nickname;
+        }
+
+        public String getRealname() {
+            return realname;
+        }
+
+        public void setRealname(String realname) {
+            this.realname = realname;
+        }
+
+        public String getHeadimgurl() {
+            return headimgurl;
+        }
+
+        public void setHeadimgurl(String headimgurl) {
+            this.headimgurl = headimgurl;
+        }
+
+        public String getEmail() {
+            return email;
+        }
+
+        public void setEmail(String email) {
+            this.email = email;
+        }
+
+        public Integer getSex() {
+            return sex;
+        }
+
+        public void setSex(Integer sex) {
+            this.sex = sex;
+        }
+
+        public String getBirthday() {
+            return birthday;
+        }
+
+        public void setBirthday(String birthday) {
+            this.birthday = birthday;
+        }
+
+        public String getPersonSign() {
+            return personSign;
+        }
+
+        public void setPersonSign(String personSign) {
+            this.personSign = personSign;
+        }
+
+        public String getRemark() {
+            return remark;
+        }
+
+        public void setRemark(String remark) {
+            this.remark = remark;
+        }
+
+        public int getRentFreeDays() {
+            return rentFreeDays;
+        }
+
+        public void setRentFreeDays(int rentFreeDays) {
+            this.rentFreeDays = rentFreeDays;
+        }
+
+        public int getPayCount() {
+            return payCount;
+        }
+
+        public void setPayCount(int payCount) {
+            this.payCount = payCount;
+        }
+
+        public int getBuyCount() {
+            return buyCount;
+        }
+
+        public void setBuyCount(int buyCount) {
+            this.buyCount = buyCount;
+        }
+
+        public int getMemberLevel() {
+            return memberLevel;
+        }
+
+        public void setMemberLevel(int memberLevel) {
+            this.memberLevel = memberLevel;
+        }
+
+        public int getDiscount() {
+            return discount;
+        }
+
+        public void setDiscount(int discount) {
+            this.discount = discount;
+        }
+    }
+}

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

@@ -19,6 +19,12 @@ import com.alibaba.android.arouter.launcher.ARouter;
 import com.baidu.location.BDAbstractLocationListener;
 import com.baidu.location.BDLocation;
 import com.baidu.mapapi.model.LatLng;
+import com.baidu.mapapi.search.core.SearchResult;
+import com.baidu.mapapi.search.geocode.GeoCodeOption;
+import com.baidu.mapapi.search.geocode.GeoCodeResult;
+import com.baidu.mapapi.search.geocode.GeoCoder;
+import com.baidu.mapapi.search.geocode.OnGetGeoCoderResultListener;
+import com.baidu.mapapi.search.geocode.ReverseGeoCodeResult;
 import com.base.utils.tools.android.IntentUtil;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.frame.base.browse.ActivityImageBrowseUrl;
@@ -89,6 +95,7 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements B
     private double lonLongitude;
     private LatLng mLatLng;//当前城市经纬度
     private LocationManager locationManager;
+    private GeoCoder geoCoder;
 
 
     public static TourismFragment getInstance(int type) {
@@ -184,8 +191,8 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements B
             //搜索
             ARouter.getInstance()
                     .build(Constance.ACTIVITY_URL_TRAVELSEARCH)
-                    .withDouble("latLatitude",latLatitude)
-                    .withDouble("lonLongitude",lonLongitude)
+                    .withDouble("latLatitude", latLatitude)
+                    .withDouble("lonLongitude", lonLongitude)
                     .navigation();
         } else if (id == R.id.travel_server_image) {
             showToast("亲，该功能还在开发中。。。");
@@ -212,7 +219,7 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements B
         map.put("query", "");
         map.put("page", page);
         map.put("limit", "10");
-        map.put("latitudel", latLatitude);
+        map.put("latitude", latLatitude);
         map.put("longitude", lonLongitude);
         mPresenter.getData(2, TourismApi.QUERY_RIM_LIST, BeanTourAround.class, map, false);
     }
@@ -339,9 +346,7 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements B
     @Override
     public void onDestroy() {
         super.onDestroy();
-//        if (ModuleEventUtil.getOnModuleEventListener() != null) {
-//            ModuleEventUtil.getOnModuleEventListener().onClear();
-//        }
+        geoCoder.destroy();
     }
 
 
@@ -377,9 +382,10 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements B
     private void setRequestData(int type, String data, double lat, double lon) {
         switch (type) {
             case 1:
-                latLatitude = lat;
-                lonLongitude = lon;
                 travelCityText.setText(data);
+                geoCoder.geocode(new GeoCodeOption()
+                        .city(data)
+                        .address(data));
                 break;
         }
     }
@@ -421,6 +427,7 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements B
                 public void accept(Boolean aBoolean) throws Exception {
                     if (aBoolean == true) {
                         initGps();
+                        initCity();
                     } else {
                         getActivity().finish();
                     }
@@ -428,9 +435,41 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements B
             });
         } else {
             initGps();
+            initCity();
         }
     }
 
+    private void initCity() {
+        geoCoder = GeoCoder.newInstance();
+        geoCoder.setOnGetGeoCodeResultListener(new OnGetGeoCoderResultListener() {
+            @Override
+            public void onGetGeoCodeResult(GeoCodeResult result) {
+                if (result == null || result.error != SearchResult.ERRORNO.NO_ERROR) {
+                    //没有检索到结果
+                } else {
+                    latLatitude = result.getLocation().latitude;
+                    lonLongitude = result.getLocation().longitude;
+
+                    mTourAroundAdapter.getData().clear();
+                    mTourAroundAdapter.notifyDataSetChanged();
+                    loadTourAroundData();
+                }
+                //获取地理编码结果
+            }
+
+            @Override
+            public void onGetReverseGeoCodeResult(ReverseGeoCodeResult result) {
+                if (result == null || result.error != SearchResult.ERRORNO.NO_ERROR) {
+                    //没有找到检索结果
+                } else {
+                    latLatitude = result.getLocation().latitude;
+                    lonLongitude = result.getLocation().longitude;
+                }
+            }
+        });
+    }
+
+
     /**
      * 初始化定位
      */

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

@@ -119,9 +119,12 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
             //收藏
             if ("1".equals(isCollection)) {
                 cancelCollect();
+                ivCollect.setImageResource(R.drawable.travel_rv_collect);
             } else {
                 addCollect();
+                ivCollect.setImageResource(R.drawable.common_icon_collected);
             }
+            ivCollect.setEnabled(false);
 
         } else if (id == R.id.iv_share) {
             //分享
@@ -188,12 +191,12 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
             case 1:
                 showToast("收藏成功");
                 isCollection = "1";
-                ivCollect.setImageResource(R.drawable.common_icon_collected);
+                ivCollect.setEnabled(true);
                 break;
             case 2:
                 showToast("取消收藏成功");
                 isCollection = "0";
-                ivCollect.setImageResource(R.drawable.travel_rv_collect);
+                ivCollect.setEnabled(true);
                 break;
 
         }
@@ -354,7 +357,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
                     @Override
                     public void run() {
                         TvAppointment.setEnabled(false);
-                        TvAppointment.setText("库存不足");
+                        TvAppointment.setText("已售完");
                         TvAppointment.setBackground(mActivity.getResources().getDrawable(R.color.gray_707070));
                     }
                 });

plugin_search/build.gradle

@@ -39,5 +39,6 @@ dependencies {
     annotationProcessor 'com.alibaba:arouter-compiler:1.1.4'
     api project(':RvWrapper')
     api project(':component_resource')
+    api project(':component_utils')
 
 }

plugin_search/src/main/java/com/rv/search/TravelSearchActivity.java

@@ -15,6 +15,7 @@ import com.frame.base.url.Constance;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.weight.TitleView;
+import com.rv.component.utils.KeyboardUtil;
 import com.rv.plugin.search.R;
 import com.rv.plugin.search.R2;
 import com.rv.search.adapter.TravelSearchAdapter;
@@ -79,8 +80,6 @@ public class TravelSearchActivity extends BaseStatusActivity<SearchPresenter> {
                 }
             }
         });
-
-
     }
 
     @OnClick({R2.id.iv_back, R2.id.tv_search})
@@ -104,6 +103,7 @@ public class TravelSearchActivity extends BaseStatusActivity<SearchPresenter> {
     }
 
     private void setData(BeanTravelSearch data) {
+        KeyboardUtil.hideKeyboard(mActivity);
         if (mPage == 1) {
              mTravelSearchAdapter.getData().clear();
              mTravelSearchAdapter.notifyDataSetChanged();

plugin_search/src/main/res/layout/activity_travel_search.xml

@@ -26,11 +26,14 @@
             android:layout_width="0dp"
             android:layout_height="@dimen/size_40"
             android:layout_weight="1"
+            android:maxLines="1"
+            android:singleLine="true"
             android:background="@drawable/shape_rv_travel_search_line"
             android:drawableLeft="@drawable/search"
             android:drawablePadding="@dimen/size_15"
             android:hint="搜索目的地/旅游线"
             android:paddingLeft="@dimen/size_15"
+
             android:textColor="@color/textMain"
             android:textSize="@dimen/text_14" />
 

settings.gradle

 //include ':WXPay'
-include ':RvFrame', ':plugin_search', ':component_utils'
+include ':RvFrame', ':plugin_search', ':component_utils', ':component_control'
 include ':RvTravel'
 include ':RvClient'
 include ':RvWrapper'