Skip to content

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

资源文件更新

parent 502ca116
Show whitespace changes
Inline Side-by-side
Showing with 334 additions and 81 deletions
MyFrame/src/main/java/com/frame/base/url/Constance.java
View file @ be61e4f3
......@@ -11,4 +11,10 @@ public final class Constance {
public static final String ACTIVITY_URL_POPULARTOURLIST ="/other/PopularTourListActivity";
public static final String ACTIVITY_URL_LOGINRV ="/ui/login/LoginRvActivity";
public static final String ACTIVITY_URL_CITYLIST ="/main/home/CityListActivity";
public static final String ACTIVITY_URL_TRAVELDETAILS ="/tourism/other/TravelDetailsActivity";
public static final String ACTIVITY_URL_CAMPDETAIL ="/camp/camp/CampDetailActivity";
}
RvClient/src/main/java/com/test/rv/MainActivity.java
View file @ be61e4f3
......@@ -2,6 +2,7 @@ package com.test.rv;
import android.content.Context;
import android.content.Intent;
import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat;
import android.os.Bundle;
import android.view.KeyEvent;
......@@ -9,11 +10,10 @@ import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.frame.base.url.Constance;
import com.ruiwenliu.wrapper.base.BaseActivity;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseWrapperFragment;
import com.ruiwenliu.wrapper.util.listener.SwitchFragment;
import com.ruiwenliu.wrapper.weight.CustomScrollViewPager;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.camp.CampFragment;
......@@ -80,6 +80,13 @@ public class MainActivity extends BaseActivity<CommonPresenter> {
viewPager.setAdapter(mAdapter);
// viewPager.setOffscreenPageLimit(3);
setCurrent(TYPE_HOME_PAGE);
SwitchFragment.setFragmentSelected(new SwitchFragment.ChangeFragment() {
@Override
public void changge(int postion) {
setCurrent(postion);
}
});
}
@Override
......@@ -124,7 +131,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> {
*
* @param index
*/
private void setCurrent(int index) {
public void setCurrent(int index) {
setViewStyle(ivHome, tvHome, index == TYPE_HOME_PAGE);
setViewStyle(ivTravel, tvTravel, index == TYPE_TRAVEL);
setViewStyle(ivCamp, tvCamp, index == TYPE_CAMP);
......@@ -141,6 +148,15 @@ public class MainActivity extends BaseActivity<CommonPresenter> {
textView.setTextColor(ContextCompat.getColor(this, isTrue ? R.color.gray_FFB74B : R.color.textMain));
}
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
mAdapter.getCurrentFragment().onActivityResult(requestCode, resultCode, data);
}
@Override
public boolean dispatchKeyEvent(KeyEvent event) {
if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
......
module_camp/build.gradle
View file @ be61e4f3
......@@ -12,6 +12,15 @@ android {
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
javaCompileOptions {
annotationProcessorOptions {
arguments = [moduleName: project.getName()]
}
}
}
buildTypes {
......@@ -27,5 +36,7 @@ dependencies {
api 'com.jakewharton:butterknife:9.0.0-rc1'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0-rc1'
annotationProcessor'com.alibaba:arouter-compiler:1.1.4'
api project(':RvWrapper')
}
module_camp/src/main/java/com/rv/camp/CampFragment.java
View file @ be61e4f3
......@@ -7,7 +7,9 @@ import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import com.alibaba.android.arouter.launcher.ARouter;
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;
......@@ -87,8 +89,13 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
campAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
CampListBean.DataBeanX.DataBean item = (CampListBean.DataBeanX.DataBean) adapter.getItem(position);
startActivity(CampDetailActivity.getIntent(_mActivity,item));
CampListBean.DataBeanX.DataBean data = (CampListBean.DataBeanX.DataBean) adapter.getItem(position);
ARouter.getInstance()
.build(Constance.ACTIVITY_URL_CAMPDETAIL)
.withString("id",data.getId())
.withString("longitude",data.getLongitude())
.withString("latitude",data.getLatitude())
.navigation();
}
});
}
......
module_camp/src/main/java/com/rv/camp/camp/CampDetailActivity.java
View file @ be61e4f3
......@@ -15,6 +15,9 @@ import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import com.alibaba.android.arouter.facade.annotation.Autowired;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.frame.base.url.Constance;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.weight.TitleView;
......@@ -33,17 +36,20 @@ import static com.ruiwenliu.wrapper.weight.webview.SafeWebView.hasKitkat;
/**
* 营地详情
*/
@Route(path = Constance.ACTIVITY_URL_CAMPDETAIL)
public class CampDetailActivity extends BaseStatusActivity<CampPresenter> {
@BindView(R2.id.webView)
WebView mWebView;
private String webUrl;
private CampListBean.DataBeanX.DataBean dataBean;
public static Intent getIntent(Context context, CampListBean.DataBeanX.DataBean dataBean) {
return new Intent(context, CampDetailActivity.class)
.putExtra("dataBean", dataBean);
}
@Autowired()
String id;
@Autowired()
String longitude;
@Autowired()
String latitude;
@Override
protected int setLayout() {
......@@ -53,8 +59,7 @@ public class CampDetailActivity extends BaseStatusActivity<CampPresenter> {
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setTitle("营地详情");
dataBean = (CampListBean.DataBeanX.DataBean) intent.getSerializableExtra("dataBean");
webUrl = CampApi.TRAVEL_CAMPSITEDETAI + "?id=" + dataBean.getId() +"&longitude=" +dataBean.getLongitude()+"&latitude=" +dataBean.getLatitude();
webUrl = CampApi.TRAVEL_CAMPSITEDETAI + "?id=" + id +"&longitude=" + longitude +"&latitude=" +latitude;
Log.i("CampDetailActivity", "initView: " +webUrl);
initWeb();
}
......
module_home/src/main/java/com/rv/home/rv/module/basic/BaseLoginActivity.java
View file @ be61e4f3
......@@ -115,7 +115,6 @@ public abstract class BaseLoginActivity<P extends MvpPresenter> extends BaseStat
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/res/layout/rv_act_car_detail.xml
View file @ be61e4f3
......@@ -46,6 +46,7 @@
android:orientation="horizontal">
<ImageView
android:visibility="invisible"
android:id="@+id/iv_collect"
android:layout_width="@dimen/size_32"
android:layout_height="@dimen/size_32"
......
module_tourism/src/main/java/com/rv/tourism/TourismFragment.java
View file @ be61e4f3
package com.rv.tourism;
import android.Manifest;
import android.content.Context;
import android.content.Intent;
import android.graphics.Rect;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
......@@ -11,12 +15,19 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
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.base.utils.tools.android.IntentUtil;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.frame.base.browse.ActivityImageBrowseUrl;
import com.frame.base.url.Constance;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseFragment;
import com.ruiwenliu.wrapper.util.LocationManager;
import com.ruiwenliu.wrapper.util.glide.GlideManager;
import com.ruiwenliu.wrapper.util.permission.RxPermission;
import com.rv.tourism.adapter.AllPopularAdapter;
import com.rv.tourism.adapter.PopularBrigadeAdapter;
import com.rv.tourism.adapter.TourAroundAdapter;
......@@ -38,6 +49,7 @@ import java.util.List;
import butterknife.BindView;
import butterknife.OnClick;
import io.reactivex.functions.Consumer;
/**
* 旅游
......@@ -64,12 +76,18 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements B
private ArrayList<String> images = new ArrayList<>(); //图片(默认采用网络地址)
private List<String> titles = new ArrayList<>(); //图片标题
private final int TYPE_REQUEST_CITY = 106;//城市列表
private PopularBrigadeAdapter mPopularBrigadeAdapter;
private TourAroundAdapter mTourAroundAdapter;
private AllPopularAdapter mAllPopularAdapter;
private int mPage;
private int countPage;
private int mTourismCityId;// 头城市ID
private double latLatitude = 0;
private double lonLongitude;
private LatLng mLatLng;//当前城市经纬度
private LocationManager locationManager;
public static TourismFragment getInstance(int type) {
......@@ -88,7 +106,7 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements B
@Override
protected void initView(Bundle savedInstanceState) {
setBanner();
permissionProcess();
//热门游
mPopularBrigadeAdapter = new PopularBrigadeAdapter();
rvPopularBrigade.setLayoutManager(new LinearLayoutManager(_mActivity, LinearLayoutManager.HORIZONTAL, false));
......@@ -113,7 +131,7 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements B
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
BeanPopularBrigade.DataBean dataBean = (BeanPopularBrigade.DataBean) adapter.getItem(position);
startActivity(PopularTourListActivity.getIntent(_mActivity,dataBean.getName(),dataBean.getId()));
startActivity(PopularTourListActivity.getIntent(_mActivity, dataBean.getName(), dataBean.getId()));
}
});
......@@ -121,7 +139,7 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements B
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
BeanPopularBrigade.DataBean item = (BeanPopularBrigade.DataBean) adapter.getItem(position);
startActivity(PopularTourListActivity.getIntent(_mActivity,item.getName(),item.getId()));
startActivity(PopularTourListActivity.getIntent(_mActivity, item.getName(), item.getId()));
llLayoutPopularMore.setVisibility(View.GONE);
}
});
......@@ -130,7 +148,10 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements B
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
BeanTourAround.DataBeanX.DataBean dataBean = (BeanTourAround.DataBeanX.DataBean) adapter.getItem(position);
startActivity(TravelDetailsActivity.getIntent(_mActivity,dataBean));
ARouter.getInstance()
.build(Constance.ACTIVITY_URL_TRAVELDETAILS)
.withString("id",dataBean.getId())
.navigation();
}
});
}
......@@ -143,14 +164,20 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements B
}
@OnClick({R2.id.travel_city_layout, R2.id.travel_server_image, R2.id.ll_item_popular_brigade_many, R2.id.travel_hot_more_close})
@OnClick({R2.id.travel_city_layout, R2.id.travel_server_image, R2.id.ll_item_popular_brigade_many, R2.id.travel_hot_more_close,R2.id.iv_popular_brigade_many})
public void onViewClicked(View view) {
int id = view.getId();
if (id == R.id.travel_city_layout) {
ARouter.getInstance()
.build(Constance.ACTIVITY_URL_CITYLIST)
.withInt("mCityType", 1)
.withString("mNowCity", travelCityText.getText().toString())
.withInt("mCityId", mTourismCityId)
.navigation(getActivity(), TYPE_REQUEST_CITY);
} else if (id == R.id.travel_server_image) {
} else if (id == R.id.ll_item_popular_brigade_many) {
} else if (id == R.id.ll_item_popular_brigade_many || id == R.id.iv_popular_brigade_many) {
//查看热门更多
llLayoutPopularMore.setVisibility(View.VISIBLE);
} else if (id == R.id.travel_hot_more_close) {
......@@ -173,8 +200,8 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements B
map.put("query", "");
map.put("page", page);
map.put("limit", "10");
map.put("latitudel", "22.954205");
map.put("longitude", "113.879421");
map.put("latitudel", latLatitude);
map.put("longitude", lonLongitude);
mPresenter.getData(2, TourismApi.QUERY_RIM_LIST, BeanTourAround.class, map, false);
}
......@@ -289,7 +316,6 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements B
}
@Override
public void onLoadMoreRequested() {
if (mPage >= countPage) {
......@@ -301,6 +327,35 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements B
}
@Override
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (resultCode == RESULT_OK) {
int type = data.getIntExtra("type", 1);
String requestData = data.getStringExtra("location");
switch (requestCode) {
case TYPE_REQUEST_CITY://城市列表
if (type == 1) {
travelCityText.setText("");
mTourismCityId = data.getIntExtra("id", 0);
}
setRequestData(type, requestData, 0, 0);
break;
}
}
}
private void setRequestData(int type, String data, double lat, double lon) {
switch (type) {
case 1:
latLatitude = lat;
lonLongitude = lon;
travelCityText.setText(data);
break;
}
}
public class AbSpacesItemDecoration extends RecyclerView.ItemDecoration {
private int space;
......@@ -319,4 +374,64 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements B
outRect.top = space;
}
}
/**
* 定位权限处理
*/
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());
travelCityText.setText(location.getCity());
locationManager.stopLocation();
}
});
}
}
module_tourism/src/main/java/com/rv/tourism/other/PopularTourListActivity.java
View file @ be61e4f3
......@@ -13,6 +13,7 @@ import android.widget.LinearLayout;
import com.alibaba.android.arouter.facade.annotation.Autowired;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.base.utils.tools.android.IntentUtil;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.frame.base.browse.ActivityImageBrowseUrl;
......@@ -127,7 +128,10 @@ public class PopularTourListActivity extends BaseStatusActivity<TourismPresenter
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
BeanTourAround.DataBeanX.DataBean item = (BeanTourAround.DataBeanX.DataBean) adapter.getItem(position);
startActivity(TravelDetailsActivity.getIntent(mActivity, item));
ARouter.getInstance()
.build(Constance.ACTIVITY_URL_TRAVELDETAILS)
.withString("id",item.getId())
.navigation();
}
});
......
module_tourism/src/main/java/com/rv/tourism/other/TravelDetailsActivity.java
View file @ be61e4f3
......@@ -15,6 +15,8 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.alibaba.android.arouter.facade.annotation.Autowired;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.base.utils.ui.datetime.selector.util.TextUtil;
import com.frame.base.url.Constance;
......@@ -52,6 +54,7 @@ import static com.ruiwenliu.wrapper.weight.webview.SafeWebView.hasKitkat;
/**
* 旅游详情
*/
@Route(path = Constance.ACTIVITY_URL_TRAVELDETAILS)
public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter> {
@BindView(R2.id.webView)
......@@ -67,15 +70,17 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
private ShareManager shareManager;
private String webUrl;
private BeanTourAround.DataBeanX.DataBean dataBean;
private BeanOrderParam beanOrderParam;
private String mCollectId;
private static String isCollection = "0"; //0 没有收藏 1 收藏
public static Intent getIntent(Context context, BeanTourAround.DataBeanX.DataBean dataBean) {
return new Intent(context, TravelDetailsActivity.class)
.putExtra("dataBean", dataBean);
}
@Autowired()
String id;
// public static Intent getIntent(Context context, BeanTourAround.DataBeanX.DataBean dataBean) {
// return new Intent(context, TravelDetailsActivity.class)
// .putExtra("dataBean", dataBean);
// }
@Override
protected int setLayout() {
......@@ -85,17 +90,24 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
showTitle(false);
dataBean = (BeanTourAround.DataBeanX.DataBean) intent.getSerializableExtra("dataBean");
webUrl = "https://xxtest.upyuns.com/h5/appHtml/view/travelDetails.html?id=" + dataBean.getId();
webUrl = "https://xxtest.upyuns.com/h5/appHtml/view/travelDetails.html?id=" + id;
initWeb();
// initShare(webUrl, mCarBean.getVehicleModel().getName(), mCarBean.getCompany().getAddrDetail(), mCarBean.getVehicleModel().getPicture());
}
boolean check = true;
@OnClick({R2.id.tv_appointment, R2.id.iv_collect, R2.id.iv_share, R2.id.tv_customer_service})
@OnClick({R2.id.iv_back,R2.id.tv_appointment, R2.id.iv_collect, R2.id.iv_share, R2.id.tv_customer_service})
public void onViewClicked(View view) {
int id = view.getId();
if (id == R.id.iv_collect) {
if (id == R.id.iv_back){
if (check) {
llItemBottom.setVisibility(View.VISIBLE);
}else {
llItemBottom.setVisibility(View.GONE);
}
check = !check;
}else if (id == R.id.iv_collect) {
//收藏
if ("1".equals(isCollection)) {
cancelCollect();
......@@ -133,7 +145,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
Map<String, Object> headMap = new LinkedHashMap<>();
if (OkGoUtil.getToken() != null) {
headMap.put("Authorization", OkGoUtil.getToken());
mPresenter.postBodyData(RvFrameConfig.HOST, 1, TourismApi.COMMIT_COLLECT_ADD, BaseBean.class, new AddCollection(dataBean.getUnit(), dataBean.getPrice(), dataBean.getCover(), dataBean.getName(), dataBean.getId(), "2"), headMap, false);
mPresenter.postBodyData(RvFrameConfig.HOST, 1, TourismApi.COMMIT_COLLECT_ADD, BaseBean.class, new AddCollection(id, "2"), headMap, false);
}
}
......@@ -149,7 +161,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
Map<String, String> map = new HashMap<>();
if (OkGoUtil.getToken() != null) {
headMap.put("Authorization", OkGoUtil.getToken());
map.put("id", dataBean.getId());
map.put("id", id);
map.put("type", "2");
mPresenter.getData(RvFrameConfig.HOST, 0, TourismApi.COMMIT_COLLECT_IS, BeanTourismCollection.class, map, headMap, false);
}
......@@ -307,6 +319,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
@JavascriptInterface
public void showButton() {
showToast("333");
llItemBottom.setVisibility(View.VISIBLE);
}
......@@ -363,54 +376,14 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
}
private class AddCollection {
private String unit;
private String price;
private String cover;
private String name;
private String typeId;
private String type;
public AddCollection(String unit, String price, String cover, String name, String typeId, String type) {
this.unit = unit;
this.price = price;
this.cover = cover;
this.name = name;
public AddCollection( String typeId, String type) {
this.typeId = typeId;
this.type = type;
}
public String getUnit() {
return unit;
}
public void setUnit(String unit) {
this.unit = unit;
}
public String getPrice() {
return price;
}
public void setPrice(String price) {
this.price = price;
}
public String getCover() {
return cover;
}
public void setCover(String cover) {
this.cover = cover;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getTypeId() {
return typeId;
}
......
module_tourism/src/main/res/layout/activity_tourism.xml
View file @ be61e4f3
......@@ -85,12 +85,12 @@
<ImageView
android:id="@+id/travel_server_image"
android:layout_width="@dimen/size_30"
android:layout_height="@dimen/size_30"
android:layout_width="@dimen/size_35"
android:layout_height="@dimen/size_35"
android:layout_marginLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15"
android:scaleType="centerInside"
android:src="@drawable/rv_rentingcar_icon_service_white" />
android:src="@drawable/common_journey_service_gray" />
</LinearLayout>
<android.support.v4.widget.NestedScrollView
......@@ -132,9 +132,10 @@
android:textSize="@dimen/text_16" />
<ImageView
android:id="@+id/iv_popular_brigade_many"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginRight="@dimen/size_15"
android:paddingRight="@dimen/size_15"
android:clickable="true"
android:paddingLeft="@dimen/size_15"
android:scaleType="center"
......
module_tourism/src/main/res/layout/activity_travel_details.xml
View file @ be61e4f3
......@@ -20,7 +20,6 @@
android:layout_width="match_parent"
android:layout_height="@dimen/size_55">
<ImageView
android:id="@+id/iv_back"
android:layout_width="@dimen/size_32"
......
plugin_search/build.gradle 0 → 100644
View file @ be61e4f3
apply plugin: 'com.android.library'
apply plugin: 'com.jakewharton.butterknife'
android {
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion
defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
javaCompileOptions {
annotationProcessorOptions {
arguments = [moduleName: project.getName()]
}
}
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
}
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
api 'com.jakewharton:butterknife:9.0.0-rc1'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0-rc1'
annotationProcessor 'com.alibaba:arouter-compiler:1.1.4'
api project(':RvWrapper')
}
plugin_search/proguard-rules.pro 0 → 100644
View file @ be61e4f3
# 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
plugin_search/src/main/AndroidManifest.xml 0 → 100644
View file @ be61e4f3
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.rv.plugin.search">
<application>
<activity android:name="com.rv.search.TravelSearchActivity"></activity>
</application>
</manifest>
\ No newline at end of file
plugin_search/src/main/java/com/rv/search/TravelSearchActivity.java 0 → 100644
View file @ be61e4f3
package com.rv.search;
import android.content.Intent;
import android.os.Bundle;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.presenter.MvpPresenter;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.plugin.search.R;
/**
* 旅游搜索
*/
public class TravelSearchActivity extends BaseStatusActivity<MvpPresenter> {
@Override
protected int setLayout() {
return R.layout.activity_travel_search;
}
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
}
@Override
public void onShowResult(int requestType, BaseBean result) {
}
}
plugin_search/src/main/res/layout/activity_travel_search.xml 0 → 100644
View file @ be61e4f3
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.rv.search.TravelSearchActivity">
</android.support.constraint.ConstraintLayout>
\ No newline at end of file
plugin_search/src/main/res/values/strings.xml 0 → 100644
View file @ be61e4f3
<resources>
<string name="app_name">plugin_search</string>
</resources>
settings.gradle
View file @ be61e4f3
//include ':WXPay'
include ':RvFrame'
include ':RvFrame', ':plugin_search'
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