Skip to content

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

提交资源文件

parent da77aeb1
Show whitespace changes
Inline Side-by-side
Showing with 267 additions and 185 deletions
RvClient/build.gradle
View file @ 2e548e9e
......@@ -8,8 +8,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
flavorDimensions "default"
versionCode 157
versionName "1.5.7"
versionCode 158
versionName "1.5.8"
multiDexEnabled true
......
RvWrapper/src/main/java/com/ruiwenliu/wrapper/util/glide/GlideManager.java
View file @ 2e548e9e
......@@ -259,6 +259,20 @@ public class GlideManager {
}
public void loadGifImage2(Object url, final ImageView image) {
GlideApp.with(mContext)
.asGif()
.load(url)
.apply(new RequestOptions()
.skipMemoryCache(true)
.diskCacheStrategy(DiskCacheStrategy.ALL))
.placeholder(R.drawable.glide_icon_placeholder)
.fallback(R.drawable.glide_icon_error)
.into(image);
}
/**
* 获取Gif时长
*/
......
component_resource/src/main/res/values/strings.xml
View file @ 2e548e9e
<resources>
<string name="app_name">component_resource</string>
<string name="all">全部</string>
<string name="not_camp_hint">还没有营地信息！</string>
<string name="types_of">类型</string>
<string name="address">地址：</string>
<string name="contact_number">联系电话：</string>
<string name="baidu_map">百度地图</string>
<string name="gouda_map">高德地图</string>
<string name="cancel">取消</string>
<string name="search_camp_hint">搜索营地</string>
<string name="search">搜索</string>
<string name="go_here">去这里</string>
<string name="not_search_hint">请输入搜索内容！</string>
<string name="camp_details">营地详情</string>
<string name="book_a_camp">预定营地</string>
<string name="generate_poster">生成海报</string>
<string name="copy_link">复制链接</string>
<string name="wechat">微信</string>
<string name="not_wechat_hint">亲，您微信还没有安装呢</string>
<string name="not_qq_hint">亲，您QQ还没有安装呢</string>
<string name="collection_success">收藏成功</string>
<string name="cancel_collection">取消收藏成功</string>
<string name="sharing_success">分享成功</string>
<string name="copy_successful">复制成功！</string>
<string name="positioning_permission">需要定位权限</string>
<string name="positioning_permission_hint">如果没有此权限，此应用程序可能无法正常工作,是否打开设置修改该应用权限</string>
<string name="dongguan_city">东莞市</string>
<string name="popular_tour">热门游</string>
<string name="tour_around">周边游</string>
<string name="search_tourism_hint">搜索目的地/旅游线</string>
<string name="select_tourism_type">— 选择旅游类型 —</string>
<string name="recommended_route">— 推荐路线 —</string>
<string name="tourism_people">人待出发</string>
<string name="contact_customer_service">联系客服</string>
<string name="book_now">立即预订</string>
<string name="tour_details">旅游详情</string>
<string name="sold_out">已售完</string>
<string name="departure">出发地:</string>
<string name="destination">目的地:</string>
<string name="event_date">活动日期:</string>
</resources>
module_camp/src/main/java/com/rv/camp/CampFragment.java
View file @ 2e548e9e
......@@ -234,7 +234,7 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
List<CampTypeBean.DataBean> data = bean.getData();
if (data != null && data.size() > 0) {
CampTypeBean.DataBean dataBean = new CampTypeBean.DataBean();
dataBean.setName("全部");
dataBean.setName(_mActivity.getString(R.string.all));
data.add(0, dataBean);
}
campTypeListAdapter.setNewData(data);
......@@ -254,7 +254,7 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
if (bean.getData().getTotalCount() == 0) {
campAdapter.getData().clear();
campAdapter.notifyDataSetChanged();
campAdapter.setEmptyView(getEmptyView(rvContent, -1, "还没有营地信息！"));
campAdapter.setEmptyView(getEmptyView(rvContent, -1, _mActivity.getString(R.string.not_camp_hint)));
return;
}
......
module_camp/src/main/java/com/rv/camp/camp/CampDetailActivity.java
View file @ 2e548e9e
......@@ -103,9 +103,9 @@ public class CampDetailActivity extends BaseStatusActivity<CampPresenter> {
permissionProcess();
}
titleView.setTitle("营地详情");
titleView.setTitle(mActivity.getString(R.string.camp_details));
webUrl = CampApi.TRAVEL_CAMPSITEDETAI + "?id=" + id + "&longitude=" + longitude + "&latitude=" + latitude;
Log.i("CampDetailActivity", "initView: " + webUrl);
initWeb();
code = Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_CODE, "");
titleView.setImageResource(R.id.iv_title_right, R.drawable.common_icon_rv_rentingcar_icon_share);
......@@ -292,7 +292,7 @@ public class CampDetailActivity extends BaseStatusActivity<CampPresenter> {
@Override
public void onclick(SnsPlatform snsPlatform, SHARE_MEDIA share_media) {
if (snsPlatform.mShowWord.equals("生成海报")) {
if (snsPlatform.mShowWord.equals(mActivity.getString(R.string.generate_poster))) {
if (data.getData() != null) {
String icon = "";
if (TextUtils.isEmpty(data.getData().getPosterBackground())) {
......@@ -308,16 +308,16 @@ public class CampDetailActivity extends BaseStatusActivity<CampPresenter> {
.navigation();
}
} else if (snsPlatform.mShowWord.equals("复制链接")) {
} else if (snsPlatform.mShowWord.equals(mActivity.getString(R.string.copy_link))) {
copyText();
} else if (snsPlatform.mShowWord.contains("微信")) {
} else if (snsPlatform.mShowWord.contains(mActivity.getString(R.string.wechat))) {
if (!IsAppInstall.isWeixinAvilible(mActivity)) {
showToast("亲，您微信还没有安装呢");
showToast(mActivity.getString(R.string.not_wechat_hint));
return;
}
} else if (snsPlatform.mShowWord.contains("QQ")) {
if (!IsAppInstall.isQQClientAvailable(mActivity)) {
showToast("亲，您QQ还没有安装呢");
showToast(mActivity.getString(R.string.not_qq_hint));
return;
}
}
......@@ -331,7 +331,7 @@ public class CampDetailActivity extends BaseStatusActivity<CampPresenter> {
if (platform.name().equals("WEIXIN_FAVORITE")) {
showToast(" 收藏成功啦");
showToast(mActivity.getString(R.string.collection_success));
} else {
if (platform != SHARE_MEDIA.MORE && platform != SHARE_MEDIA.SMS
......@@ -346,7 +346,7 @@ public class CampDetailActivity extends BaseStatusActivity<CampPresenter> {
&& platform != SHARE_MEDIA.GOOGLEPLUS
&& platform != SHARE_MEDIA.YNOTE
&& platform != SHARE_MEDIA.EVERNOTE) {
showToast("分享成功啦");
showToast(mActivity.getString(R.string.sharing_success));
sharingSuccess();
}
}
......@@ -368,7 +368,7 @@ public class CampDetailActivity extends BaseStatusActivity<CampPresenter> {
String code = Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_CODE, "");
ClipData myClip = ClipData.newPlainText("text", webUrl + "&shareType=app&code=" + code);
myClipboard.setPrimaryClip(myClip);
showToast("复制成功！");
showToast(mActivity.getString(R.string.copy_successful));
}
/**
......@@ -405,8 +405,8 @@ public class CampDetailActivity extends BaseStatusActivity<CampPresenter> {
initGps();
} else {
new AppSettingsDialog.Builder(mActivity).
setTitle("需要定位权限")
.setRationale("如果没有此权限，此应用程序可能无法正常工作,是否打开设置修改该应用权限")
setTitle(mActivity.getString(R.string.positioning_permission))
.setRationale(mActivity.getString(R.string.positioning_permission_hint))
.build().show();
}
}
......
module_camp/src/main/java/com/rv/camp/camp/CampSearchActivity.java
View file @ 2e548e9e
......@@ -74,7 +74,7 @@ public class CampSearchActivity extends BaseStatusActivity<CampPresenter> implem
rvContent.addItemDecoration(new AbSpacesItemDecoration(20, 10));// 分割线。
// rvContent.setNestedScrollingEnabled(false);
rvContent.setAdapter(campAdapter);
campAdapter.setEmptyView(getEmptyView(rvContent, -1, "还没有营地信息！"));
campAdapter.setEmptyView(getEmptyView(rvContent, -1, mActivity.getString(R.string.not_camp_hint)));
campAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
......@@ -134,7 +134,7 @@ public class CampSearchActivity extends BaseStatusActivity<CampPresenter> implem
if (bean.getData().getTotalCount() == 0) {
campAdapter.getData().clear();
campAdapter.notifyDataSetChanged();
campAdapter.setEmptyView(getEmptyView(rvContent, -1, "还没有营地信息！"));
campAdapter.setEmptyView(getEmptyView(rvContent, -1, mActivity.getString(R.string.not_camp_hint)));
return;
}
......@@ -184,7 +184,7 @@ public class CampSearchActivity extends BaseStatusActivity<CampPresenter> implem
} else if (id == R.id.tv_search) {
content = etSearch.getText().toString().trim();
if (TextUtils.isEmpty(content)) {
showToast("请输入搜索内容！");
showToast(mActivity.getString(R.string.not_search_hint));
return;
}
loadDataList(content);
......
module_camp/src/main/java/com/rv/camp/camp/CampShopShowActivity.java
View file @ 2e548e9e
......@@ -24,12 +24,14 @@ import com.baidu.mapapi.map.MyLocationData;
import com.baidu.mapapi.map.OverlayOptions;
import com.baidu.mapapi.model.LatLng;
import com.frame.base.url.Constance;
import com.frame.base.url.ImageUrl;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.util.LocationManager;
import com.ruiwenliu.wrapper.util.MapUtil;
import com.ruiwenliu.wrapper.util.ViewHolder;
import com.ruiwenliu.wrapper.util.glide.GlideManager;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.camp.R;
import com.rv.camp.R2;
......@@ -63,6 +65,8 @@ public class CampShopShowActivity extends BaseStatusActivity<CampPresenter> {
LinearLayout rlVisible;
@BindView(R2.id.tv_phone)
TextView tvPhone;
@BindView(R2.id.iv_icon)
ImageView ivIcon;
private LocationManager locationManager;
BaiduMap mBaiduMap;
......@@ -90,6 +94,8 @@ public class CampShopShowActivity extends BaseStatusActivity<CampPresenter> {
// titleView.setTitle(mActivity.getString(R.string.rv_shop_map));
showTitle(false);
initMap();
GlideManager.getInstance(mActivity).loadImage(ImageUrl.IMG_BG_LOGO, ivIcon);
}
@Override
......@@ -222,8 +228,8 @@ public class CampShopShowActivity extends BaseStatusActivity<CampPresenter> {
isVisible(View.VISIBLE);
Bundle bundle = marker.getExtraInfo();
selectBean = (CampListBean.DataBeanX.DataBean) bundle.getSerializable("info");
tvAddress.setText(String.format("%1$s%2$s", "地址：", selectBean.getAddress()));
tvPhone.setText(String.format("%1$s%2$s", "联系电话：", selectBean.getPhone()));
tvAddress.setText(String.format("%1$s%2$s", mActivity.getString(R.string.address), selectBean.getAddress()));
tvPhone.setText(String.format("%1$s%2$s", mActivity.getString(R.string.contact_number), selectBean.getPhone()));
tvName.setText(selectBean.getName());
updateMap(marker.getPosition());
return true;
......@@ -349,9 +355,9 @@ public class CampShopShowActivity extends BaseStatusActivity<CampPresenter> {
@Override
public void helper(ViewHolder helper) {
super.helper(helper);
helper.setText(R.id.btn1, "百度地图");
helper.setText(R.id.btn2, "高德地图");
helper.setText(R.id.btn3, "取消");
helper.setText(R.id.btn1, mActivity.getString(R.string.baidu_map));
helper.setText(R.id.btn2, mActivity.getString(R.string.gouda_map));
helper.setText(R.id.btn3, mActivity.getString(R.string.cancel));
helper.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
......@@ -368,7 +374,6 @@ public class CampShopShowActivity extends BaseStatusActivity<CampPresenter> {
dismiss();
}
}
}, R.id.btn1, R.id.btn2, R.id.btn3);
}
......
module_camp/src/main/res/layout/activity_act_shop_show.xml
View file @ 2e548e9e
......@@ -9,6 +9,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true" />
<ImageView
android:id="@+id/iv_back"
android:layout_width="@dimen/size_40"
......@@ -21,9 +22,9 @@
<ImageView
android:id="@+id/iv_location"
android:layout_alignParentRight="true"
android:layout_width="@dimen/size_50"
android:layout_height="@dimen/size_50"
android:layout_alignParentRight="true"
android:layout_marginLeft="@dimen/size_5"
android:layout_marginTop="@dimen/size_10"
android:layout_marginRight="@dimen/size_15"
......@@ -40,73 +41,84 @@
<!--/>-->
<LinearLayout
android:id="@+id/ll_visible"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginLeft="@dimen/size_30"
android:layout_marginRight="@dimen/size_30"
android:layout_alignParentBottom="true"
android:layout_marginBottom="@dimen/size_30"
android:layout_width="match_parent"
android:padding="@dimen/size_15"
android:visibility="gone"
android:id="@+id/ll_visible"
android:background="@color/colorWrite"
android:orientation="horizontal"
android:layout_height="wrap_content">
<RelativeLayout
android:padding="@dimen/size_15"
android:visibility="gone">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingRight="@dimen/size_10"
android:orientation="vertical"
android:paddingRight="@dimen/size_10">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:id="@+id/iv_icon"
android:layout_width="@dimen/size_25"
android:layout_height="@dimen/size_25" />
<TextView
android:id="@+id/tv_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/textMain"
android:textSize="@dimen/text_18"
android:drawablePadding="@dimen/size_5"
android:drawableLeft="@drawable/rv_common_icon_logo"
android:id="@+id/tv_name"
android:text=""
/>
android:textColor="@color/textMain"
android:textSize="@dimen/text_18" />
</LinearLayout>
<TextView
android:layout_marginTop="@dimen/size_8"
android:id="@+id/tv_address"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/textGray"
android:textSize="@dimen/text_14"
android:layout_below="@id/tv_name"
android:id="@+id/tv_address"
android:layout_marginTop="@dimen/size_8"
android:text=""
/>
android:textColor="@color/textGray"
android:textSize="@dimen/text_14" />
<TextView
android:id="@+id/tv_phone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/textGray"
android:textSize="@dimen/text_14"
android:layout_below="@id/tv_address"
android:id="@+id/tv_phone"
android:text=""
/>
</RelativeLayout>
android:textColor="@color/textGray"
android:textSize="@dimen/text_14" />
</LinearLayout>
<RelativeLayout
android:id="@+id/rl_navigation"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:layout_centerHorizontal="true"
android:src="@drawable/rv_rentingcar_icon_gps"
android:layout_width="@dimen/size_30"
android:layout_height="@dimen/size_30"
/>
<TextView
android:textColor="@color/textMain"
android:textSize="@dimen/text_12"
android:layout_centerHorizontal="true"
android:text="去这里"
android:src="@drawable/rv_rentingcar_icon_gps" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/size_35"
/>
android:text="@string/go_here"
android:textColor="@color/textMain"
android:textSize="@dimen/text_12" />
</RelativeLayout>
</LinearLayout>
......
module_camp/src/main/res/layout/activity_camp.xml
View file @ 2e548e9e
......@@ -36,7 +36,7 @@
android:drawableRight="@drawable/camp_open_member"
android:drawablePadding="@dimen/size_10"
android:gravity="center_vertical"
android:text="类型"
android:text="@string/types_of"
android:textColor="@color/textMain"
android:textSize="@dimen/text_16" />
......@@ -58,7 +58,7 @@
android:layout_weight="1"
android:background="@null"
android:gravity="center_vertical"
android:hint="搜索营地"
android:hint="@string/search_camp_hint"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15"
android:textColor="@color/colorMain"
......@@ -88,7 +88,7 @@
android:layout_height="0dp"
android:layout_weight="1">
<com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
<com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout
android:id="@+id/refresh"
android:layout_width="match_parent"
android:layout_height="match_parent">
......
module_camp/src/main/res/layout/activity_camp_detail.xml
View file @ 2e548e9e
......@@ -30,7 +30,7 @@
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_16"
android:gravity="center"
android:text="预定营地"/>
android:text="@string/book_a_camp"/>
</LinearLayout>
\ No newline at end of file
module_camp/src/main/res/layout/activity_camp_search.xml
View file @ 2e548e9e
......@@ -29,7 +29,7 @@
android:background="@drawable/shape_rv_travel_search_line"
android:drawableLeft="@drawable/search"
android:drawablePadding="@dimen/size_15"
android:hint="搜索营地"
android:hint="@string/search_camp_hint"
android:maxLines="1"
android:paddingLeft="@dimen/size_15"
android:singleLine="true"
......@@ -43,7 +43,7 @@
android:layout_marginLeft="@dimen/size_10"
android:layout_marginRight="@dimen/size_10"
android:padding="@dimen/size_5"
android:text="搜索" />
android:text="@string/search" />
</LinearLayout>
<include layout="@layout/common_line" />
......@@ -51,8 +51,7 @@
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_content"
android:layout_width="match_parent"
android:layout_height="wrap_content">
</android.support.v7.widget.RecyclerView>
android:layout_height="wrap_content"></android.support.v7.widget.RecyclerView>
</LinearLayout>
\ No newline at end of file
module_camp/src/main/res/layout/rv_item_camp_list.xml
View file @ 2e548e9e
......@@ -24,7 +24,7 @@
android:gravity="center"
android:background="@drawable/campsite_icon_label"
android:textSize="@dimen/text_10"
android:text="湖泊型"/>
android:text=""/>
</RelativeLayout>
<TextView
......@@ -34,7 +34,7 @@
android:layout_marginTop="@dimen/size_5"
android:paddingLeft="@dimen/size_5"
android:paddingRight="@dimen/size_5"
android:text="休闲小镇房车露营168号营地"
android:text=""
android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" />
......@@ -46,7 +46,7 @@
android:paddingLeft="@dimen/size_5"
android:drawablePadding="@dimen/size_5"
android:drawableLeft="@drawable/campsite_icon_citylocation"
android:text="惠州"
android:text=""
android:textColor="@color/gray_707070"
android:textSize="@dimen/text_10" />
......
module_camp/src/main/res/layout/rv_item_camp_type_list.xml
View file @ 2e548e9e
......@@ -20,7 +20,7 @@
android:maxLines="1"
android:textSize="@dimen/text_14"
android:textColor="@color/textGray"
android:text="山地型"/>
android:text=""/>
<ImageView
android:id="@+id/iv_select"
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/HomeFragment.java
View file @ 2e548e9e
......@@ -315,7 +315,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
SelectedActivitiesBean.SelectedActivityItem item = (SelectedActivitiesBean.SelectedActivityItem) adapter.getItem(position);
mPresenter.saveOnclick("3", String.valueOf(item.getId()));
if (item != null && !TextUtils.isEmpty(item.getUrl()) && !TextUtils.isEmpty(item.getName())) {
mPresenter.toTarget(getActivity(), item.getUrl(), item.getName(),String.valueOf(item.getId()));
mPresenter.toTarget(getActivity(), item.getUrl(), item.getName(), String.valueOf(item.getId()));
}
}
});
......@@ -1198,13 +1198,16 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
mineBanner.isAutoPlay(true)
.setBannerTitles(titles)
.setImages(images)
.setDelayTime(3000)
.setDelayTime(4000)
.setImageLoader(new ImageLoader() {
@Override
public void displayImage(Context context, Object path, ImageView imageView) {
if (path.toString().contains(".gif")) {
GlideManager.getInstance(context).loadGifImage2(path, imageView);
} else {
GlideManager.getInstance(context).loadImage2(path, imageView);
}
}
})
.setOnBannerListener(new OnBannerListener() {
@Override
......@@ -1216,7 +1219,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
BeanHomeBanner.DataBean bean = listsBanners.get(position);
mPresenter.saveOnclick("2", bean.getId());
if (bean != null && !TextUtils.isEmpty(bean.getUrl())) {
mPresenter.toTarget(getActivity(), bean.getUrl(), bean.getTitle(),bean.getId());
mPresenter.toTarget(getActivity(), bean.getUrl(), bean.getTitle(), bean.getId());
}
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/PickUpTheCarQRCodeActivity.java
View file @ 2e548e9e
......@@ -3,7 +3,6 @@ package com.rv.home.rv.module.ui.main.home.order;
import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
......@@ -15,6 +14,7 @@ import android.widget.TextView;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.base.presenter.PickerPresenter;
import com.ruiwenliu.wrapper.util.TimeManager;
import com.ruiwenliu.wrapper.util.glide.GlideManager;
import com.ruiwenliu.wrapper.weight.TitleView;
......@@ -22,10 +22,8 @@ import com.rv.component.utils.DisplayUtil;
import com.rv.component.utils.ZxingUtils;
import com.rv.home.R;
import com.rv.home.R2;
import com.ruiwenliu.wrapper.base.presenter.PickerPresenter;
import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.ui.main.home.order.bean.OrderDetailBean;
import com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean;
import com.yuyife.okgo.OkGoUtil;
import java.util.LinkedHashMap;
......@@ -64,6 +62,8 @@ public class PickUpTheCarQRCodeActivity extends BaseStatusActivity<PickerPresent
TextView tvPrice;
@BindView(R2.id.iv_zxing)
ImageView ivZxing;
@BindView(R2.id.tv_bottom_hint)
TextView tvBottomHint;
private OrderDetailBean.DataBeanX dataBean;
private String no;
......@@ -100,9 +100,9 @@ public class PickUpTheCarQRCodeActivity extends BaseStatusActivity<PickerPresent
@Override
public void onShowResult(int requestType, BaseBean result) {
switch (requestType){
switch (requestType) {
case 1:
setData((OrderDetailBean)result);
setData((OrderDetailBean) result);
break;
}
}
......@@ -112,8 +112,10 @@ public class PickUpTheCarQRCodeActivity extends BaseStatusActivity<PickerPresent
if (dataBean != null) {
if (4 == dataBean.getStatus()) {
tvCenter.setText("出示取车二维码");
tvBottomHint.setText("*滴房车管家扫码验证完成后，才能取车哦！");
} else if (5 == dataBean.getStatus()) {
tvCenter.setText("出示还车二维码");
tvBottomHint.setText("*滴房车管家扫码验证完成后，才能还车哦！");
}
tvCarType.setText(dataBean.getName());
OrderDetailBean.DataBeanX.OrderRentVehicleDetail detail = dataBean.getOrderRentVehicleDetail();
......@@ -130,7 +132,7 @@ public class PickUpTheCarQRCodeActivity extends BaseStatusActivity<PickerPresent
} else {
icon = dataBean.getIcon();
}
GlideManager.getInstance(mActivity).loadRoundImage(icon, ivGoods,8);
GlideManager.getInstance(mActivity).loadRoundImage(icon, ivGoods, 8);
}
}
if (!TextUtils.isEmpty(dataBean.getQrcodeStr())) {
......@@ -149,4 +151,11 @@ public class PickUpTheCarQRCodeActivity extends BaseStatusActivity<PickerPresent
showToast("该功能还在开发中...");
}
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
}
module_home/src/main/res/layout/activity_pick_up_the_car_qrcode.xml
View file @ 2e548e9e
......@@ -41,8 +41,8 @@
android:layout_marginRight="@dimen/size_8"
android:padding="@dimen/size_8"
android:text="帮助"
android:visibility="gone"
android:textColor="@color/colorWrite" />
android:textColor="@color/colorWrite"
android:visibility="gone" />
</RelativeLayout>
<LinearLayout
......@@ -181,53 +181,55 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorWrite"
android:layout_marginTop="@dimen/size_50"
android:layout_marginLeft="@dimen/size_50"
android:layout_marginTop="@dimen/size_50"
android:layout_marginRight="@dimen/size_50"
android:layout_marginBottom="@dimen/size_50"
android:background="@color/colorWrite"
android:gravity="center_horizontal"
android:orientation="vertical">
<LinearLayout
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="@dimen/size_60"
android:gravity="center_vertical"
android:orientation="vertical">
android:orientation="vertical"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="刘伟 159****2558"/>
android:text="刘伟 159****2558" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="身份证号 541120********2210"/>
android:text="身份证号 541120********2210" />
</LinearLayout>
<include layout="@layout/common_line"/>
<include layout="@layout/common_line" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:gravity="center"
android:layout_weight="1">
android:layout_weight="1"
android:gravity="center">
<ImageView
android:id="@+id/iv_zxing"
android:layout_width="@dimen/size_200"
android:layout_height="@dimen/size_200"
android:scaleType="centerCrop"/>
android:scaleType="centerCrop" />
</LinearLayout>
<TextView
android:background="@color/gray_f5f5f5"
android:id="@+id/tv_bottom_hint"
android:layout_width="match_parent"
android:layout_height="@dimen/size_30"
android:textSize="@dimen/text_12"
android:background="@color/gray_f5f5f5"
android:gravity="center"
android:text="*滴房车管家扫码验证完成后，才能取车哦！"/>
android:text=""
android:textSize="@dimen/text_12" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
module_tourism/src/main/java/com/rv/tourism/other/TravelDetailsActivity.java
View file @ 2e548e9e
......@@ -140,7 +140,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
showTitle(false);
tvTitleCenter.setText("旅游详情");
tvTitleCenter.setText(mActivity.getString(R.string.tour_details));
webUrl = TourismApi.TRAVEL_DETAILS + "?id=" + id + "&v=1";
initWeb();
initRxbus();
......@@ -313,12 +313,12 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
setCollect((BeanTourismCollection) result);
break;
case 1:
showToast("收藏成功");
showToast(mActivity.getString(R.string.collection_success));
isCollection = "1";
ivCollect.setEnabled(true);
break;
case 2:
showToast("取消收藏成功");
showToast(mActivity.getString(R.string.cancel_collection));
isCollection = "0";
ivCollect.setEnabled(true);
break;
......@@ -344,7 +344,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
DetailsData = bean.getData();
if (DetailsData != null && DetailsData.getStock() < 1) {
TvAppointment.setEnabled(false);
TvAppointment.setText("已售完");
TvAppointment.setText(mActivity.getString(R.string.sold_out));
TvAppointment.setBackground(mActivity.getResources().getDrawable(R.color.colorGray));
}
}
......@@ -439,7 +439,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
@Override
public void onclick(SnsPlatform snsPlatform, SHARE_MEDIA share_media) {
sharingSuccess();
if (snsPlatform.mShowWord.equals("生成海报")) {
if (snsPlatform.mShowWord.equals(mActivity.getString(R.string.generate_poster))) {
String icon = "";
if (TextUtils.isEmpty(posterBackground)) {
icon = url;
......@@ -453,16 +453,16 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
.withString("imageUrl", icon)
.navigation();
} else if (snsPlatform.mShowWord.equals("复制链接")) {
} else if (snsPlatform.mShowWord.equals(mActivity.getString(R.string.copy_link))) {
copyText();
} else if (snsPlatform.mShowWord.contains("微信")) {
} else if (snsPlatform.mShowWord.contains(mActivity.getString(R.string.wechat))) {
if (!IsAppInstall.isWeixinAvilible(mActivity)) {
showToast("亲，您微信还没有安装呢");
showToast(mActivity.getString(R.string.not_wechat_hint));
return;
}
} else if (snsPlatform.mShowWord.contains("QQ")) {
if (!IsAppInstall.isQQClientAvailable(mActivity)) {
showToast("亲，您QQ还没有安装呢");
showToast(mActivity.getString(R.string.not_qq_hint));
return;
}
}
......@@ -476,7 +476,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
if (platform.name().equals("WEIXIN_FAVORITE")) {
showToast(" 收藏成功啦");
showToast(mActivity.getString(R.string.collection_success));
} else {
if (platform != SHARE_MEDIA.MORE && platform != SHARE_MEDIA.SMS
......@@ -491,7 +491,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
&& platform != SHARE_MEDIA.GOOGLEPLUS
&& platform != SHARE_MEDIA.YNOTE
&& platform != SHARE_MEDIA.EVERNOTE) {
showToast("分享成功啦");
showToast(mActivity.getString(R.string.sharing_success));
}
}
......@@ -704,7 +704,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
String code = Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_CODE, "");
ClipData myClip = ClipData.newPlainText("text", webUrl + "&shareType=app&code=" + code);
myClipboard.setPrimaryClip(myClip);
showToast("复制成功！");
showToast(mActivity.getString(R.string.copy_successful));
}
......
module_tourism/src/main/res/layout/activity_confirm_order_travel.xml
View file @ 2e548e9e
......@@ -35,7 +35,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="出发地:"
android:text="@string/departure"
android:textColor="@color/textGray"
android:textSize="@dimen/text_14" />
......@@ -53,7 +53,7 @@
android:layout_marginTop="@dimen/size_10"
android:gravity="center|start"
android:lines="1"
android:text="欣新房车（松山湖）有限公司"
android:text=""
android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" />
......@@ -63,7 +63,7 @@
android:layout_height="wrap_content"
android:gravity="center|start"
android:lines="2"
android:text="东莞市和兴街与莞樟路交叉口西100米"
android:text=""
android:textColor="@color/textGray"
android:textSize="@dimen/text_10" />
</LinearLayout>
......@@ -82,7 +82,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="目的地:"
android:text="@string/destination"
android:textColor="@color/textGray"
android:textSize="@dimen/text_14" />
......@@ -100,7 +100,7 @@
android:layout_height="wrap_content"
android:gravity="center|start"
android:lines="1"
android:text="呼伦贝尔大草原"
android:text=""
android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" />
</LinearLayout>
......@@ -118,7 +118,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="活动日期:"
android:text="@string/event_date"
android:textColor="@color/textGray"
android:textSize="@dimen/text_14" />
......@@ -136,7 +136,7 @@
android:layout_height="wrap_content"
android:gravity="center|start"
android:lines="1"
android:text="2019-06-12周三~2019-06-18周二"
android:text=""
android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" />
</LinearLayout>
......@@ -337,8 +337,7 @@
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_traveler"
android:layout_width="match_parent"
android:layout_height="wrap_content">
</android.support.v7.widget.RecyclerView>
android:layout_height="wrap_content"></android.support.v7.widget.RecyclerView>
</LinearLayout>
<LinearLayout
......@@ -362,38 +361,37 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_10"
android:textSize="@dimen/text_14"
android:text="保险 每天"/>
android:text="保险 每天"
android:textSize="@dimen/text_14" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_insurance_information"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_14"
android:text="¥0/人"
android:textColor="@color/colorAuxiliaryRed"
android:text="¥5/人" />
android:textSize="@dimen/text_14" />
<ImageView
android:id="@+id/iv_item_insurance_information"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="@dimen/size_20"
android:paddingLeft="@dimen/size_5"
android:paddingTop="@dimen/size_5"
android:paddingRight="@dimen/size_20"
android:paddingBottom="@dimen/size_5"
android:paddingLeft="@dimen/size_5"
android:src="@drawable/rv_common_icon_notice"/>
android:src="@drawable/rv_common_icon_notice" />
</LinearLayout>
<com.rv.component.control.SwitchButton
android:id="@+id/swbtn_insurance"
android:layout_width="wrap_content"
......@@ -403,15 +401,16 @@
app:sb_show_indicator="false"
app:sb_uncheckcircle_color="@color/textLightGrey" />
</LinearLayout>
<include layout="@layout/common_line" />
<RelativeLayout
android:background="@color/colorWrite"
android:id="@+id/rl_item_select_coupon"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15"
android:layout_width="match_parent"
android:layout_height="@dimen/size_50">
android:layout_height="@dimen/size_50"
android:background="@color/colorWrite"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15">
<TextView
android:layout_width="wrap_content"
......@@ -458,12 +457,12 @@
</RelativeLayout>
<RelativeLayout
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_15"
android:background="@color/colorWrite"
android:padding="@dimen/size_15">
android:padding="@dimen/size_15"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
......@@ -475,8 +474,6 @@
android:textSize="@dimen/text_16" />
<EditText
android:inputType="phone"
android:maxLength="11"
android:id="@+id/edt_inviter_phone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -485,6 +482,8 @@
android:background="@color/colorWrite"
android:gravity="center_vertical|right"
android:hint="请输入邀请人手机号"
android:inputType="phone"
android:maxLength="11"
android:textColor="@color/text_Gray"
android:textSize="@dimen/text_12" />
</RelativeLayout>
......@@ -546,7 +545,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="¥3550.00"
android:text="0.00"
android:textColor="@color/colorAuxiliaryRed"
android:textSize="@dimen/text_16" />
......@@ -561,9 +560,9 @@
android:id="@+id/tv_detail"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:drawableRight="@drawable/rv_common_icon_down_arrow"
android:drawablePadding="@dimen/size_3"
android:gravity="center"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15"
android:text="明细"
......
module_tourism/src/main/res/layout/activity_popular_tour_list.xml
View file @ 2e548e9e
......@@ -50,7 +50,7 @@
android:layout_marginTop="@dimen/size_20"
android:layout_marginBottom="@dimen/size_20"
android:gravity="center_horizontal"
android:text="— 推荐路线 —" />
android:text="@string/recommended_route" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_recommended_route"
......@@ -70,7 +70,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/size_60"
android:gravity="center"
android:text="— 选择旅游类型 —"
android:text="@string/select_tourism_type"
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_16" />
......
module_tourism/src/main/res/layout/activity_tourism.xml
View file @ 2e548e9e
......@@ -38,7 +38,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/size_3"
android:text="东莞市"
android:text="@string/dongguan_city"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_16" />
......@@ -67,7 +67,7 @@
android:layout_weight="1"
android:background="@null"
android:gravity="center_vertical"
android:hint="搜索目的地/旅游线"
android:hint="@string/search_tourism_hint"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15"
android:textColor="@color/colorMain"
......@@ -90,7 +90,7 @@
<include layout="@layout/common_line" />
<com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
<com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout
android:id="@+id/refresh"
android:layout_width="match_parent"
android:layout_height="match_parent">
......@@ -129,7 +129,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15"
android:layout_weight="1"
android:text="热门游"
android:text="@string/popular_tour"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_16" />
......@@ -138,10 +138,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableRight="@drawable/common_icon_rig_black_gray"
android:drawablePadding="@dimen/size_5"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15"
android:drawablePadding="@dimen/size_5"
android:text="全部"
android:text="@string/all"
android:textSize="@dimen/text_10" />
</LinearLayout>
......@@ -165,7 +165,7 @@
android:layout_marginLeft="@dimen/size_15"
android:layout_marginTop="@dimen/size_12"
android:layout_marginBottom="@dimen/size_12"
android:text="周边游"
android:text="@string/tour_around"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_16" />
......@@ -193,9 +193,9 @@
<TextView
android:layout_width="match_parent"
android:layout_height="@dimen/size_60"
android:gravity="center"
android:text="— 选择旅游类型 —"
android:layout_marginTop="@dimen/size_20"
android:gravity="center"
android:text="@string/select_tourism_type"
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_16" />
......@@ -203,8 +203,8 @@
android:id="@+id/rv_popular_more"
android:layout_width="match_parent"
android:layout_height="0dp"
android:paddingBottom="@dimen/size_40"
android:layout_weight="1" />
android:layout_weight="1"
android:paddingBottom="@dimen/size_40" />
<ImageView
android:id="@+id/travel_hot_more_close"
......
module_tourism/src/main/res/layout/activity_travel_details.xml
View file @ 2e548e9e
......@@ -4,7 +4,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout
android:id="@+id/lay_title"
android:layout_width="match_parent"
android:layout_height="@dimen/size_55"
......@@ -102,7 +102,7 @@
android:layout_weight="1"
android:background="@color/white"
android:gravity="center"
android:text="联系客服"
android:text="@string/contact_customer_service"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" />
......@@ -113,7 +113,7 @@
android:layout_weight="1"
android:background="@color/gray_FFB74B"
android:gravity="center"
android:text="立即预订"
android:text="@string/book_now"
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_14" />
......
module_tourism/src/main/res/layout/rv_item_all_popular.xml
View file @ 2e548e9e
......@@ -19,7 +19,7 @@
android:paddingTop="@dimen/size_5"
android:background="@drawable/shape_rv_bg_translucent_black_half"
android:gravity="center"
android:text="新疆游"
android:text=""
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_10" />
</RelativeLayout>
\ No newline at end of file
module_tourism/src/main/res/layout/rv_item_popular_brigade.xml
View file @ 2e548e9e
......@@ -19,7 +19,7 @@
android:paddingTop="@dimen/size_5"
android:background="@drawable/shape_rv_bg_translucent_black_half"
android:gravity="center"
android:text="新疆游"
android:text=""
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_10" />
</RelativeLayout>
\ No newline at end of file
module_tourism/src/main/res/layout/rv_item_tour_around.xml
View file @ 2e548e9e
......@@ -30,7 +30,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:lines="2"
android:text="草原大漠6天5晚，穿越沙漠+宗教人文+房车露营"
android:text=""
android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" />
......@@ -42,12 +42,12 @@
android:background="@drawable/ui_selector_radius_common_dark"
android:paddingLeft="@dimen/size_5"
android:paddingTop="@dimen/size_3"
android:visibility="invisible"
android:paddingRight="@dimen/size_5"
android:paddingBottom="@dimen/size_3"
android:text="东莞出发"
android:textColor="@color/textLightGrey"
android:textSize="@dimen/text_10" />
android:textSize="@dimen/text_10"
android:visibility="invisible" />
<LinearLayout
android:layout_width="match_parent"
......@@ -60,7 +60,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:lines="1"
android:text="20"
android:text=""
android:textColor="@color/textGray"
android:textSize="@dimen/text_10" />
......@@ -69,7 +69,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:lines="1"
android:text="人待出发"
android:text="@string/tourism_people"
android:textColor="@color/textGray"
android:textSize="@dimen/text_10" />
......@@ -77,9 +77,9 @@
android:id="@+id/tv_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="@color/colorAuxiliaryRed"
android:textSize="@dimen/text_16"
android:text="¥5000/人"/>
android:textSize="@dimen/text_16" />
</LinearLayout>
</LinearLayout>
</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