Skip to content

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

Merge branch 'master-video' of http://113.105.137.151:22280/lify/rvapp into dev_im 

# Conflicts:
#	RvClient/build.gradle
parents 558d86c3 358e4c5c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 243 additions and 137 deletions
RvClient/build.gradle
View file @ dc0ed428
......@@ -8,8 +8,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
flavorDimensions "default"
versionCode 145
versionName "1.4.5"
versionCode 152
versionName "1.5.2"
multiDexEnabled true
......
RvClient/src/main/java/com/xxfc/rv/RvClientApplication.java
View file @ dc0ed428
......@@ -50,7 +50,7 @@ import me.jessyan.autosize.onAdaptListener;
public class RvClientApplication extends FrameApp {
final public static String token = "eyJhbGciOiJSUzI1NiJ9.eyJzdWIiOiIxMzc2NjY2NjY2NiIsInVzZXJJZCI6IjE1IiwicmVxdWVzdFR5cGUiOiJBUFAiLCJleHAiOjE1NTk4MDU4Mjd9.NAzU25an3hqrbQI2dsroONtckMmQZRUikqBXxThGRQb578Adq7lQKM-jPw2ViCuXUcGuNRPG47d1hCzyRZH_-8nkG2ls7F0zRMATbcWIL0fozLKS4puMYT_I359JIdp_a6onEmfX0RMunupp0tbRlrbdaVLIIXIvA4nU8b_b4Rc";
//ARouter 调试开关
private boolean isDedugARouter = true;
private boolean isDedugARouter = false;
@Override
public void onCreate() {
......
module_home/src/main/java/com/rv/home/rv/module/ui/login/RegisteredActivity.java
View file @ dc0ed428
......@@ -4,9 +4,13 @@ import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.text.Editable;
import android.text.SpannableStringBuilder;
import android.text.TextPaint;
import android.text.TextUtils;
import android.text.method.HideReturnsTransformationMethod;
import android.text.method.LinkMovementMethod;
import android.text.method.PasswordTransformationMethod;
import android.text.style.ClickableSpan;
import android.view.View;
import android.widget.CheckBox;
import android.widget.EditText;
......@@ -17,17 +21,16 @@ import com.alibaba.android.arouter.launcher.ARouter;
import com.frame.base.url.Constance;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
import com.ruiwenliu.wrapper.bean.BeanUserInfo;
import com.ruiwenliu.wrapper.util.RxJavaManager;
import com.ruiwenliu.wrapper.util.listener.TextChangedListener;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.component.utils.AppCookie;
import com.rv.component.utils.Cookie;
import com.rv.home.R;
import com.rv.home.R2;
import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.basic.BaseLoginActivity;
import com.ruiwenliu.wrapper.bean.BeanUserInfo;
import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.login.bean.RegisteredBean;
import com.rv.home.rv.module.ui.login.bean.SendCodeBean;
import com.umeng.socialize.bean.SHARE_MEDIA;
......@@ -36,6 +39,7 @@ import java.util.LinkedHashMap;
import java.util.Map;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import io.reactivex.Observer;
import io.reactivex.disposables.Disposable;
......@@ -102,6 +106,61 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
editListener(etPhoneCode);
editListener(etPwd);
editListener(etAgainPwd);
initData();
}
private void initData() {
String str = "注册即表示同意滴房车《用户协议》和《隐私政策》";
SpannableStringBuilder ssb = new SpannableStringBuilder();
ssb.append(str);
final int start = str.indexOf("《");//第一个出现的位置
ssb.setSpan(new ClickableSpan() {
@Override
public void onClick(View widget) {
ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)
.withString("title", "用户协议")
.withString("url", ApiConfig.HTTP_URL_CAR_TYPE_NOTICE)
.withInt("type", 15)
.navigation();
}
@Override
public void updateDrawState(TextPaint ds) {
super.updateDrawState(ds);
ds.setColor(getResources().getColor(R.color.gray_FFB74B)); //设置文件颜色
// 去掉下划线
ds.setUnderlineText(false);
}
}, start, start + 6, 0);
final int end = str.lastIndexOf("《");//最后一个出现的位置
ssb.setSpan(new ClickableSpan() {
@Override
public void onClick(View widget) {
ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)
.withString("title", "隐私政策")
.withString("url", ApiConfig.HTTP_URL_CAR_TYPE_NOTICE)
.withInt("type", 19)
.navigation();
}
@Override
public void updateDrawState(TextPaint ds) {
super.updateDrawState(ds);
ds.setColor(getResources().getColor(R.color.gray_FFB74B)); //设置文件颜色
// 去掉下划线
ds.setUnderlineText(false);
}
}, end, end + 6, 0);
tvAgreement.setMovementMethod(LinkMovementMethod.getInstance());
tvAgreement.setText(ssb, TextView.BufferType.SPANNABLE);
}
@Override
......@@ -154,13 +213,15 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
confirmShow = !confirmShow;
ivClearAgainPwd.setSelected(confirmShow);
etAgainPwd.setTransformationMethod(confirmShow ? HideReturnsTransformationMethod.getInstance() : PasswordTransformationMethod.getInstance());
} else if (view.getId() == R.id.tv_agreement) {
ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)
.withString("title", "用户协议")
.withString("url", ApiConfig.HTTP_URL_CAR_TYPE_NOTICE)
.withInt("type", 15)
.navigation();
} else if (view.getId() == R.id.tv_registered) {
}
// else if (view.getId() == R.id.tv_agreement) {
// ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)
// .withString("title", "用户协议")
// .withString("url", ApiConfig.HTTP_URL_CAR_TYPE_NOTICE)
// .withInt("type", 15)
// .navigation();
// }
else if (view.getId() == R.id.tv_registered) {
if (getPwd().length() < 8) {
showToast(mActivity.getString(R.string.rv_pwd_length));
return;
......@@ -376,4 +437,11 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
public void onComplete(SHARE_MEDIA share_media, int i, Map<String, String> map) {
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
}
module_home/src/main/res/values/strings.xml
View file @ dc0ed428
......@@ -20,7 +20,7 @@
<string name="rv_pwd_hint">请输入密码</string>
<string name="rv_pwd_again_hint">请再次输入密码</string>
<string name="rv_registered">注册</string>
<string name="rv_registered_annotations">注册即表示同意欣新房车</string>
<string name="rv_registered_annotations">注册即表示同意滴房车</string>
<string name="rv_registered_agreement">《用户协议》</string>
<string name="rv_phone_registered">手机注册</string>
<string name="rv_phone_bind">绑定手机</string>
......
module_tourism/src/main/res/layout/activity_travel_details.xml
View file @ dc0ed428
......@@ -73,53 +73,50 @@
<include layout="@layout/common_line" />
<FrameLayout
<WebView
android:id="@+id/webView"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="0dp"
android:layout_weight="1" />
<WebView
android:id="@+id/webView"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<LinearLayout
android:id="@+id/ll_item_bottom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:orientation="vertical">
<include layout="@layout/common_line" />
<LinearLayout
android:id="@+id/ll_item_bottom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:orientation="vertical">
<include layout="@layout/common_line" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_50"
android:orientation="horizontal">
<TextView
android:background="@color/white"
android:id="@+id/tv_customer_service"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="联系客服"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" />
<TextView
android:id="@+id/tv_appointment"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@color/gray_FFB74B"
android:gravity="center"
android:text="立即预订"
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_14" />
</LinearLayout>
android:layout_height="@dimen/size_50"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_customer_service"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@color/white"
android:gravity="center"
android:text="联系客服"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" />
<TextView
android:id="@+id/tv_appointment"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@color/gray_FFB74B"
android:gravity="center"
android:text="立即预订"
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_14" />
</LinearLayout>
</FrameLayout>
</LinearLayout>
</LinearLayout>
plugin_poster/src/main/java/com/rv/poster/plugin/CarPosterActivity.java
View file @ dc0ed428
......@@ -14,11 +14,11 @@ import android.support.v7.widget.CardView;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
import android.widget.ScrollView;
import android.widget.TextView;
import com.alibaba.android.arouter.facade.annotation.Autowired;
import com.alibaba.android.arouter.facade.annotation.Route;
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;
......@@ -79,6 +79,8 @@ public class CarPosterActivity extends BaseStatusActivity<CommonPresenter> {
@Autowired()
String imageUrl;
@BindView(R2.id.scrollView)
ScrollView scrollView;
private ShareManager shareManager;
......@@ -141,17 +143,17 @@ public class CarPosterActivity extends BaseStatusActivity<CommonPresenter> {
private void preShare(int type, int requestCode) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
if (type == 0) {
saveBill(llBillContent);
saveBill(scrollView);
} else {
share(llBillContent);
share(scrollView);
}
} else {
if (ContextCompat.checkSelfPermission(this,
Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
if (type == 0) {
saveBill(llBillContent);
saveBill(scrollView);
} else {
share(llBillContent);
share(scrollView);
}
} else {//申请权限
ActivityCompat.requestPermissions(this,
......@@ -167,14 +169,14 @@ public class CarPosterActivity extends BaseStatusActivity<CommonPresenter> {
switch (requestCode) {
case 1001:
if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
saveBill(llBillContent);
saveBill(scrollView);
} else {
showToast("授权失败,无法分享海报");
}
break;
case 1002:
if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
share(llBillContent);
share(scrollView);
} else {
showToast("授权失败,无法分享海报");
}
......@@ -268,9 +270,9 @@ public class CarPosterActivity extends BaseStatusActivity<CommonPresenter> {
* 保存海报
* @param view
*/
public void saveBill(View view) {
public void saveBill(ScrollView view) {
if (view != null) {
Bitmap bitmap = ShareUtils.viewConversionBitmap(view);
Bitmap bitmap = ShareUtils.getBitmapByView(view);
File file = null;
if (bitmap != null) {
file = ShareUtils.saveBitmapFile(mActivity, bitmap);
......
plugin_poster/src/main/java/com/rv/poster/plugin/PosterActivity.java
View file @ dc0ed428
......@@ -5,7 +5,6 @@ import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
......@@ -15,6 +14,7 @@ import android.support.v7.widget.CardView;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
import android.widget.ScrollView;
import android.widget.TextView;
import com.alibaba.android.arouter.facade.annotation.Autowired;
......@@ -26,7 +26,6 @@ import com.frame.base.url.Constance;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
import com.ruiwenliu.wrapper.bean.BeanUserInfo;
import com.ruiwenliu.wrapper.bean.UserInfoBean;
import com.ruiwenliu.wrapper.util.TransformationUtil;
import com.ruiwenliu.wrapper.util.glide.GlideManager;
......@@ -48,6 +47,7 @@ import com.umeng.socialize.utils.ShareBoardlistener;
import java.io.File;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
/**
......@@ -73,6 +73,8 @@ public class PosterActivity extends BaseStatusActivity<CommonPresenter> {
@Autowired()
String imageUrl;
@BindView(R2.id.scrollView)
ScrollView scrollView;
private ShareManager shareManager;
......@@ -148,17 +150,17 @@ public class PosterActivity extends BaseStatusActivity<CommonPresenter> {
private void preShare(int type, int requestCode) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
if (type == 0) {
saveBill(llBillContent);
saveBill(scrollView);
} else {
share(llBillContent);
share(scrollView);
}
} else {
if (ContextCompat.checkSelfPermission(this,
Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
if (type == 0) {
saveBill(llBillContent);
saveBill(scrollView);
} else {
share(llBillContent);
share(scrollView);
}
} else {//申请权限
ActivityCompat.requestPermissions(this,
......@@ -174,14 +176,14 @@ public class PosterActivity extends BaseStatusActivity<CommonPresenter> {
switch (requestCode) {
case 1001:
if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
saveBill(llBillContent);
saveBill(scrollView);
} else {
showToast("授权失败,无法分享海报");
}
break;
case 1002:
if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
share(llBillContent);
share(scrollView);
} else {
showToast("授权失败,无法分享海报");
}
......@@ -276,9 +278,9 @@ public class PosterActivity extends BaseStatusActivity<CommonPresenter> {
* 保存海报
* @param view
*/
public void saveBill(View view) {
public void saveBill(ScrollView view) {
if (view != null) {
Bitmap bitmap = ShareUtils.viewConversionBitmap(view);
Bitmap bitmap = ShareUtils.getBitmapByView(view);
File file = null;
if (bitmap != null) {
file = ShareUtils.saveBitmapFile(mActivity, bitmap);
......@@ -288,4 +290,11 @@ public class PosterActivity extends BaseStatusActivity<CommonPresenter> {
}
}
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
}
plugin_poster/src/main/res/layout/activity_carposter.xml
View file @ dc0ed428
......@@ -24,6 +24,7 @@
app:cardCornerRadius="5dp">
<ScrollView
android:id="@+id/scrollView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_5"
......
plugin_poster/src/main/res/layout/activity_poster.xml
View file @ dc0ed428
......@@ -24,6 +24,7 @@
app:cardCornerRadius="5dp">
<ScrollView
android:id="@+id/scrollView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_5"
......@@ -68,9 +69,9 @@
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="false"
android:maxLines="2"
android:ellipsize="end"
android:maxLines="2"
android:singleLine="false"
android:text=""
android:textColor="@color/textGray"
android:textSize="@dimen/text_15" />
......
plugin_share/src/main/res/layout/activity_reative_bill.xml
View file @ dc0ed428
......@@ -83,9 +83,11 @@
android:id="@+id/tv_phone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:singleLine="false"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_18" />
android:textColor="@color/textGray"
android:textSize="@dimen/text_15" />
<TextView
android:layout_width="wrap_content"
......
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