Skip to content

R
RvApp
Commit 8face6ae authored by jianglx's avatar jianglx
Browse files
Options

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

# Conflicts:
#	settings.gradle
parents 3dfa4f57 2ff9794d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2459 additions and 561 deletions
OkGo/src/main/java/com/yuyife/okgo/OkGoUtil.java
View file @ 8face6ae
......@@ -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
View file @ 8face6ae
......@@ -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
View file @ 8face6ae
......@@ -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
View file @ 8face6ae
......@@ -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
View file @ 8face6ae
......@@ -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
View file @ 8face6ae
......@@ -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/build.gradle 0 → 100644
View file @ 8face6ae
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 0 → 100644
View file @ 8face6ae
# 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 0 → 100644
View file @ 8face6ae
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.rv.component.control" />
component_control/src/main/res/values/strings.xml 0 → 100644
View file @ 8face6ae
<resources>
<string name="app_name">component_control</string>
</resources>
component_control/src/main/res/values/switch_button_attrs.xml 0 → 100644
View file @ 8face6ae
<?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 0 → 100644
View file @ 8face6ae
<?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
View file @ 8face6ae
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
View file @ 8face6ae
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/build.gradle
View file @ 8face6ae
......@@ -39,10 +39,12 @@ dependencies {
api project(':component_resource')
api project(':component_dialog')
api project(':component_utils')
api project(':component_control')
api project(':plugin_search')
api project(':RvWrapper')
// api project(':RvTravel')
annotationProcessor'com.alibaba:arouter-compiler:1.1.4'
implementation 'com.alibaba:fastjson:1.2.21'
}
module_home/src/main/java/com/rv/home/rv/module/ApiConfig.java
View file @ 8face6ae
......@@ -48,6 +48,7 @@ public class ApiConfig {
public static String HTTP_URL_GETTOURUSERLIST = RvFrameConfig.VEHICLE_TOURUSER + "tourUser/app/unauth/getTourUserList";//获得全部出游人信息
public static String HTTP_URL_ADDANDUPDATE = RvFrameConfig.VEHICLE_TOURUSER + "tourUser/app/addAndUpdate";//添加和更新出游人信息
public static String HTTP_URL_CAR_TYPE_NOTICE = RvFrameConfig.HOST + "/h5/appHtml/view/notice.html";//预定须知
public static String HTTP_URL_COLLECTONLIST = RvFrameConfig.ADMIN_POST + "app/user/collect/page";//我的收藏列表
public static String HTTP_URL_SCORE = RvFrameConfig.HOST + "/vehicle/vehicleUserScore/score";//订单评价保存
......
module_home/src/main/java/com/rv/home/rv/module/basic/BaseLoginActivity.java
View file @ 8face6ae
......@@ -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,31 +117,37 @@ 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();
OkGoUtil.setToken(registeredBean.getToken());
switch (RvFrameConfig.RvFrameInfo.TYPE_LOGIN) {
case 1:
if ("0".equals(bean.getData().getCertificationStatus())){ //实名认证状态:0-未认证，1-已认证
ARouter.getInstance().build(Constance.ACTIVITY_URL_IDCARDCERTIFICATION).navigation();
}else {
startActivity(CarDetailActivity.getIntent(mActivity, 1));
}
break;
default:
finish();
break;
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-已认证
ARouter.getInstance().build(Constance.ACTIVITY_URL_IDCARDCERTIFICATION).navigation();
} else {
startActivity(CarDetailActivity.getIntent(mActivity, 1));
}
break;
default:
finish();
break;
}
RxBus.post(new LoginSuccessfulEvent());
finish();
}
RxBus.post(new LoginSuccessfulEvent());
finish();
}
}
module_home/src/main/java/com/rv/home/rv/module/basic/WebActivity.java
View file @ 8face6ae
......@@ -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");
mWebView.loadUrl(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 0 → 100644
View file @ 8face6ae
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_home/src/main/java/com/rv/home/rv/module/ui/login/BingPhoneActivity.java
View file @ 8face6ae
......@@ -18,6 +18,7 @@ import com.rv.home.R;
import com.rv.home.R2;
import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.basic.BaseLoginActivity;
import com.rv.home.rv.module.basic.bean.BeanUserInfo;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.login.bean.CheckLoginBean;
import com.rv.home.rv.module.ui.login.bean.RegisteredBean;
......@@ -117,6 +118,9 @@ public class BingPhoneActivity extends BaseLoginActivity<CommonPresenter> {
case 2:
processLoginData((RegisteredBean) result);
break;
case 10:
setDataUser((BeanUserInfo)result);
break;
}
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/login/ConfirmPwdActivity.java
View file @ 8face6ae
......@@ -17,6 +17,7 @@ import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.util.listener.TextChangedListener;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.home.rv.module.basic.BaseLoginActivity;
import com.rv.home.rv.module.basic.bean.BeanUserInfo;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.login.bean.RegisteredBean;
import com.umeng.socialize.bean.SHARE_MEDIA;
......@@ -99,6 +100,8 @@ public class ConfirmPwdActivity extends BaseLoginActivity<CommonPresenter> {
public void onShowResult(int requestType, BaseBean result) {
if (requestType == 2) {
processLoginData((RegisteredBean) result);
}else if (requestType == 10){
setDataUser((BeanUserInfo)result);
}
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/login/LoginRvActivity.java
View file @ 8face6ae
......@@ -26,6 +26,7 @@ import com.rv.home.R2;
import com.frame.rv.config.RvFrameConfig;
import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.basic.BaseLoginActivity;
import com.rv.home.rv.module.basic.bean.BeanUserInfo;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.login.bean.RegisteredBean;
import com.rv.home.rv.module.ui.login.bean.SendCodeBean;
......@@ -115,6 +116,9 @@ public class LoginRvActivity extends BaseLoginActivity<CommonPresenter> {
case 2:
processLoginData((RegisteredBean) result);
break;
case 10:
setDataUser((BeanUserInfo)result);
break;
}
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/login/PwdLoginActivity.java
View file @ 8face6ae
......@@ -18,6 +18,7 @@ import com.rv.home.R;
import com.rv.home.R2;
import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.basic.BaseLoginActivity;
import com.rv.home.rv.module.basic.bean.BeanUserInfo;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.login.bean.RegisteredBean;
import com.umeng.socialize.bean.SHARE_MEDIA;
......@@ -71,6 +72,8 @@ public class PwdLoginActivity extends BaseLoginActivity<CommonPresenter> {
public void onShowResult(int requestType, BaseBean result) {
if (requestType == 0) {
processLoginData((RegisteredBean) result);
}else if (requestType == 10){
setDataUser((BeanUserInfo)result);
}
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/login/RegisteredActivity.java
View file @ 8face6ae
......@@ -22,6 +22,7 @@ import com.rv.home.R;
import com.rv.home.R2;
import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.basic.BaseLoginActivity;
import com.rv.home.rv.module.basic.bean.BeanUserInfo;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.login.bean.RegisteredBean;
import com.rv.home.rv.module.ui.login.bean.SendCodeBean;
......@@ -106,6 +107,9 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
case 1:
processLoginData((RegisteredBean) result);
break;
case 10:
setDataUser((BeanUserInfo) result);
break;
}
}
......@@ -239,7 +243,7 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
* @return
*/
private String getAgainPwd() {
return etPwd.getText().toString().trim();
return etAgainPwd.getText().toString().trim();
}
;
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarDetailActivity.java
View file @ 8face6ae
......@@ -87,7 +87,7 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
tvTitleCenter.setText("车辆详情");
webUrl = ApiConfig.HTTP_URL_CAR_TYPE_DETAIL + "?id=" + mCarBean.getVehicleModel().getId() + "&companyId=" + mCarBean.getCompany().getId();
initWeb();
initShare(webUrl, mCarBean.getVehicleModel().getName(), mCarBean.getCompany().getAddrDetail(), mCarBean.getVehicleModel().getPicture());
initShare(webUrl, mCarBean.getVehicleModel().getName(), mCarBean.getCompany().getAddrDetail(), mCarBean.getVehicleModel().getIcon());
}
@Override
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarRentalListActivity.java
View file @ 8face6ae
......@@ -229,32 +229,6 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
}
showSelected(multiList);
}
// switch (view.getId()) {
// case R.id.rl_brand:
// setMenuSelect(0, view, attributeListBean.getData().getCata().get(0).getChildren(), tvBrand.getText().toString().trim());
// break;
// case R.id.rl_price:
// setMenuSelect(1, view, attributeListBean.getData().getCata().get(1).getChildren(), tvPrice.getText().toString().trim());
// break;
// case R.id.rl_seat:
// setMenuSelect(2, view, attributeListBean.getData().getCata().get(2).getChildren(), tvSeat.getText().toString().trim());
// break;
// case R.id.rl_selected:
// setMenuSelect(3, view, null, null);
// List<MultiItemBean> multiList = new ArrayList<>();
// for (CarAttributeListBean.DataBean.CataBean bean : attributeListBean.getData().getCata()) {
// multiList.add(bean);
// for (CarAttributeListBean.DataBean.CataBean.ChildrenBean childrenBean : bean.getChildren()) {
// if (listScreeningId != null && listScreeningId.size() > 0) {
// childrenBean.isSelect = listScreeningId.indexOf(childrenBean.getId()) > -1 ? 1 : 0;
// }
// multiList.add(childrenBean);
// }
// }
// showSelected(multiList);
// break;
// }
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/HomeFragment.java
View file @ 8face6ae
......@@ -31,6 +31,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.ui.datetime.selector.util.TextUtil;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.frame.base.url.Constance;
......@@ -48,6 +54,7 @@ import com.rv.component.utils.ObservableScrollView;
import com.rv.home.R;
import com.rv.home.R2;
import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.basic.WebActivity;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.main.home.adapter.HotCarTypeAdapter;
import com.rv.home.rv.module.ui.main.home.adapter.RVEnthusiastAdapter;
......@@ -193,6 +200,7 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
private Map<String, Integer> mapGetTime;
private Map<String, Integer> mapOutTime;
private LocationManager locationManager;
private GeoCoder geoCoder;
private List<HomePopularBrigade.DataBean> hotData; //热门标签
private double rvTourLatitude = 0;
......@@ -430,9 +438,15 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
mRvTourAdapter.setNewData(hotData);
mRvTourLabelAdapter.setNewData(hotData);
}
@OnClick({R2.id.travel_city_layout, R2.id.ll_item_search,R2.id.tv_item_rv_tour, R2.id.tv_item_renting_a_car, R2.id.tv_get_city, R2.id.tv_out_city, R2.id.tv_get_address, R2.id.tv_out_address, R2.id.ll_item_get_time, R2.id.ll_item_alsotime, R2.id.tv_select_car, R2.id.ll_item_rv_city, R2.id.tv_book_now, R2.id.ll_item_rv_hot_label1, R2.id.ll_item_rv_hot_label2, R2.id.ll_item_rv_hot_label3, R2.id.ll_item_hot_rvtour, R2.id.ll_item_hot_entertainment_camp, R2.id.ll_item_hot_car_rental, R2.id.tv_see_more_popular, R2.id.ll_item_top})
@OnClick({R2.id.travel_city_layout, R2.id.ll_item_search,R2.id.tv_item_rv_tour, R2.id.tv_item_renting_a_car, R2.id.tv_get_city,
R2.id.tv_out_city, R2.id.tv_get_address, R2.id.tv_out_address, R2.id.ll_item_get_time, R2.id.ll_item_alsotime, R2.id.tv_select_car,
R2.id.ll_item_rv_city, R2.id.tv_book_now, R2.id.ll_item_rv_hot_label1, R2.id.ll_item_rv_hot_label2, R2.id.ll_item_rv_hot_label3,
R2.id.ll_item_hot_rvtour, R2.id.ll_item_hot_entertainment_camp, R2.id.ll_item_hot_car_rental, R2.id.tv_see_more_popular,
R2.id.ll_item_top, R2.id.tv_car_rental_guide})
public void onViewClicked(View view) {
int id = view.getId();
if (id == R.id.travel_city_layout) {
......@@ -638,6 +652,9 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
scrollview.fullScroll(View.FOCUS_UP);
}else if (id == R.id.travel_server_image){
showToast("亲，该功能还在开发中。。。");
}else if (id == R.id.tv_car_rental_guide){
//租车指南
startActivity(WebActivity.getIntent(_mActivity, _mActivity.getString(R.string.rv_contract_agreement), ApiConfig.HTTP_URL_CAR_TYPE_NOTICE));
}
}
......@@ -710,9 +727,11 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
tvRvCity.setText(data);
break;
case 4:
travelCityLatitude = lat;
travelCityLongitude = lon;
travelCityText.setText(data);
geoCoder.geocode(new GeoCodeOption()
.city(data)
.address(data));
break;
}
}
......@@ -1008,6 +1027,7 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
public void accept(Boolean aBoolean) throws Exception {
if (aBoolean == true) {
initGps();
initCity();
} else {
getActivity().finish();
}
......@@ -1015,9 +1035,36 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
});
} 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;
}
//获取地理编码结果
}
@Override
public void onGetReverseGeoCodeResult(ReverseGeoCodeResult result) {
if (result == null || result.error != SearchResult.ERRORNO.NO_ERROR) {
//没有找到检索结果
}else {
latLatitude = result.getLocation().latitude;
lonLongitude = result.getLocation().longitude;
}
}
});
}
/**
* 初始化定位
*/
......@@ -1054,4 +1101,10 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
}
});
}
@Override
public void onDestroy() {
super.onDestroy();
geoCoder.destroy();
}
}
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/ShareImageActivity.java
View file @ 8face6ae
......@@ -66,7 +66,7 @@ public class ShareImageActivity extends SwipeBackActivity<CommonPresenter> {
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
showTitle(false);
mCarBean = (CarTypeListBean.DataBeanX.DataBean) getIntent().getSerializableExtra("carBean");
GlideManager.getInstance(this).loadImage(mCarBean.getVehicleModel().getPicture(), ivGoods);
GlideManager.getInstance(this).loadImage(mCarBean.getVehicleModel().getIcon(), ivGoods);
tvName.setText(mCarBean.getVehicleModel().getName());
tvContent.setText(mCarBean.getVehicleModel().getKeyword());
tvPrice.setText(String.format("%1$s%2$s", mCarBean.getVehicleModel().getPrice(), this.getString(R.string.rv_day)));
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/adapter/CarRentalListAdapter.java
View file @ 8face6ae
......@@ -27,7 +27,7 @@ public class CarRentalListAdapter extends BaseQuickAdapter<CarTypeListBean.DataB
helper.setText(R.id.tv_name,item.getVehicleModel().getName());
helper.setText(R.id.tv_context,item.getVehicleModel().getKeyword());
helper.setText(R.id.tv_point,String.valueOf(item.getVehicleModel().getPoint()));
helper.loadImage(mContext,item.getVehicleModel().getPicture(), (ImageView) helper.getView(R.id.iv_goods));
helper.loadImage(mContext,item.getVehicleModel().getIcon(), (ImageView) helper.getView(R.id.iv_goods));
// helper.setText(R.id.tv_name,item);
helper.setText(R.id.tv_price,String.format("¥%1$s%2$s",item.getVehicleModel().getPrice(),mContext.getString(R.string.rv_day)));
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/bean/CarTypeListBean.java
View file @ 8face6ae
package com.rv.home.rv.module.ui.main.home.bean;
import com.alibaba.fastjson.JSON;
import com.base.utils.ui.datetime.selector.util.TextUtil;
import com.google.gson.Gson;
import com.google.gson.annotations.SerializedName;
import com.google.gson.reflect.TypeToken;
import com.ruiwenliu.wrapper.SPConstance;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.util.UtilsManager;
import com.rv.home.rv.module.basic.bean.BeanUserInfo;
import com.yuyife.okgo.OkGoUtil;
import org.w3c.dom.Text;
import java.io.Serializable;
import java.util.List;
......@@ -12,7 +22,7 @@ import java.util.List;
* Desc:租车类型列表
*/
public class CarTypeListBean extends BaseBean implements Serializable{
public class CarTypeListBean extends BaseBean implements Serializable {
/**
......@@ -39,7 +49,7 @@ public class CarTypeListBean extends BaseBean implements Serializable{
this.rel = rel;
}
public static class DataBeanX implements Serializable{
public static class DataBeanX implements Serializable {
/**
* totalCount : 32
* totalPage : 4
......@@ -94,7 +104,7 @@ public class CarTypeListBean extends BaseBean implements Serializable{
this.data = data;
}
public static class DataBean implements Serializable{
public static class DataBean implements Serializable {
/**
* distance : 4307.442767774642
* vehicleModel : {"id":25,"name":"大通自行式C型房车（旅居版）车型24","licensePlate":"C24","factory":1,"keyword":"烧烤,6乘29卧,麻将,微波炉","point":0,"picture":"https://xxfcim.upyuns.com/image/u/2/10000002/201905/o/adb766b69c0140018a3aaaa08b37d41d.jpg"}
......@@ -129,7 +139,7 @@ public class CarTypeListBean extends BaseBean implements Serializable{
this.company = company;
}
public static class VehicleModelBean implements Serializable{
public static class VehicleModelBean implements Serializable {
/**
* id : 25
* name : 大通自行式C型房车（旅居版）车型24
......@@ -148,6 +158,48 @@ public class CarTypeListBean extends BaseBean implements Serializable{
private double point;
private String picture;
private double price;
private String rentDiscountPrice;//租车优惠价格
private int rentDiscountStatus;//租车优惠状态 0–没有优惠;1–会员折扣;2–固定值
public double getSum() {
BeanUserInfo.UserInfo info = null;
String spStringCode = UtilsManager.getInstance(OkGoUtil.application).getSPStringCode(SPConstance.USER_JSON, SPConstance.USER_JSON_USERINFO);
if (!TextUtil.isEmpty(spStringCode)) {
info = JSON.parseObject(spStringCode, BeanUserInfo.UserInfo.class);
}
double amount = price;
if (info == null) {
return price;
}
if (0 == info.getIsMember()) { //不是会员
amount = price;
} else if (1 == info.getIsMember()) { //会员
if (0 == rentDiscountStatus) {
amount = price;
} else if (1 == rentDiscountStatus) {
int discount = info.getDiscount();
amount = price * (discount / 100);
} else if (2 == rentDiscountStatus) {
if (!TextUtil.isEmpty(rentDiscountPrice)){
String[] list = rentDiscountPrice.split(",");
int memberLevel = info.getMemberLevel();//1 普通会员 2 黄金会员 3 钻石会员
if (list !=null && list.length >1){
if (1==memberLevel){
amount = Integer.valueOf(list[0]);
}else if (2==memberLevel){
amount = Integer.valueOf(list[1]);
}else if (3==memberLevel){
amount = Integer.valueOf(list[2]);
}
}
}
}
}
return amount;
}
public double getPrice() {
return price;
......@@ -212,9 +264,39 @@ public class CarTypeListBean extends BaseBean implements Serializable{
public void setPicture(String picture) {
this.picture = picture;
}
public String getIcon() {
String icon = "";
if (!TextUtil.isEmpty(picture)) {
String[] icons = picture.split(",");
if (icons != null && icons.length > 0) {
icon = icons[0];
} else {
icon = picture;
}
}
return icon;
}
public String getRentDiscountPrice() {
return rentDiscountPrice;
}
public void setRentDiscountPrice(String rentDiscountPrice) {
this.rentDiscountPrice = rentDiscountPrice;
}
public int getRentDiscountStatus() {
return rentDiscountStatus;
}
public void setRentDiscountStatus(int rentDiscountStatus) {
this.rentDiscountStatus = rentDiscountStatus;
}
}
public static class CompanyBean implements Serializable{
public static class CompanyBean implements Serializable {
/**
* id : 2
* name : 深圳宝安分公司
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/bean/OrderDataBean.java
View file @ 8face6ae
......@@ -48,6 +48,9 @@ public class OrderDataBean implements Serializable{
private int startCompanyId;
private long startTime;
// private int vehicleId;
private int damageSafe;//是否购买免赔 1--是 0--否
private int rentFreeDay;//是否使用出租免费天数 1--是 0--否
private String couponIds;//优惠券ids，逗号分割
public int getDayNum() {
return dayNum;
......@@ -163,6 +166,29 @@ public class OrderDataBean implements Serializable{
this.startTime = startTime;
}
public int getDamageSafe() {
return damageSafe;
}
public void setDamageSafe(int damageSafe) {
this.damageSafe = damageSafe;
}
public int getRentFreeDay() {
return rentFreeDay;
}
public void setRentFreeDay(int rentFreeDay) {
this.rentFreeDay = rentFreeDay;
}
public String getCouponIds() {
return couponIds;
}
public void setCouponIds(String couponIds) {
this.couponIds = couponIds;
}
@Override
public String toString() {
......@@ -181,6 +207,9 @@ public class OrderDataBean implements Serializable{
", startCityName='" + startCityName + '\'' +
", startCompanyId=" + startCompanyId +
", startTime=" + startTime +
", damageSafe=" + damageSafe +
", rentFreeDay=" + rentFreeDay +
", couponIds='" + couponIds + '\'' +
'}';
}
}
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/bean/OrderPriceBean.java
View file @ 8face6ae
......@@ -46,9 +46,12 @@ public class OrderPriceBean extends BaseBean{
private double orderAmount;
private double goodsAmount;
private double vehicleAmount;
private int driverAmount;
private int deposit;
private int driverAmount; //司机价格
private double driverPrice; //司机单价
private int deposit; // 押金价格
private String costDetail;
private double damageSafePrice;//免赔付单价
private double damageSafeAmount;//免赔付价格
public String getCostDetail() {
return costDetail;
......@@ -97,5 +100,29 @@ public class OrderPriceBean extends BaseBean{
public void setDeposit(int deposit) {
this.deposit = deposit;
}
public double getDriverPrice() {
return driverPrice;
}
public void setDriverPrice(double driverPrice) {
this.driverPrice = driverPrice;
}
public double getDamageSafePrice() {
return damageSafePrice;
}
public void setDamageSafePrice(double damageSafePrice) {
this.damageSafePrice = damageSafePrice;
}
public double getDamageSafeAmount() {
return damageSafeAmount;
}
public void setDamageSafeAmount(double damageSafeAmount) {
this.damageSafeAmount = damageSafeAmount;
}
}
}
module_home/src/main/res/layout/fragment_home.xml
View file @ 8face6ae
......@@ -343,6 +343,7 @@
android:textSize="@dimen/text_16" />
<TextView
android:id="@+id/tv_car_rental_guide"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_20"
......
module_home/src/main/res/values/strings.xml
View file @ 8face6ae
......@@ -77,7 +77,7 @@
<string name="rv_cancel">取消</string>
<string name="rv_shop_map">门店地图</string>
<string name="rv_select_car_num_hint">选择车辆数量</string>
<string name="rv_select_driving_num_hint">欣新专职司机（￥600/天）</string>
<string name="rv_select_driving_num_hint">欣新专职司机</string>
<string name="rv_user_driving">自驾</string>
<string name="rv_user_driving_hint">(需提供驾驶人信息)</string>
<string name="rv_driving_set">驾驶人设置</string>
......
module_tourism/src/main/java/com/rv/tourism/TourismFragment.java
View file @ 8face6ae
......@@ -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
View file @ 8face6ae
......@@ -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
View file @ 8face6ae
......@@ -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
View file @ 8face6ae
......@@ -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
View file @ 8face6ae
......@@ -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
View file @ 8face6ae
//include ':WXPay'
include ':RvFrame', ':plugin_search', ':component_utils', ':memer', ':plugin_member', ':plugin_version'
include ':RvFrame', ':plugin_search', ':component_utils', ':plugin_member', ':plugin_version', ':component_control'
include ':RvTravel'
include ':RvClient'
include ':RvWrapper'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment