Skip to content

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

提交代码

parents d25de213 5da3d590
Show whitespace changes
Inline Side-by-side
Showing with 150 additions and 402 deletions
MyFrame/src/main/java/com/frame/base/url/ImageUrl.java 0 → 100644
View file @ f5d8a57d
package com.frame.base.url;
public final class ImageUrl {
public static final String IMG_BG_SHARE_TOP = "https://mgmt.dfangche.com/image/app/bg_share_top.png";
public static final String IMG_BG_BILL = "https://mgmt.dfangche.com/image/app/bg_bill.png";
public static final String IMG_BG_BANNER_SIGN = "https://mgmt.dfangche.com/image/app/banner_sign.png";
}
RvWrapper/src/main/res/values/dimens.xml
View file @ f5d8a57d
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
<dimen name="size_240">240dp</dimen> <dimen name="size_240">240dp</dimen>
<dimen name="size_245">245dp</dimen> <dimen name="size_245">245dp</dimen>
<dimen name="size_250">250dp</dimen> <dimen name="size_250">250dp</dimen>
<dimen name="size_320">320dp</dimen>
<dimen name="size_410">410dp</dimen> <dimen name="size_410">410dp</dimen>
<dimen name="size_420">420dp</dimen> <dimen name="size_420">420dp</dimen>
<dimen name="size_440">440dp</dimen> <dimen name="size_440">440dp</dimen>
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/HomeFragment.java
View file @ f5d8a57d
...@@ -458,7 +458,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa ...@@ -458,7 +458,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
begTime = hh + ":30"; begTime = hh + ":30";
} }
if (DateUtils.formatDate20(begTime) > DateUtils.formatDate20("19:30")) { //如果当前时间大于 19：30，日期往后加一，时间改成早上8：00 if (DateUtils.formatDate20(begTime) > DateUtils.formatDate20("22:30")) { //如果当前时间大于 22：30，日期往后加一，时间改成早上8：00
begDate = MyUtils.getFetureDate(1) + " " + "08:30"; begDate = MyUtils.getFetureDate(1) + " " + "08:30";
endDate = MyUtils.getFetureDate(3) + " " + "08:30"; endDate = MyUtils.getFetureDate(3) + " " + "08:30";
} else { } else {
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/adapter/CarRentalCheckPriceAdapter.java
View file @ f5d8a57d
...@@ -5,7 +5,6 @@ import com.chad.library.adapter.base.BaseViewHolder; ...@@ -5,7 +5,6 @@ import com.chad.library.adapter.base.BaseViewHolder;
import com.rv.component.utils.DateUtils; import com.rv.component.utils.DateUtils;
import com.rv.home.R; import com.rv.home.R;
import com.rv.home.rv.module.ui.main.home.bean.CarRentalPriceBean; import com.rv.home.rv.module.ui.main.home.bean.CarRentalPriceBean;
import com.rv.home.rv.module.ui.main.home.bean.SearchBean;
/** /**
* 租车价格查看 * 租车价格查看
...@@ -29,7 +28,7 @@ public class CarRentalCheckPriceAdapter extends BaseQuickAdapter<CarRentalPriceB ...@@ -29,7 +28,7 @@ public class CarRentalCheckPriceAdapter extends BaseQuickAdapter<CarRentalPriceB
} }
if (type) { if (type) {
helper.setText(R.id.tv_price, item.getFreeDays()); helper.setText(R.id.tv_price, item.getFreeDays() + "天");
} else { } else {
helper.setText(R.id.tv_price, "¥" + item.getPrice()); helper.setText(R.id.tv_price, "¥" + item.getPrice());
} }
......
module_home/src/main/res/layout/rv_item_carrental_check_price.xml
View file @ f5d8a57d
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
android:id="@+id/tv_date" android:id="@+id/tv_date"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="15" android:text=""
android:textColor="@color/text_Main" android:textColor="@color/text_Main"
android:textSize="@dimen/text_16" /> android:textSize="@dimen/text_16" />
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_3" android:layout_marginTop="@dimen/size_3"
android:text="￥1500" android:text=""
android:textColor="@color/colorAuxiliaryRed" android:textColor="@color/colorAuxiliaryRed"
android:textSize="@dimen/text_10" /> android:textSize="@dimen/text_10" />
......
module_mine/src/main/java/com/rv/rvmine/traveler/SettingActivity.java
View file @ f5d8a57d
...@@ -142,6 +142,7 @@ public class SettingActivity extends BaseStatusActivity<CommonPresenter> impleme ...@@ -142,6 +142,7 @@ public class SettingActivity extends BaseStatusActivity<CommonPresenter> impleme
DownListenerManager.getInstance().removeDownListener(this); DownListenerManager.getInstance().removeDownListener(this);
} }
@OnClick({R2.id.rl_item_account_safe, R2.id.ll_item_app_push, R2.id.rl_item_clear_cache, R2.id.rl_item_check_for_updates, R2.id.rl_item_about_us, R2.id.tv_out_sign}) @OnClick({R2.id.rl_item_account_safe, R2.id.ll_item_app_push, R2.id.rl_item_clear_cache, R2.id.rl_item_check_for_updates, R2.id.rl_item_about_us, R2.id.tv_out_sign})
public void onViewClicked(View view) { public void onViewClicked(View view) {
......
plugin_calendar/src/main/java/com/rv/plugin/calendar/CalendarActivity.java
View file @ f5d8a57d
...@@ -358,7 +358,7 @@ public class CalendarActivity extends BaseStatusActivity<CalendarPresenter> { ...@@ -358,7 +358,7 @@ public class CalendarActivity extends BaseStatusActivity<CalendarPresenter> {
* 初始化时间数据 * 初始化时间数据
*/ */
private void initTime() { private void initTime() {
for (int i = 8; i < 20; i++) { for (int i = 8; i < 23; i++) {
if (i > 8) { if (i > 8) {
timeList.add(String.format("%02d", i) + ":00"); timeList.add(String.format("%02d", i) + ":00");
} }
......
plugin_im/src/main/java/com/rv/im/util/SmileyParser.java
View file @ f5d8a57d
...@@ -307,7 +307,7 @@ public class SmileyParser { ...@@ -307,7 +307,7 @@ public class SmileyParser {
} }
public static class Gifs { public static class Gifs {
private static final int[][] IDS = { /* private static final int[][] IDS = {
{ {
R.drawable.gif_eight, R.drawable.gif_eighteen, R.drawable.gif_eleven, R.drawable.gif_fifity, R.drawable.gif_eight, R.drawable.gif_eighteen, R.drawable.gif_eleven, R.drawable.gif_fifity,
R.drawable.gif_fifity_four, R.drawable.gif_fifity_one, R.drawable.gif_fifity_three, R.drawable.gif_fifity_two R.drawable.gif_fifity_four, R.drawable.gif_fifity_one, R.drawable.gif_fifity_three, R.drawable.gif_fifity_two
...@@ -334,7 +334,7 @@ public class SmileyParser { ...@@ -334,7 +334,7 @@ public class SmileyParser {
, R.drawable.gif_twenty_three, R.drawable.gif_twenty_two , R.drawable.gif_twenty_three, R.drawable.gif_twenty_two
} }
}; };*/
private static final String[][] TEXTS = { private static final String[][] TEXTS = {
{ {
"eight.gif", "eighteen.gif", "eleven.gif", "fifity.gif", "eight.gif", "eighteen.gif", "eleven.gif", "fifity.gif",
...@@ -372,72 +372,72 @@ public class SmileyParser { ...@@ -372,72 +372,72 @@ public class SmileyParser {
/** /**
* gif * gif
*/ */
private static final int[][] PNGID = { // private static final int[][] PNGID = {
{ // {
R.drawable.gif_eight_png, R.drawable.gif_eighteen_png, R.drawable.gif_eleven_png, R.drawable.gif_fifity_png, // R.drawable.gif_eight_png, R.drawable.gif_eighteen_png, R.drawable.gif_eleven_png, R.drawable.gif_fifity_png,
R.drawable.gif_fifity_four_png, R.drawable.gif_fifity_one_png, R.drawable.gif_fifity_three_png, R.drawable.gif_fifity_two_png // R.drawable.gif_fifity_four_png, R.drawable.gif_fifity_one_png, R.drawable.gif_fifity_three_png, R.drawable.gif_fifity_two_png
, R.drawable.gif_fifteen_png, R.drawable.gif_five_png // , R.drawable.gif_fifteen_png, R.drawable.gif_five_png
}, // },
{ // {
R.drawable.gif_forty_png, R.drawable.gif_forty_eight_png, // R.drawable.gif_forty_png, R.drawable.gif_forty_eight_png,
R.drawable.gif_forty_five_png, R.drawable.gif_forty_four_png, R.drawable.gif_forty_nine_png, R.drawable.gif_forty_one_png // R.drawable.gif_forty_five_png, R.drawable.gif_forty_four_png, R.drawable.gif_forty_nine_png, R.drawable.gif_forty_one_png
, R.drawable.gif_forty_seven_png, R.drawable.gif_forty_three_png, R.drawable.gif_forty_two_png, R.drawable.gif_fourteen_png // , R.drawable.gif_forty_seven_png, R.drawable.gif_forty_three_png, R.drawable.gif_forty_two_png, R.drawable.gif_fourteen_png
}, // },
{ // {
//
R.drawable.gif_nine_png, R.drawable.gif_nineteen_png, R.drawable.gif_one_png, R.drawable.gif_seven_png, // R.drawable.gif_nine_png, R.drawable.gif_nineteen_png, R.drawable.gif_one_png, R.drawable.gif_seven_png,
R.drawable.gif_seventeen_png, R.drawable.gif_sixteen_png, R.drawable.gif_ten_png, R.drawable.gif_thirteen_png, // R.drawable.gif_seventeen_png, R.drawable.gif_sixteen_png, R.drawable.gif_ten_png, R.drawable.gif_thirteen_png,
R.drawable.gif_thirty_png, R.drawable.gif_thirty_eight_png // R.drawable.gif_thirty_png, R.drawable.gif_thirty_eight_png
}, // },
{ // {
R.drawable.gif_thirty_five_png, R.drawable.gif_thirty_four_png, R.drawable.gif_thirty_nine_png, R.drawable.gif_thirty_seven_png // R.drawable.gif_thirty_five_png, R.drawable.gif_thirty_four_png, R.drawable.gif_thirty_nine_png, R.drawable.gif_thirty_seven_png
, R.drawable.gif_thirty_six_png, R.drawable.gif_thirty_three_png, R.drawable.gif_thirty_two_png, R.drawable.gif_thirty_one_png // , R.drawable.gif_thirty_six_png, R.drawable.gif_thirty_three_png, R.drawable.gif_thirty_two_png, R.drawable.gif_thirty_one_png
, R.drawable.gif_three_png, R.drawable.gif_twelve_png // , R.drawable.gif_three_png, R.drawable.gif_twelve_png
}, // },
{ // {
R.drawable.gif_twenty_png, R.drawable.gif_twenty_eight_png, R.drawable.gif_twenty_five_png, R.drawable.gif_twenty_four_png, // R.drawable.gif_twenty_png, R.drawable.gif_twenty_eight_png, R.drawable.gif_twenty_five_png, R.drawable.gif_twenty_four_png,
R.drawable.gif_twenty_nine_png, R.drawable.gif_twenty_one_png, R.drawable.gif_twenty_seven_png, R.drawable.gif_twenty_six_png // R.drawable.gif_twenty_nine_png, R.drawable.gif_twenty_one_png, R.drawable.gif_twenty_seven_png, R.drawable.gif_twenty_six_png
, R.drawable.gif_twenty_three_png, R.drawable.gif_twenty_two_png // , R.drawable.gif_twenty_three_png, R.drawable.gif_twenty_two_png
} // }
//
}; // };
private static final Map<String, Integer> MAPS = new HashMap<String, Integer>(); private static final Map<String, Integer> MAPS = new HashMap<String, Integer>();
static { // static {
// 取最小的长度，防止长度不一致出错 // // 取最小的长度，防止长度不一致出错
int length = IDS.length > TEXTS.length ? TEXTS.length : IDS.length; // int length = IDS.length > TEXTS.length ? TEXTS.length : IDS.length;
for (int i = 0; i < length; i++) { // for (int i = 0; i < length; i++) {
int[] subIds = IDS[i]; // int[] subIds = IDS[i];
String[] subTexts = TEXTS[i]; // String[] subTexts = TEXTS[i];
if (subIds == null || subTexts == null) { // if (subIds == null || subTexts == null) {
continue; // continue;
} // }
int subLength = subIds.length > subTexts.length ? subTexts.length : subIds.length; // int subLength = subIds.length > subTexts.length ? subTexts.length : subIds.length;
for (int j = 0; j < subLength; j++) { // for (int j = 0; j < subLength; j++) {
MAPS.put(TEXTS[i][j], IDS[i][j]); // MAPS.put(TEXTS[i][j], IDS[i][j]);
} // }
} // }
} // }
public static int[][] getIds() { // public static int[][] getIds() {
return IDS; // return IDS;
} // }
//
public static String[][] getTexts() { // public static String[][] getTexts() {
return TEXTS; // return TEXTS;
} // }
//
public static int textMapId(String text) { // public static int textMapId(String text) {
if (MAPS.containsKey(text)) { // if (MAPS.containsKey(text)) {
return MAPS.get(text); // return MAPS.get(text);
} else { // } else {
return -1; // return -1;
} // }
} // }
//
public static int[][] getPngIds() { // public static int[][] getPngIds() {
//
return PNGID; // return PNGID;
} // }
} }
} }
plugin_points/src/main/java/com/rv/points/SignActivity.java
View file @ f5d8a57d
...@@ -15,16 +15,22 @@ import android.widget.ImageView; ...@@ -15,16 +15,22 @@ import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.bumptech.glide.request.RequestOptions;
import com.frame.base.url.ImageUrl;
import com.frame.rv.config.RvFrameConfig; import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean; import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity; import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
import com.ruiwenliu.wrapper.util.TransformationUtil;
import com.ruiwenliu.wrapper.util.glide.GlideOptions;
import com.ruiwenliu.wrapper.weight.TitleView; import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.component.utils.DisplayUtil; import com.rv.component.utils.DisplayUtil;
import com.rv.home.rv.module.ApiConfig; import com.rv.home.rv.module.ApiConfig;
import com.ruiwenliu.wrapper.base.presenter.CommonPresenter; import com.rv.points.adapter.DateAdapter;
import com.rv.points.bean.SignRecordBean; import com.rv.points.bean.SignRecordBean;
import com.rv.points.bean.SignResultBean; import com.rv.points.bean.SignResultBean;
import com.rv.points.adapter.DateAdapter;
import com.rv.points.utils.DateUtils; import com.rv.points.utils.DateUtils;
import com.rv.points.view.InnerGridView; import com.rv.points.view.InnerGridView;
import com.yuyife.okgo.OkGoUtil; import com.yuyife.okgo.OkGoUtil;
...@@ -33,6 +39,7 @@ import java.util.HashMap; ...@@ -33,6 +39,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife;
public class SignActivity extends BaseStatusActivity<CommonPresenter> { public class SignActivity extends BaseStatusActivity<CommonPresenter> {
...@@ -44,6 +51,8 @@ public class SignActivity extends BaseStatusActivity<CommonPresenter> { ...@@ -44,6 +51,8 @@ public class SignActivity extends BaseStatusActivity<CommonPresenter> {
TextView tvSignDay; TextView tvSignDay;
@BindView(R2.id.img_back) @BindView(R2.id.img_back)
ImageView imgBack; ImageView imgBack;
@BindView(R2.id.iv_sign_top_bg)
ImageView ivSignTopBg;
private DateAdapter dateAdapter; private DateAdapter dateAdapter;
@Override @Override
...@@ -53,6 +62,19 @@ public class SignActivity extends BaseStatusActivity<CommonPresenter> { ...@@ -53,6 +62,19 @@ public class SignActivity extends BaseStatusActivity<CommonPresenter> {
@Override @Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) { protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
GlideOptions options = GlideOptions.placeholderOf(com.ruiwenliu.wrapper.R.drawable.glide_icon_placeholder).
error(com.ruiwenliu.wrapper.R.drawable.glide_icon_error);
TransformationUtil utils = new TransformationUtil(ivSignTopBg);
Glide.with(this)
.asBitmap()
.load(ImageUrl.IMG_BG_BANNER_SIGN)
.apply(options)
.apply(RequestOptions
.bitmapTransform(new RoundedCorners(12)).override(ivSignTopBg.getWidth(), ivSignTopBg.getHeight())
.disallowHardwareConfig())
.into(utils);
titleView.setVisibility(View.GONE); titleView.setVisibility(View.GONE);
btnSign.setOnClickListener(new View.OnClickListener() { btnSign.setOnClickListener(new View.OnClickListener() {
@Override @Override
...@@ -121,4 +143,10 @@ public class SignActivity extends BaseStatusActivity<CommonPresenter> { ...@@ -121,4 +143,10 @@ public class SignActivity extends BaseStatusActivity<CommonPresenter> {
} }
} }
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
} }
plugin_points/src/main/res/layout/activity_sign.xml
View file @ f5d8a57d
...@@ -46,10 +46,10 @@ ...@@ -46,10 +46,10 @@
android:orientation="vertical"> android:orientation="vertical">
<ImageView <ImageView
android:id="@+id/iv_sign_top_bg"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="180dip" android:layout_height="180dip"
android:scaleType="fitXY" android:scaleType="fitXY" />
android:src="@drawable/banner_sign" />
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
......
plugin_share/src/main/AndroidManifest.xml
View file @ f5d8a57d
...@@ -28,9 +28,6 @@ ...@@ -28,9 +28,6 @@
<activity <activity
android:name=".PopularizeActivity" android:name=".PopularizeActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity
android:name=".ShareRulerActivity"
android:screenOrientation="portrait" />
</application> </application>
</manifest> </manifest>
\ No newline at end of file
plugin_share/src/main/java/com/rv/share/ReativeBillActivity.java
View file @ f5d8a57d
...@@ -24,6 +24,7 @@ import com.base.utils.ui.image.round.RoundImageView; ...@@ -24,6 +24,7 @@ import com.base.utils.ui.image.round.RoundImageView;
import com.bumptech.glide.Glide; import com.bumptech.glide.Glide;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.RequestOptions;
import com.frame.base.url.ImageUrl;
import com.ruiwenliu.wrapper.base.BaseBean; import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity; import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.bean.UserInfoBean; import com.ruiwenliu.wrapper.bean.UserInfoBean;
...@@ -90,7 +91,7 @@ public class ReativeBillActivity extends BaseStatusActivity<ReativeBillPresenter ...@@ -90,7 +91,7 @@ public class ReativeBillActivity extends BaseStatusActivity<ReativeBillPresenter
TransformationUtils utils = new TransformationUtils(imgBillTop); TransformationUtils utils = new TransformationUtils(imgBillTop);
Glide.with(this) Glide.with(this)
.asBitmap() .asBitmap()
.load(R.drawable.bg_bill) .load(ImageUrl.IMG_BG_BILL)
.apply(options) .apply(options)
.apply(RequestOptions .apply(RequestOptions
.bitmapTransform(new RoundedCorners(12)).override(imgBillTop.getWidth(), imgBillTop.getHeight()) .bitmapTransform(new RoundedCorners(12)).override(imgBillTop.getWidth(), imgBillTop.getHeight())
......
plugin_share/src/main/java/com/rv/share/ShareActivity.java
View file @ f5d8a57d
...@@ -15,25 +15,31 @@ import android.widget.ImageView; ...@@ -15,25 +15,31 @@ import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import com.base.utils.ui.datetime.selector.util.TextUtil; import com.base.utils.ui.datetime.selector.util.TextUtil;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.bumptech.glide.request.RequestOptions;
import com.frame.base.url.ImageUrl;
import com.frame.rv.config.RvFrameConfig; import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.SPConstance; import com.ruiwenliu.wrapper.SPConstance;
import com.ruiwenliu.wrapper.base.BaseBean; import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity; import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.util.glide.GlideManager; import com.ruiwenliu.wrapper.util.glide.GlideManager;
import com.ruiwenliu.wrapper.util.glide.GlideOptions;
import com.ruiwenliu.wrapper.weight.TitleView; import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.component.utils.AppCookie;
import com.rv.component.utils.Cookie; import com.rv.component.utils.Cookie;
import com.rv.component.utils.DisplayUtil; import com.rv.component.utils.DisplayUtil;
import com.rv.component.utils.ShareUtils; import com.rv.component.utils.ShareUtils;
import com.rv.home.rv.module.ApiConfig; import com.rv.home.rv.module.ApiConfig;
import com.rv.share.bean.PersonShareBean; import com.rv.share.bean.PersonShareBean;
import com.rv.share.presenter.SharePresenter; import com.rv.share.presenter.SharePresenter;
import com.rv.share.utils.TransformationUtils;
import com.yuyife.okgo.OkGoUtil; import com.yuyife.okgo.OkGoUtil;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
public class ShareActivity extends BaseStatusActivity<SharePresenter> { public class ShareActivity extends BaseStatusActivity<SharePresenter> {
...@@ -65,6 +71,8 @@ public class ShareActivity extends BaseStatusActivity<SharePresenter> { ...@@ -65,6 +71,8 @@ public class ShareActivity extends BaseStatusActivity<SharePresenter> {
@BindView(R2.id.tv_more_detail) @BindView(R2.id.tv_more_detail)
TextView tvMoreDetail; TextView tvMoreDetail;
@BindView(R2.id.iv_share_bg)
ImageView ivShareBg;
private String shareUrl; private String shareUrl;
@Override @Override
...@@ -123,13 +131,25 @@ public class ShareActivity extends BaseStatusActivity<SharePresenter> { ...@@ -123,13 +131,25 @@ public class ShareActivity extends BaseStatusActivity<SharePresenter> {
@Override @Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) { protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setTitle("推广有奖"); titleView.setTitle("推广有奖");
String userCode = Cookie.getStringValue(this,SPConstance.USER_JSON_CODE); String userCode = Cookie.getStringValue(this, SPConstance.USER_JSON_CODE);
if (TextUtils.isEmpty(userCode)) { if (TextUtils.isEmpty(userCode)) {
((View) (tvShareCode.getParent().getParent())).setVisibility(View.GONE); ((View) (tvShareCode.getParent().getParent())).setVisibility(View.GONE);
} else { } else {
((View) (tvShareCode.getParent().getParent())).setVisibility(View.VISIBLE); ((View) (tvShareCode.getParent().getParent())).setVisibility(View.VISIBLE);
tvShareCode.setText(userCode); tvShareCode.setText(userCode);
} }
// GlideManager.getInstance(mActivity).loadImage(ImageUrl.IMG_BG_SHARE_TOP, ivShareBg);
GlideOptions options = GlideOptions.placeholderOf(com.ruiwenliu.wrapper.R.drawable.glide_icon_placeholder).
error(com.ruiwenliu.wrapper.R.drawable.glide_icon_error);
TransformationUtils utils = new TransformationUtils(ivShareBg);
Glide.with(this)
.asBitmap()
.load(ImageUrl.IMG_BG_SHARE_TOP)
.apply(options)
.apply(RequestOptions
.bitmapTransform(new RoundedCorners(12)).override(ivShareBg.getWidth(), ivShareBg.getHeight())
.disallowHardwareConfig())
.into(utils);
} }
private void getPersonShareInfo() { private void getPersonShareInfo() {
...@@ -172,4 +192,10 @@ public class ShareActivity extends BaseStatusActivity<SharePresenter> { ...@@ -172,4 +192,10 @@ public class ShareActivity extends BaseStatusActivity<SharePresenter> {
} }
} }
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
} }
plugin_share/src/main/java/com/rv/share/ShareRulerActivity.java deleted 100644 → 0
View file @ d25de213
package com.rv.share;
import android.content.Intent;
import android.os.Bundle;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
public class ShareRulerActivity extends BaseStatusActivity<CommonPresenter> {
@Override
protected int setLayout() {
return R.layout.activity_share_ruler;
}
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setTitle("推广有奖规则");
}
@Override
public void onShowResult(int requestType, BaseBean result) {
}
}
plugin_share/src/main/res/layout/activity_share.xml
View file @ f5d8a57d
...@@ -20,13 +20,14 @@ ...@@ -20,13 +20,14 @@
android:orientation="vertical"> android:orientation="vertical">
<FrameLayout <FrameLayout
android:layout_marginBottom="@dimen/size_10"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<ImageView <ImageView
android:id="@+id/iv_share_bg"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content" />
android:src="@drawable/bg_share_top" />
<TextView <TextView
android:id="@+id/tv_ruler" android:id="@+id/tv_ruler"
...@@ -46,7 +47,6 @@ ...@@ -46,7 +47,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_10" android:layout_marginLeft="@dimen/size_10"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginRight="@dimen/size_10" android:layout_marginRight="@dimen/size_10"
android:layout_marginBottom="@dimen/dp_10" android:layout_marginBottom="@dimen/dp_10"
app:cardCornerRadius="5dp"> app:cardCornerRadius="5dp">
...@@ -78,6 +78,7 @@ ...@@ -78,6 +78,7 @@
<Button <Button
android:id="@+id/btn_code_copy" android:id="@+id/btn_code_copy"
style="?android:attr/borderlessButtonStyle"
android:layout_width="53dp" android:layout_width="53dp"
android:layout_height="23dp" android:layout_height="23dp"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
...@@ -88,8 +89,7 @@ ...@@ -88,8 +89,7 @@
android:gravity="center" android:gravity="center"
android:text="复制" android:text="复制"
android:textColor="@color/gray_FFB74B" android:textColor="@color/gray_FFB74B"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12" />
style="?android:attr/borderlessButtonStyle"/>
</RelativeLayout> </RelativeLayout>
......
plugin_share/src/main/res/layout/activity_share_ruler.xml deleted 100644 → 0
View file @ d25de213
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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"
android:orientation="vertical"
tools:context=".ShareRulerActivity">
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/height_share_ruler_top"
android:scaleType="fitXY"
android:src="@drawable/banner_share_ruler_top" />
<TextView
android:layout_width="@dimen/size_80"
android:layout_height="@dimen/size_30"
android:layout_marginLeft="@dimen/size_10"
android:layout_marginTop="@dimen/size_10"
android:background="@drawable/bg_share_ruler_tab"
android:gravity="center"
android:text="活动时间"
android:textColor="@color/white"
android:textSize="@dimen/sp_16"
android:visibility="gone" />
<TextView
android:id="@+id/tv_ac_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_10"
android:layout_marginTop="@dimen/size_10"
android:text="2019-06-25 10:00~2019-06-25 10:00"
android:textColor="#666666"
android:textSize="@dimen/sp_14"
android:visibility="gone" />
<TextView
android:layout_width="@dimen/size_80"
android:layout_height="@dimen/size_30"
android:layout_marginLeft="@dimen/size_10"
android:layout_marginTop="@dimen/size_10"
android:background="@drawable/bg_share_ruler_tab"
android:gravity="center"
android:text="活动简介"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_10"
android:layout_marginTop="@dimen/size_10"
android:layout_marginRight="@dimen/size_10"
android:text=" 分享您的推广码或专属链接给您的好友，邀请好友下载并进入【滴房车APP】完成注册。您的好友完成租车、房车游、购买会员订单，您即可获得好友支付订单金额（不包括租车押金）的5%提成作为邀请奖励。您邀请下单的好友越多，您获得的奖励越多，奖励现金可提现。"
android:textColor="#ff666666"
android:textSize="@dimen/sp_14" />
<TextView
android:layout_width="@dimen/size_80"
android:layout_height="@dimen/size_30"
android:layout_marginLeft="@dimen/size_10"
android:layout_marginTop="@dimen/size_20"
android:background="@drawable/bg_share_ruler_tab"
android:gravity="center"
android:text="参与流程"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_10"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40"
android:layout_marginLeft="@dimen/size_50"
android:layout_marginRight="@dimen/size_50"
android:background="@drawable/bg_income_item"
android:gravity="center"
android:text="进入滴房车APP【我的—推广有奖】" />
<ImageView
android:layout_width="5dp"
android:layout_height="@dimen/size_20"
android:layout_marginTop="@dimen/size_3"
android:layout_marginBottom="3dp"
android:gravity="center_horizontal"
android:orientation="vertical"
android:src="@drawable/icon_share_ruler_down" />
<TextView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40"
android:layout_marginLeft="@dimen/size_50"
android:layout_marginRight="@dimen/size_50"
android:background="@drawable/bg_income_item"
android:gravity="center"
android:text="生成并分享您专属的推广码或推广链接" />
<ImageView
android:layout_width="5dp"
android:layout_height="@dimen/size_20"
android:layout_marginTop="@dimen/size_3"
android:layout_marginBottom="3dp"
android:gravity="center_horizontal"
android:orientation="vertical"
android:src="@drawable/icon_share_ruler_down" />
<TextView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40"
android:layout_marginLeft="@dimen/size_50"
android:layout_marginRight="@dimen/size_50"
android:background="@drawable/bg_income_item"
android:gravity="center"
android:text="分享给您的好友" />
<ImageView
android:layout_width="5dp"
android:layout_height="@dimen/size_20"
android:layout_marginTop="@dimen/size_3"
android:layout_marginBottom="3dp"
android:gravity="center_horizontal"
android:orientation="vertical"
android:src="@drawable/icon_share_ruler_down" />
<TextView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40"
android:layout_marginLeft="@dimen/size_50"
android:layout_marginRight="@dimen/size_50"
android:background="@drawable/bg_income_item"
android:gravity="center"
android:text="好友下载APP并完成手机号注册" />
<ImageView
android:layout_width="5dp"
android:layout_height="@dimen/size_20"
android:layout_marginTop="@dimen/size_3"
android:layout_marginBottom="3dp"
android:gravity="center_horizontal"
android:orientation="vertical"
android:src="@drawable/icon_share_ruler_down" />
<TextView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40"
android:layout_marginLeft="@dimen/size_50"
android:layout_marginRight="@dimen/size_50"
android:background="@drawable/bg_income_item"
android:gravity="center"
android:text="好友成功消费" />
<ImageView
android:layout_width="5dp"
android:layout_height="@dimen/size_20"
android:layout_marginTop="@dimen/size_3"
android:layout_marginBottom="3dp"
android:gravity="center_horizontal"
android:orientation="vertical"
android:src="@drawable/icon_share_ruler_down" />
<TextView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40"
android:layout_marginLeft="@dimen/size_50"
android:layout_marginRight="@dimen/size_50"
android:background="@drawable/bg_income_item"
android:gravity="center"
android:text="您获取邀请奖励：实际订单消费金额的5%" />
</LinearLayout>
<TextView
android:layout_width="@dimen/size_80"
android:layout_height="@dimen/size_30"
android:layout_marginLeft="@dimen/size_10"
android:layout_marginTop="@dimen/size_20"
android:background="@drawable/bg_share_ruler_tab"
android:gravity="center"
android:text="活动说明"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_10"
android:layout_marginTop="@dimen/size_10"
android:layout_marginRight="@dimen/size_10"
android:text="1、您的好友领取滴房车新人专享优惠券，需满足下列条件的：\n
a、好友有下载滴房车APP；\n
b、好友为新用户并未进行过注册；\n
c、好友的当前帐号中无滴房车推广有奖优惠券。\n
\n
2、在确保您帐号为登录的状态下，房车、旅游、营地、拍拍等APP内的分享，有同等推广效果。\n
\n
3、好友在完成一下情况，可您获取奖励：\n
a、好友成功支付房车租赁订单，并完成出行（不包括租车押金）；\n
b、好友成功支付旅行订单，并完成出行；\n
c、好友成功购买会员；\n
d、好友完成其他消费。\n
\n
4、以下几种情况不能绑定关系：\n
a、只下载，但未完成手机号注册的用户；\n
b、有下级的注册用户；\n
c、有上级的注册用户；\n
\n
5、奖励将在好友支付成功后24小时内到账，可在【我的—钱包】查看。\n
\n
6、您获得的现金奖励可以在【我的—钱包—提现】中完成提现。\n
\n 
7、拥有相同设备（手机）、账号、手机号、微信号、IP、银行卡或其他同理将视为同一用户（适用于您与您的好友）。\n
 \n
8、如发现恶意刷取或违反违规行为，滴房车有权取消其邀请奖励、追回相关奖励或封停账号，情节严重者将追究其法律责任。\n
 \n
9、如有任何疑问请拨打客服电话：4000-369-369"
android:textColor="#ff666666"
android:textSize="@dimen/sp_14" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_15"
android:layout_marginBottom="@dimen/size_20"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_ruler_logo" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="5dp"
android:gravity="center_vertical|left"
android:orientation="vertical"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="滴房车"
android:textColor="#ffffb74b"
android:textSize="@dimen/text_18"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_2"
android:text="房车.让生活更美好"
android:textColor="#ffffb74b"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>
</LinearLayout>
\ No newline at end of file
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