Skip to content

R
RvApp
Commit 2a7f444e authored by linfeng's avatar linfeng
Browse files
Options

登录信息保存

parent 4e6512c2
Expand all Show whitespace changes
Inline Side-by-side
Showing with 325 additions and 72 deletions
RvWrapper/src/main/java/com/ruiwenliu/wrapper/SPConstance.java 0 → 100644
View file @ 2a7f444e
package com.ruiwenliu.wrapper;
public final class SPConstance {
public static final String USER_JSON ="user_json";
public static final String USER_JSON_NAME ="username";
public static final String USER_JSON_HEADERURL ="headerurl";
public static final String USER_JSON_USERID ="userid";
public static final String USER_JSON_TOKEN ="token";
public static final String USER_JSON_IMTOKEN ="imToken";
public static final String USER_JSON_IMUSERID ="imUserId";
}
RvWrapper/src/main/java/com/ruiwenliu/wrapper/base/BaseStatusActivity.java
View file @ 2a7f444e
......@@ -47,10 +47,6 @@ public abstract class BaseStatusActivity<P extends MvpPresenter> extends SwipeBa
break;
}
}
}
......
RvWrapper/src/main/java/com/ruiwenliu/wrapper/util/listener/SwitchFragment.java 0 → 100644
View file @ 2a7f444e
package com.ruiwenliu.wrapper.util.listener;
public class SwitchFragment {
public static ChangeFragment sChangeFragment; //改变选中Frangment的接口
public static void setFragmentSelected(ChangeFragment changeFragment) {
sChangeFragment = changeFragment;
}
public interface ChangeFragment {
void changge(int postion);
}
}
\ No newline at end of file
module_home/src/main/java/com/rv/home/rv/module/ApiConfig.java
View file @ 2a7f444e
......@@ -54,5 +54,6 @@ public class ApiConfig {
public static String QUERY_HOT_LIST = RvFrameConfig.HOST + "/api/tour/tourTag/app/unauth/getTagList"; //热门游 路线 get
public static String QUERY_HOT_GOODLIST = RvFrameConfig.HOST + "/api/app/home/app/unauth/goodList"; //推荐商品
}
module_home/src/main/java/com/rv/home/rv/module/basic/BaseLoginActivity.java
View file @ 2a7f444e
......@@ -9,6 +9,7 @@ import com.frame.base.bus.LoginSuccessfulEvent;
import com.frame.base.bus.RxBus;
import com.frame.rv.OnModuleEventListener;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.SPConstance;
import com.ruiwenliu.wrapper.presenter.MvpPresenter;
import com.ruiwenliu.wrapper.util.UtilsManager;
import com.ruiwenliu.wrapper.weight.TitleView;
......@@ -107,10 +108,14 @@ public abstract class BaseLoginActivity<P extends MvpPresenter> extends BaseStat
public void processLoginData(RegisteredBean bean) {
RegisteredBean registeredBean = bean;
UtilsManager.getInstance(mActivity).setSharePreferencesSave("city_json").putString("username", registeredBean.getData().getUsername()).commit();
UtilsManager.getInstance(mActivity).setSharePreferencesSave("city_json").putString("headerurl", registeredBean.getData().getHeaderurl()).commit();
UtilsManager.getInstance(mActivity).setSharePreferencesSave("city_json").putInt("userid", registeredBean.getData().getUserid()).commit();
UtilsManager.getInstance(mActivity).setSharePreferencesSave("city_json").putString("token", registeredBean.getToken()).commit();
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();
showToast(UtilsManager.getInstance(mActivity).getSPStringCode(SPConstance.USER_JSON, SPConstance.USER_JSON_IMTOKEN));
OkGoUtil.setToken(registeredBean.getToken());
switch (RvFrameConfig.RvFrameInfo.TYPE_LOGIN) {
case 1:
......
module_home/src/main/java/com/rv/home/rv/module/ui/login/bean/RegisteredBean.java
View file @ 2a7f444e
......@@ -51,8 +51,10 @@ public class RegisteredBean extends BaseBean {
private String nickname;
private String headerurl;
private int userid;
private String userId;
private String username;
private String imUserId;
private String imToken;
public String getNickname() {
return nickname;
......@@ -70,12 +72,12 @@ public class RegisteredBean extends BaseBean {
this.headerurl = headerurl;
}
public int getUserid() {
return userid;
public String getUserId() {
return userId;
}
public void setUserid(int userid) {
this.userid = userid;
public void setUserId(String userId) {
this.userId = userId;
}
public String getUsername() {
......@@ -85,6 +87,22 @@ public class RegisteredBean extends BaseBean {
public void setUsername(String username) {
this.username = username;
}
public String getImUserId() {
return imUserId;
}
public void setImUserId(String imUserId) {
this.imUserId = imUserId;
}
public String getImToken() {
return imToken;
}
public void setImToken(String imToken) {
this.imToken = imToken;
}
}
}
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarRentalActivity.java
View file @ 2a7f444e
......@@ -298,9 +298,9 @@ public class CarRentalActivity extends BaseStatusActivity<CommonPresenter> {
if(v.getId()==R.id.iv_back){
finish();
}else if(v.getId()==R.id.tv_get_city){
startActivityForResult(CityListActivity.getIntent(mActivity, 1, headTvGetCity.getText().toString().trim(), getCityId), TYPE_REQUEST_CITY);
// startActivityForResult(CityListActivity.getIntent(mActivity, 1, headTvGetCity.getText().toString().trim(), getCityId), TYPE_REQUEST_CITY);
}else if(v.getId()==R.id.tv_out_city){
startActivityForResult(CityListActivity.getIntent(mActivity, 2, headTvOutCity.getText().toString().trim(), outCityId), TYPE_REQUEST_CITY);
// startActivityForResult(CityListActivity.getIntent(mActivity, 2, headTvOutCity.getText().toString().trim(), outCityId), TYPE_REQUEST_CITY);
}else if(v.getId()==R.id.tv_get_address){
String getCity = headTvGetCity.getText().toString().trim();
// if (getSwitchType == 0) {
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CityListActivity.java
View file @ 2a7f444e
......@@ -11,7 +11,10 @@ import android.text.TextUtils;
import android.view.View;
import android.widget.TextView;
import com.alibaba.android.arouter.facade.annotation.Autowired;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.frame.base.url.Constance;
import com.google.gson.Gson;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.rv.home.R;
......@@ -40,6 +43,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Consumer;
@Route(path = Constance.ACTIVITY_URL_CITYLIST)
public class CityListActivity extends BaseStatusActivity<CommonPresenter> {
@BindView(R2.id.recyclerView)
......@@ -49,16 +53,18 @@ public class CityListActivity extends BaseStatusActivity<CommonPresenter> {
@BindView(R2.id.side_letter_bar)
SideLetterBar sideLetterBar;
private int mCityType;
private String mNowCity;
private int mCityId;
@Autowired
int mCityType;
@Autowired
String mNowCity;
@Autowired
int mCityId;
// private Map<String,String> mapSave;
private Disposable mDisposable = null;
public static Intent getIntent(Context context, int type, String city,int id) {
return new Intent(context, CityListActivity.class).putExtra("type", type).putExtra("location", city).putExtra("id",id);
}
// public static Intent getIntent(Context context, int type, String city, int id) {
// return new Intent(context, CityListActivity.class).putExtra("type", type).putExtra("location", city).putExtra("id", id);
// }
@Override
protected int setLayout() {
......@@ -72,9 +78,9 @@ public class CityListActivity extends BaseStatusActivity<CommonPresenter> {
// if(!TextUtils.isEmpty(jsonCity)){
// Log.d("===tag===",jsonCity);
// }
mCityType = intent.getIntExtra("type", 1);
mNowCity = intent.getStringExtra("location");
mCityId=intent.getIntExtra("id", 1);
// mCityType = intent.getIntExtra("type", 1);
// mNowCity = intent.getStringExtra("location");
// mCityId = intent.getIntExtra("id", 1);
final List<MultiItemBean> list = getListData(mNowCity);
List<MultiItemBean> lists = new ArrayList<>();
final CityListAdapter cityListAdapter = new CityListAdapter(lists);
......@@ -110,15 +116,15 @@ public class CityListActivity extends BaseStatusActivity<CommonPresenter> {
MultiItemBean bean = cityListAdapter.getItem(position);
if (bean instanceof ListsBean) {
ListsBean cityBean = (ListsBean) bean;
sendData(cityBean.getName(),cityBean.getId());
sendData(cityBean.getName(), cityBean.getId());
} else if (bean instanceof HotCityBean) {
HotCityBean hotCityBean = (HotCityBean) bean;
if(hotCityBean.hotCityId==0){
filterData(hotCityBean.hotCityName,cityListAdapter.getData());
if (hotCityBean.hotCityId == 0) {
filterData(hotCityBean.hotCityName, cityListAdapter.getData());
return;
}
sendData(hotCityBean.hotCityName,hotCityBean.hotCityId);
sendData(hotCityBean.hotCityName, hotCityBean.hotCityId);
}
}
});
......@@ -136,7 +142,7 @@ public class CityListActivity extends BaseStatusActivity<CommonPresenter> {
private List<MultiItemBean> getListData(String now_city) {
List<MultiItemBean> list = new ArrayList<>();
if(!TextUtils.isEmpty(now_city)){
if (!TextUtils.isEmpty(now_city)) {
list.add(new HotCityBean(now_city, mCityId));
list.add(new CityHeadBean("当前城市/已访问城市"));
}
......@@ -205,7 +211,7 @@ public class CityListActivity extends BaseStatusActivity<CommonPresenter> {
/**
* 传送数据
*/
private void sendData(String name,int id) {
private void sendData(String name, int id) {
// if(mapSave==null){
// mapSave=new LinkedHashMap<>();
// }
......@@ -224,9 +230,9 @@ public class CityListActivity extends BaseStatusActivity<CommonPresenter> {
// UtilsManager.getInstance(mActivity).setSharePreferencesSave("city_json").putString("city", JSON.toJSONString(mapSave)).commit();
// UtilsManager.getInstance(mActivity).setShNull();
// }
if(mDisposable!=null){
if (mDisposable != null) {
mDisposable.dispose();
mDisposable=null;
mDisposable = null;
}
super.onDestroy();
}
......@@ -241,10 +247,10 @@ public class CityListActivity extends BaseStatusActivity<CommonPresenter> {
}).observeOn(AndroidSchedulers.mainThread()).subscribe(new Consumer<MultiItemBean>() {
@Override
public void accept(MultiItemBean multiItemBean) throws Exception {
if (multiItemBean instanceof ListsBean ) {
ListsBean bean= (ListsBean) multiItemBean;
if(bean.getName().equals(city)){
sendData(city,bean.getId());
if (multiItemBean instanceof ListsBean) {
ListsBean bean = (ListsBean) multiItemBean;
if (bean.getName().equals(city)) {
sendData(city, bean.getId());
}
}
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/HomePageFragment.java
View file @ 2a7f444e
......@@ -311,10 +311,10 @@ public class HomePageFragment extends BaseFragment<CommonPresenter> {
getActivity().finish();
} else if (i == R.id.tv_get_city) {
startActivityForResult(CityListActivity.getIntent(getContext(), 1, headTvGetCity.getText().toString().trim(), getCityId), TYPE_REQUEST_CITY);
// startActivityForResult(CityListActivity.getIntent(getContext(), 1, headTvGetCity.getText().toString().trim(), getCityId), TYPE_REQUEST_CITY);
} else if (i == R.id.tv_out_city) {
startActivityForResult(CityListActivity.getIntent(getContext(), 2, headTvOutCity.getText().toString().trim(), outCityId), TYPE_REQUEST_CITY);
// startActivityForResult(CityListActivity.getIntent(getContext(), 2, headTvOutCity.getText().toString().trim(), outCityId), TYPE_REQUEST_CITY);
} else if (i == R.id.tv_get_address) {
String getCity = headTvGetCity.getText().toString().trim();
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/adapter/HotCarTypeAdapter.java
View file @ 2a7f444e
......@@ -2,9 +2,11 @@ package com.rv.home.rv.module.ui.main.home.adapter;
import android.widget.ImageView;
import com.base.utils.ui.datetime.selector.util.TextUtil;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.ruiwenliu.wrapper.util.BaseGlideHolder;
import com.rv.home.R;
import com.rv.home.rv.module.ui.main.home.bean.HomeHotGoodListBean;
import com.rv.home.rv.module.ui.main.home.bean.HomePopularBrigade;
/**
......@@ -13,24 +15,24 @@ import com.rv.home.rv.module.ui.main.home.bean.HomePopularBrigade;
* Desc:热门车型适配
*/
public class HotCarTypeAdapter extends BaseQuickAdapter<HomePopularBrigade.DataBean,BaseGlideHolder>{
public class HotCarTypeAdapter extends BaseQuickAdapter<HomeHotGoodListBean.DataBean,BaseGlideHolder>{
public HotCarTypeAdapter() {
super(R.layout.rv_item_hot_car_type);
}
@Override
protected void convert(BaseGlideHolder helper, HomePopularBrigade.DataBean bean) {
helper.loadRoundImage(mContext,bean.getImg(), (ImageView) helper.getView(R.id.iv_goods),20);
// GlideManager.getInstance(mContext).loadImage(bean.getImg(), (ImageView)helper.getView(R.id.iv_goods));
// helper.loadRoundImage(mContext,bean.getImg(), (ImageView) helper.getView(R.id.iv_goods),10);
protected void convert(BaseGlideHolder helper, HomeHotGoodListBean.DataBean bean) {
helper.loadRoundImage(mContext,bean.getImgUrl(), (ImageView) helper.getView(R.id.iv_goods),20);
helper.setText(R.id.tv_name,bean.getName());
helper.setText(R.id.tv_content,"c1、烧烤、麻将、微波炉");
helper.setText(R.id.tv_price,String.format("¥%1$s%2$s","1000",mContext.getString(R.string.rv_day)));
helper.setText(R.id.tv_content,bean.getName1());
if (!TextUtil.isEmpty(bean.getPrice())) {
helper.setText(R.id.tv_price, String.format("¥%1$s%2$s", bean.getPrice(), mContext.getString(R.string.rv_day)));
}
}
@Override
public int getItemCount() {
return 4;
}
// @Override
// public int getItemCount() {
// return 4;
// }
}
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/bean/HomeHotGoodListBean.java 0 → 100644
View file @ 2a7f444e
package com.rv.home.rv.module.ui.main.home.bean;
import com.ruiwenliu.wrapper.base.BaseBean;
import java.io.Serializable;
import java.util.List;
public class HomeHotGoodListBean extends BaseBean {
private List<DataBean> data;
private int code;
public List<DataBean> getData() {
return data;
}
public void setData(List<DataBean> data) {
this.data = data;
}
public int getCode() {
return code;
}
public void setCode(int code) {
this.code = code;
}
public static class DataBean implements Serializable {
private String id;// 1,
private String name;// ": "38 顺德逢简水乡2日游1",
private String imgUrl;// ": "https://xxtest.upyuns.com/image/admin/2019-06-17/39.png",
private String name1;// ": "上海游2|东莞游|惠州游",
private String price;// ": "88.00"
private String longitude;//": 116.308479,--->经度
private String latitude;//": 39.983171---->纬度
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getImgUrl() {
return imgUrl;
}
public void setImgUrl(String imgUrl) {
this.imgUrl = imgUrl;
}
public String getName1() {
return name1;
}
public void setName1(String name1) {
this.name1 = name1;
}
public String getPrice() {
return price;
}
public void setPrice(String price) {
this.price = price;
}
public String getLongitude() {
return longitude;
}
public void setLongitude(String longitude) {
this.longitude = longitude;
}
public String getLatitude() {
return latitude;
}
public void setLatitude(String latitude) {
this.latitude = latitude;
}
}
}
module_home/src/main/res/layout/fragment_home.xml
View file @ 2a7f444e
......@@ -510,14 +510,14 @@
android:id="@+id/tv_hot_rvtour"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="热门房车游"
android:text="热门旅行"
android:textColor="@color/textGray"
android:textSize="@dimen/text_14" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="特价房车，先到先得"
android:text="精选房车游路线"
android:textColor="@color/text_Gray"
android:textSize="@dimen/text_10" />
</LinearLayout>
......@@ -542,7 +542,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="特价房车，先到先得"
android:text="娱乐休息两不误"
android:textColor="@color/text_Gray"
android:textSize="@dimen/text_10" />
</LinearLayout>
......@@ -560,14 +560,14 @@
android:id="@+id/tv_hot_car_rental"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="热门租车"
android:text="优质车型"
android:textColor="@color/textGray"
android:textSize="@dimen/text_14" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="特价房车，先到先得"
android:text="精心打造你的房车"
android:textColor="@color/text_Gray"
android:textSize="@dimen/text_10" />
</LinearLayout>
......@@ -590,7 +590,7 @@
android:layout_marginTop="@dimen/size_20"
android:background="@drawable/shape_rv_button_gray"
android:gravity="center"
android:text="更多优质车型" />
android:text="更多热门旅行线路" />
<TextView
android:layout_width="wrap_content"
......
module_home/src/main/res/layout/rv_item_hot_car_type.xml
View file @ 2a7f444e
......@@ -42,7 +42,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_5"
android:text="¥3500/天"
android:textColor="@color/colorAuxiliaryRed"
android:textSize="@dimen/text_16" />
</LinearLayout>
......
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