Skip to content

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

bug修复

parent 658175ad
Expand all Show whitespace changes
Inline Side-by-side
Showing with 306 additions and 179 deletions
MyFrame/src/main/java/com/frame/base/url/Constance.java
View file @ c5b840af
......@@ -27,4 +27,6 @@ public final class Constance {
public static final String ACTIVITY_URL_CARDETAILMAP ="/main/home/CarDetailMapActivity";
public static final String ACTIVITY_URL_CALENDAR ="/plugin/calendar/CalendarActivity";
public static final String ACTIVITY_URL_SHAREIMAGE="/main/home/ShareImageActivity";
}
RvClient/build.gradle
View file @ c5b840af
......@@ -7,8 +7,8 @@ android {
applicationId "com.xxfc.rv"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 107
versionName "1.0.7"
versionCode 109
versionName "1.0.9"
multiDexEnabled true
//新版Gradle 是 implementation 为了兼容compile,写上这句话
......
RvClient/src/main/java/com/xxfc/rv/MainActivity.java
View file @ c5b840af
......@@ -226,7 +226,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> {
Map<String, Object> headMap = new LinkedHashMap<>();
String versionName = updateAppUtils.getAppVersionName(this);
if (!TextUtils.isEmpty(versionName)) {
mPresenter.getData(0, String.format(ApiConfig.HTTP_URL_VERSION_CHECK, versionName), VersionCheckBean.class, headMap, true);
mPresenter.getData(0, String.format(ApiConfig.HTTP_URL_VERSION_CHECK, versionName), VersionCheckBean.class, headMap, false);
}
}
......
component_control/src/main/java/com/rv/component/control/ProgressWebView.java 0 → 100644
View file @ c5b840af
package com.rv.component.control;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.webkit.WebView;
import android.widget.LinearLayout;
import android.widget.ProgressBar;
public class ProgressWebView extends WebView {
private ProgressBar mProgressBar;
public ProgressWebView(Context context, AttributeSet attrs) {
super(context, attrs);
mProgressBar = new ProgressBar(context, null,
android.R.attr.progressBarStyleHorizontal);
LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
LinearLayout.LayoutParams.MATCH_PARENT, 8);
mProgressBar.setLayoutParams(layoutParams);
Drawable drawable = context.getResources().getDrawable(
R.drawable.shape_rv_bg_yellow_progress_hint);
mProgressBar.setProgressDrawable(drawable);
addView(mProgressBar);
setWebChromeClient(new WebChromeClient());
}
public class WebChromeClient extends android.webkit.WebChromeClient {
@Override
public void onProgressChanged(WebView view, int newProgress) {
if (newProgress == 100) {
mProgressBar.setVisibility(GONE);
} else {
if (mProgressBar.getVisibility() == GONE)
mProgressBar.setVisibility(VISIBLE);
mProgressBar.setProgress(newProgress);
}
super.onProgressChanged(view, newProgress);
}
}
@Override
protected void onScrollChanged(int l, int t, int oldl, int oldt) {
LayoutParams lp = (LayoutParams) mProgressBar.getLayoutParams();
lp.x = l;
lp.y = t;
mProgressBar.setLayoutParams(lp);
super.onScrollChanged(l, t, oldl, oldt);
}
}
component_control/src/main/res/drawable/shape_rv_bg_yellow_progress_hint.xml 0 → 100644
View file @ c5b840af
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@android:id/background">
<color android:color="#ffffff"/>
</item>
<item android:id="@android:id/progress">
<clip>
<shape>
<gradient
android:centerColor="#aaf3dd23"
android:endColor="#f3dd23"
android:startColor="#99f3dd23"/>
</shape>
</clip>
</item>
</layer-list>
\ No newline at end of file
component_utils/src/main/java/com/rv/component/utils/ObservableScrollView.java
View file @ c5b840af
......@@ -8,8 +8,7 @@ public class ObservableScrollView extends ScrollView {
public interface ScrollViewListener {
void onScrollChanged(ObservableScrollView scrollView, int x, int y,
int oldx, int oldy);
void onScrollChanged(ObservableScrollView scrollView, int x, int y, int oldx, int oldy);
}
......@@ -19,8 +18,7 @@ public class ObservableScrollView extends ScrollView {
super(context);
}
public ObservableScrollView(Context context, AttributeSet attrs,
int defStyle) {
public ObservableScrollView(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
}
......
module_camp/src/main/java/com/rv/camp/CampFragment.java
View file @ c5b840af
......@@ -182,7 +182,7 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
if (type != null) {
map.put("type", type);
}
mPresenter.getData(RvFrameConfig.VEHICLE_CAMPLIST, 0, CampApi.TRAVEL_CAMPSITESHOP, CampListBean.class, map, page == 1 ? true : false);
mPresenter.getData(RvFrameConfig.VEHICLE_CAMPLIST, 0, CampApi.TRAVEL_CAMPSITESHOP, CampListBean.class, map, page == 1 ? false : false);
}
private void getCampTypeList() {
......
module_home/src/main/java/com/rv/home/rv/module/ui/login/BingPhoneActivity.java
View file @ c5b840af
......@@ -41,7 +41,6 @@ import io.reactivex.functions.Consumer;
*/
public class BingPhoneActivity extends BaseLoginActivity<CommonPresenter> {
@BindView(R2.id.et_phone)
EditText etPhone;
@BindView(R2.id.iv_clear_phone)
......
module_home/src/main/java/com/rv/home/rv/module/ui/login/ConfirmPwdActivity.java
View file @ c5b840af
......@@ -169,40 +169,6 @@ public class ConfirmPwdActivity extends BaseLoginActivity<CommonPresenter> {
}
otherLoginBind(mPhone, mCode, getPwd(), mName, mHeadImg, mOpenid, 2, mIsQQ,mUnionid);
}
// switch (view.getId()) {
// case R.id.iv_clear_pwd:
// pwdShow=!pwdShow;
// ivClearPwd.setSelected(pwdShow);
// etPwd.setTransformationMethod(pwdShow? HideReturnsTransformationMethod.getInstance(): PasswordTransformationMethod.getInstance());
//// clearEditData(etPwd);
// break;
// case R.id.iv_clear_again_pwd:
// confirmShow=!confirmShow;
// ivClearAgainPwd.setSelected(confirmShow);
// etAgainPwd.setTransformationMethod(confirmShow? HideReturnsTransformationMethod.getInstance(): PasswordTransformationMethod.getInstance());
//// clearEditData(etAgainPwd);
// break;
// case R.id.tv_agreement:
// break;
// case R.id.tv_registered:
// if (getPwd().length() < 8) {
// showToast(mActivity.getString(R.string.rv_pwd_length));
// return;
// }
// if (!getPwd().equals(getAgainPwd())) {
// showToast(mActivity.getString(R.string.rv_pwd_same));
// return;
// }
// if (cbAnnotations.isChecked() == false) {
// showToast(mActivity.getString(R.string.rv_confirm_agreement));
// return;
// }
// otherLoginBind(mPhone, mCode, getPwd(), mName, mHeadImg, mOpenid, 2, mIsQQ,mUnionid);
//
// break;
// }
}
/**
......
module_home/src/main/java/com/rv/home/rv/module/ui/login/LoginRvActivity.java
View file @ c5b840af
......@@ -109,7 +109,6 @@ public class LoginRvActivity extends BaseLoginActivity<CommonPresenter> {
switch (requestType) {
case 0:
showToast(mActivity.getString(R.string.rv_phone_code_toast));
sendCode(60);
break;
case 1:
case 2:
......@@ -129,8 +128,7 @@ public class LoginRvActivity extends BaseLoginActivity<CommonPresenter> {
showToast(mActivity.getString(R.string.rv_phone_hint));
return;
}
sendCode();
sendCode(60);
} else if (view.getId() == R.id.tv_login) {
codeLogin();
......@@ -268,6 +266,7 @@ public class LoginRvActivity extends BaseLoginActivity<CommonPresenter> {
@Override
public void accept(Disposable disposable) throws Exception {
tvGetCode.setEnabled(false);
sendCode();
}
}, new Observer<Long>() {
@Override
......
module_home/src/main/java/com/rv/home/rv/module/ui/login/RegisteredActivity.java
View file @ c5b840af
......@@ -103,7 +103,6 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
switch (requestType) {
case 0:
showToast(mActivity.getString(R.string.rv_phone_code_toast));
sendCode(60);
break;
case 1:
processLoginData((RegisteredBean) result);
......@@ -125,7 +124,7 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
showToast(mActivity.getString(R.string.rv_phone_hint));
return;
}
sendCode();
sendCode(60);
} else if (view.getId() == R.id.iv_clear_code) {
pwdShow = !pwdShow;
ivClearPwd.setSelected(pwdShow);
......@@ -317,6 +316,7 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
@Override
public void accept(Disposable disposable) throws Exception {
tvGetCode.setEnabled(false);
sendCode();
}
}, new Observer<Long>() {
@Override
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarDetailActivity.java
View file @ c5b840af
......@@ -13,6 +13,7 @@ import android.webkit.JavascriptInterface;
import android.webkit.WebChromeClient;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.ImageView;
import android.widget.TextView;
......@@ -24,14 +25,14 @@ import com.frame.base.url.Constance;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.bean.BeanUserInfo;
import com.ruiwenliu.wrapper.util.um.CustomShareListener;
import com.ruiwenliu.wrapper.util.um.ShareManager;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.component.control.ProgressWebView;
import com.rv.home.R;
import com.rv.home.R2;
import com.rv.home.rv.module.ApiConfig;
import com.ruiwenliu.wrapper.bean.BeanUserInfo;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.login.LoginRvActivity;
import com.rv.home.rv.module.ui.main.home.bean.CarTypeListBean;
......@@ -43,6 +44,7 @@ import com.umeng.socialize.utils.ShareBoardlistener;
import com.yuyife.okgo.OkGoUtil;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import io.reactivex.schedulers.Schedulers;
......@@ -55,13 +57,14 @@ import static com.ruiwenliu.wrapper.weight.webview.SafeWebView.hasKitkat;
*/
public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
@BindView(R2.id.webView)
WebView mWebView;
ProgressWebView mWebView;
@BindView(R2.id.tv_center)
TextView tvTitleCenter;
@BindView(R2.id.iv_collect)
ImageView ivCollect;
@BindView(R2.id.iv_share)
ImageView ivShare;
private OrderDataBean dataBean;
private CarTypeListBean.DataBeanX.DataBean mCarBean;
private ShareManager shareManager;
......@@ -74,7 +77,9 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
.putExtra("carBean", carBean)
.putExtra("startTime", startTime)
.putExtra("endTime", endTime);
};
}
;
public static Intent getIntent(Context context, int type) {
return new Intent(context, CarDetailActivity.class)
......@@ -96,7 +101,7 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
webUrl = ApiConfig.HTTP_URL_CAR_TYPE_DETAIL + "?id=" + mCarBean.getVehicleModel().getId() + "&companyId=" + mCarBean.getCompany().getId();
initWeb();
initRxbus();
initShare(webUrl +"&shareType=app", mCarBean.getVehicleModel().getName(), mCarBean.getCompany().getAddrDetail(), mCarBean.getVehicleModel().getIcon());
initShare(webUrl + "&shareType=app", mCarBean.getVehicleModel().getName(), mCarBean.getCompany().getAddrDetail(), mCarBean.getVehicleModel().getIcon());
}
private void initRxbus() {
......@@ -184,24 +189,24 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
@OnClick({R2.id.iv_back, R2.id.iv_collect, R2.id.iv_share, R2.id.tv_appointment})
public void onViewClicked(View view) {
if(view.getId()==R.id.iv_back){
if (view.getId() == R.id.iv_back) {
finish();
}else if(view.getId()==R.id.iv_collect){
} else if (view.getId() == R.id.iv_collect) {
//添加收藏
addCollection();
} else if(view.getId()==R.id.iv_share){
} else if (view.getId() == R.id.iv_share) {
if (shareManager != null) {
shareManager.open();
}
} else if(view.getId()==R.id.tv_appointment){
if (TextUtils.isEmpty( OkGoUtil.getToken())) {
} else if (view.getId() == R.id.tv_appointment) {
if (TextUtils.isEmpty(OkGoUtil.getToken())) {
RvFrameConfig.RvFrameInfo.TYPE_LOGIN = 1;
startActivity(LoginRvActivity.getIntent(mActivity));
return;
}
BeanUserInfo.UserInfo userInfo = getUserInfo();
if (userInfo !=null){
if (userInfo.getCertificationStatus() ==0){
if (userInfo != null) {
if (userInfo.getCertificationStatus() == 0) {
ARouter.getInstance().build(Constance.ACTIVITY_URL_IDCARDCERTIFICATION).navigation();
return;
}
......@@ -254,16 +259,22 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
// 如果此设置是允许，则 setAllowFileAccessFromFileURLs 不起做用
webSettings.setAllowUniversalAccessFromFileURLs(true);
mWebView.addJavascriptInterface(new AndroidJs(), "AndroidJs");
mWebView.loadUrl(webUrl);
mWebView.setWebChromeClient(new WebChromeClient() {
mWebView.setWebViewClient(new WebViewClient(){
@Override
public void onProgressChanged(WebView view, int newProgress) {
super.onProgressChanged(view, newProgress);
if (newProgress == 100) {
onHideLoading();
}
public boolean shouldOverrideUrlLoading(WebView view, String url) {
return false;
}
});
mWebView.loadUrl(webUrl);
// mWebView.setWebChromeClient(new WebChromeClient() {
// @Override
// public void onProgressChanged(WebView view, int newProgress) {
// super.onProgressChanged(view, newProgress);
// if (newProgress == 100) {
// onHideLoading();
// }
// }
// });
}
......@@ -277,7 +288,13 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
public void onclick(SnsPlatform snsPlatform, SHARE_MEDIA share_media) {
if (snsPlatform.mShowWord.equals("生成海报")) {
startActivity(ShareImageActivity.getIntent(mActivity, mCarBean));
ARouter.getInstance()
.build(Constance.ACTIVITY_URL_SHAREIMAGE)
.withString("icon", mCarBean.getVehicleModel().getIcon())
.withString("name", mCarBean.getVehicleModel().getName())
.withString("keyword", mCarBean.getVehicleModel().getKeyword())
.withDouble("price", mCarBean.getVehicleModel().getPrice()).navigation();
} else if (snsPlatform.mShowWord.equals("复制链接")) {
copyText();
}
......@@ -317,6 +334,13 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
}, "rv_um_share_bill", "rv_um_share_copy");
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
/**
* 与h5交互
*/
......@@ -329,11 +353,11 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
if (mCarBean != null) {
ARouter.getInstance()
.build(Constance.ACTIVITY_URL_CARDETAILMAP)
.withString("addrDetail",mCarBean.getCompany().getAddrDetail())
.withString("phone",mCarBean.getCompany().getPhone())
.withString("name",mCarBean.getCompany().getName())
.withDouble("latitude",mCarBean.getCompany().getLatitude())
.withDouble("longitude",mCarBean.getCompany().getLongitude())
.withString("addrDetail", mCarBean.getCompany().getAddrDetail())
.withString("phone", mCarBean.getCompany().getPhone())
.withString("name", mCarBean.getCompany().getName())
.withDouble("latitude", mCarBean.getCompany().getLatitude())
.withDouble("longitude", mCarBean.getCompany().getLongitude())
.navigation();
}
......@@ -349,6 +373,7 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
}
ClipData myClip = ClipData.newPlainText("text", webUrl);
myClipboard.setPrimaryClip(myClip);
showToast("复制成功！");
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarRentalActivity.java
View file @ c5b840af
......@@ -306,7 +306,7 @@ public class CarRentalActivity extends BaseStatusActivity<CommonPresenter> {
// if (getSwitchType == 0) {
// startActivityForResult(SelectShopActivity.getIntent(mActivity, 1,"",getCity.equals(nowCity) && mLatLng!=null?mLatLng.latitude:0,getCity.equals(nowCity)&& mLatLng!=null?mLatLng.longitude:0), TYPE_REQUEST_SHOP);
// } else {
startActivityForResult(SelectLocationActivity.getIntent(mActivity, 1, getCity, latLatitude, lonLongitude, nowCity,0), TYPE_REQUEST_ADDRESS);
// startActivityForResult(SelectLocationActivity.getIntent(mActivity, 1, getCity, latLatitude, lonLongitude, nowCity,0), TYPE_REQUEST_ADDRESS);
// }
}else if(v.getId()==R.id.tv_out_address){
......@@ -314,7 +314,7 @@ public class CarRentalActivity extends BaseStatusActivity<CommonPresenter> {
// if (outSwitchType == 0) {
// startActivityForResult(SelectShopActivity.getIntent(mActivity, 2,"",outCity.equals(nowCity)&& mLatLng!=null?mLatLng.latitude:0,outCity.equals(nowCity)&& mLatLng!=null?mLatLng.longitude:0), TYPE_REQUEST_SHOP);
// } else {
startActivityForResult(SelectLocationActivity.getIntent(mActivity, 2, outCity, outLatitude, outLongitude, nowCity,0), TYPE_REQUEST_ADDRESS);
// startActivityForResult(SelectLocationActivity.getIntent(mActivity, 2, outCity, outLatitude, outLongitude, nowCity,0), TYPE_REQUEST_ADDRESS);
// }
}else if(v.getId()==R.id.tv_get_time){
if (mapGetTime == null) {
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarRentalListActivity.java
View file @ c5b840af
......@@ -199,11 +199,11 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
} else if (id == R.id.ll_item_get_address) {
//取车地址
startActivityForResult(SelectLocationActivity.getIntent(mActivity, 1, dataBean.getStartCityName(), mLat, mLon, "", 1), 110);
startActivityForResult(SelectLocationActivity.getIntent(mActivity, 1, dataBean.getStartCityName(), dataBean.getStartCity(),mLat, mLon, "", 1), 110);
} else if (id == R.id.ll_item_out_address) {
//还车地址
startActivityForResult(SelectLocationActivity.getIntent(mActivity, 2, dataBean.getStartCityName(), outLatitude, outLongitude, "", 1), 110);
startActivityForResult(SelectLocationActivity.getIntent(mActivity, 2, dataBean.getStartCityName(),dataBean.getEndCity(), outLatitude, outLongitude, "", 1), 110);
} else if (id == R.id.ll_item_filter) {
if (attributeListBean == null) {
return;
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/ConfirmOrderActivity.java
View file @ c5b840af
......@@ -208,7 +208,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
.subscribe(new Observer<LoginUserInfoEvent>(disposable) {
@Override
public void onNext(LoginUserInfoEvent event) {
tvPrice.setText(String.format("%1$s%2$s", mCarBean.getVehicleModel().getSum(), mActivity.getString(R.string.rv_day)));
tvPrice.setText(String.format("¥%1$s%2$s", mCarBean.getVehicleModel().getSum(), mActivity.getString(R.string.rv_day)));
if (info != null) {
if (0 == info.getIsMember()) {
tvLayoutMemberHint.setVisibility(View.GONE);
......@@ -309,12 +309,14 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
rbUserDriving.setChecked(false);
llAddDriving.setVisibility(View.GONE);
rbXinDriving.setChecked(true);
dataBean.setMyDriverIds("1");
dataBean.setDriverType(1);
getPayMoney();
} else if (id == R.id.rb_user_driving || id == R.id.tv_user_driving_hint) {
drivingType = 2;
rbXinDriving.setChecked(false);
rbUserDriving.setChecked(true);
dataBean.setDriverType(2);
if (drivingListBean != null) {
llAddDriving.setVisibility(View.VISIBLE);
}
......@@ -464,7 +466,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
tvName.setText(mCarBean.getVehicleModel().getName());
tvContent.setText(mCarBean.getVehicleModel().getKeyword());
ratingBar.setStarMark((float) mCarBean.getVehicleModel().getScore() / 10);
tvPrice.setText(String.format("%1$s%2$s", mCarBean.getVehicleModel().getSum(), mActivity.getString(R.string.rv_day)));
tvPrice.setText(String.format("¥%1$s%2$s", mCarBean.getVehicleModel().getSum(), mActivity.getString(R.string.rv_day)));
tvEventDate.setText(getIntent().getStringExtra("startTime") + "~" + getIntent().getStringExtra("endTime"));
tvActivityDay.setText(String.format("%1$s%2$s", dataBean.getDayNum(), mActivity.getString(R.string.rv_days)));
tvGetCarAddress.setText(dataBean.getStartAddr());
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/HomeFragment.java
View file @ c5b840af
......@@ -497,7 +497,7 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
private void setRecommendGood(HomeHotGoodListBean data) {
mAdapter.getData().clear();
mAdapter.addData(data.getData());
mAdapter.setNewData(data.getData());
}
private void setHotData(HomePopularBrigade data) {
......@@ -573,13 +573,13 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
// if (getSwitchType == 0) {
// startActivityForResult(SelectShopActivity.getIntent(mActivity, 1,"",getCity.equals(nowCity) && mLatLng!=null?mLatLng.latitude:0,getCity.equals(nowCity)&& mLatLng!=null?mLatLng.longitude:0), TYPE_REQUEST_SHOP);
// } else {
startActivityForResult(SelectLocationActivity.getIntent(getContext(), 1, getCity, latLatitude, lonLongitude, nowCity,0), TYPE_REQUEST_ADDRESS);
startActivityForResult(SelectLocationActivity.getIntent(getContext(), 1, getCity,0, latLatitude, lonLongitude, nowCity,0), TYPE_REQUEST_ADDRESS);
} else if (id == R.id.tv_out_address) {
String outCity = headTvOutCity.getText().toString().trim();
// if (outSwitchType == 0) {
// startActivityForResult(SelectShopActivity.getIntent(mActivity, 2,"",outCity.equals(nowCity)&& mLatLng!=null?mLatLng.latitude:0,outCity.equals(nowCity)&& mLatLng!=null?mLatLng.longitude:0), TYPE_REQUEST_SHOP);
// } else {
startActivityForResult(SelectLocationActivity.getIntent(getContext(), 2, outCity, outLatitude, outLongitude, nowCity,0), TYPE_REQUEST_ADDRESS);
startActivityForResult(SelectLocationActivity.getIntent(getContext(), 2, outCity,0, outLatitude, outLongitude, nowCity,0), TYPE_REQUEST_ADDRESS);
} else if (id == R.id.ll_item_select_data) {
//选择日期
ARouter.getInstance()
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/HomePageFragment.java
View file @ c5b840af
......@@ -321,7 +321,7 @@ public class HomePageFragment extends BaseFragment<CommonPresenter> {
// if (getSwitchType == 0) {
// startActivityForResult(SelectShopActivity.getIntent(mActivity, 1,"",getCity.equals(nowCity) && mLatLng!=null?mLatLng.latitude:0,getCity.equals(nowCity)&& mLatLng!=null?mLatLng.longitude:0), TYPE_REQUEST_SHOP);
// } else {
startActivityForResult(SelectLocationActivity.getIntent(getContext(), 1, getCity, latLatitude, lonLongitude, nowCity,0), TYPE_REQUEST_ADDRESS);
// startActivityForResult(SelectLocationActivity.getIntent(getContext(), 1, getCity, latLatitude, lonLongitude, nowCity,0), TYPE_REQUEST_ADDRESS);
// }
......@@ -330,7 +330,7 @@ public class HomePageFragment extends BaseFragment<CommonPresenter> {
// if (outSwitchType == 0) {
// startActivityForResult(SelectShopActivity.getIntent(mActivity, 2,"",outCity.equals(nowCity)&& mLatLng!=null?mLatLng.latitude:0,outCity.equals(nowCity)&& mLatLng!=null?mLatLng.longitude:0), TYPE_REQUEST_SHOP);
// } else {
startActivityForResult(SelectLocationActivity.getIntent(getContext(), 2, outCity, outLatitude, outLongitude, nowCity,0), TYPE_REQUEST_ADDRESS);
// startActivityForResult(SelectLocationActivity.getIntent(getContext(), 2, outCity, outLatitude, outLongitude, nowCity,0), TYPE_REQUEST_ADDRESS);
// }
} else if (i == R.id.tv_get_time) {
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/SelectLocationActivity.java
View file @ c5b840af
......@@ -91,10 +91,11 @@ public class SelectLocationActivity extends BaseStatusActivity<CommonPresenter>
private int isShowCity;
private GeoCoder geoCoder;
public static Intent getIntent(Context context, int type, String city, double latitude, double longitude, String now_city, int isShowCity) {
public static Intent getIntent(Context context, int type, String city,int cityId, double latitude, double longitude, String now_city, int isShowCity) {
return new Intent(context, SelectLocationActivity.class)
.putExtra("type", type)
.putExtra("city", city)
.putExtra("cityId",cityId)
.putExtra("latitude", latitude)
.putExtra("longitude", longitude)
.putExtra("now_city", now_city)
......@@ -108,6 +109,7 @@ public class SelectLocationActivity extends BaseStatusActivity<CommonPresenter>
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
mCityId = intent.getIntExtra("cityId",0);
selectCity = intent.getStringExtra("city");
locationType = intent.getIntExtra("type", 1);
latLatitude = intent.getDoubleExtra("latitude", 0);
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/ShareImageActivity.java
View file @ c5b840af
......@@ -12,6 +12,9 @@ import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
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.swipe.SwipeBackActivity;
import com.ruiwenliu.wrapper.util.glide.GlideManager;
......@@ -30,6 +33,7 @@ import com.umeng.socialize.utils.ShareBoardlistener;
import butterknife.BindView;
import butterknife.OnClick;
@Route(path = Constance.ACTIVITY_URL_SHAREIMAGE)
public class ShareImageActivity extends SwipeBackActivity<CommonPresenter> {
@BindView(R2.id.iv_goods)
......@@ -45,12 +49,15 @@ public class ShareImageActivity extends SwipeBackActivity<CommonPresenter> {
@BindView(R2.id.rl_body)
RelativeLayout rlBody;
private ShareManager shareManager;
private CarTypeListBean.DataBeanX.DataBean mCarBean;
public static Intent getIntent(Context context, CarTypeListBean.DataBeanX.DataBean carBean) {
return new Intent(context, ShareImageActivity.class)
.putExtra("carBean", carBean);
};
@Autowired()
String icon;
@Autowired()
String name;
@Autowired()
String keyword;
@Autowired()
double price;
@Override
protected void loadData(Bundle savedInstanceState, Intent intent) {
......@@ -65,11 +72,10 @@ public class ShareImageActivity extends SwipeBackActivity<CommonPresenter> {
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
showTitle(false);
mCarBean = (CarTypeListBean.DataBeanX.DataBean) getIntent().getSerializableExtra("carBean");
GlideManager.getInstance(this).loadImage(mCarBean.getVehicleModel().getIcon(), ivGoods);
tvName.setText(mCarBean.getVehicleModel().getName());
tvContent.setText(mCarBean.getVehicleModel().getKeyword());
tvPrice.setText(String.format("%1$s%2$s", mCarBean.getVehicleModel().getPrice(), this.getString(R.string.rv_day)));
GlideManager.getInstance(this).loadImage(icon, ivGoods);
tvName.setText(name);
tvContent.setText(keyword);
tvPrice.setText(String.format("%1$s%2$s", price, this.getString(R.string.rv_day)));
}
@Override
......@@ -126,25 +132,26 @@ public class ShareImageActivity extends SwipeBackActivity<CommonPresenter> {
view.draw(c);
return bmp;
}
/**
* 初始化分享
*/
private void initShare(final Bitmap bitmap) {
if(shareManager==null){
shareManager=new ShareManager(this, new ShareBoardlistener() {
if (shareManager == null) {
shareManager = new ShareManager(this, new ShareBoardlistener() {
@Override
public void onclick(SnsPlatform snsPlatform, SHARE_MEDIA share_media) {
shareManager.showShareImage(share_media,bitmap ,new CustomShareListener(mActivity){
shareManager.showShareImage(share_media, bitmap, new CustomShareListener(mActivity) {
@Override
public void onResult(SHARE_MEDIA platform) {
super.onResult(platform);
if (platform.name().equals("WEIXIN_FAVORITE")) {
showToast( platform + " 收藏成功啦");
showToast(platform + " 收藏成功啦");
} else {
if (platform != SHARE_MEDIA.MORE && platform != SHARE_MEDIA.SMS
......@@ -159,7 +166,7 @@ public class ShareImageActivity extends SwipeBackActivity<CommonPresenter> {
&& platform != SHARE_MEDIA.GOOGLEPLUS
&& platform != SHARE_MEDIA.YNOTE
&& platform != SHARE_MEDIA.EVERNOTE) {
showToast( platform +"分享成功啦");
showToast(platform + "分享成功啦");
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/adapter/HotCarTypeAdapter.java
View file @ c5b840af
......@@ -31,8 +31,8 @@ public class HotCarTypeAdapter extends BaseQuickAdapter<HomeHotGoodListBean.Data
helper.setText(R.id.tv_price,"");
}
}
// @Override
// public int getItemCount() {
// return 4;
// }
@Override
public int getItemCount() {
return 4;
}
}
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/GetOnTheCarQRCodeActivity.java
View file @ c5b840af
......@@ -89,7 +89,7 @@ public class GetOnTheCarQRCodeActivity extends BaseStatusActivity<PickerPresente
}
//生成带中间图标的二维码
Bitmap success = createQRImage("33333333333333333333333", 100, 100,
Bitmap success = createQRImage(dataBean.getQrcodeStr(), 100, 100,
BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher));
ivZxing.setImageBitmap(success);
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/PickUpTheCarQRCodeActivity.java
View file @ c5b840af
......@@ -96,13 +96,13 @@ public class PickUpTheCarQRCodeActivity extends BaseStatusActivity<PickerPresent
tvGetTime.setText(TimeManager.stampToDate(String.valueOf(detail.getStart_time())));
tvOutAddress.setText(detail.getEnd_addr());
tvOutTime.setText(TimeManager.stampToDate(String.valueOf(detail.getEnd_time())));
tvPrice.setText(String.format("￥%1$s", dataBean.getOrderAmount()));
GlideManager.getInstance(mActivity).loadImage(dataBean.getPicture(), ivGoods);
tvPrice.setText(String.format("￥%1$s", dataBean.getRealAmount()));
GlideManager.getInstance(mActivity).loadImage(dataBean.getIcon(), ivGoods);
}
}
//生成带中间图标的二维码
Bitmap success =createQRImage("33333333333333333333333", 100, 100,
Bitmap success =createQRImage(dataBean.getQrcodeStr(), 100, 100,
BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher));
ivZxing.setImageBitmap(success);
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/bean/OrderListBean.java
View file @ c5b840af
......@@ -138,12 +138,21 @@ public class OrderListBean extends BaseBean {
private String updUser;
private String updName;
private String updHost;
private String qrcodeStr;
private OrderRentVehicleDetail orderRentVehicleDetail;
private OrderTourDetail orderTourDetail;
private OrderMemberDetail orderMemberDetail;
private int detailId;
private String name;
public String getQrcodeStr() {
return qrcodeStr;
}
public void setQrcodeStr(String qrcodeStr) {
this.qrcodeStr = qrcodeStr;
}
public double getRealAmount() {
return realAmount;
}
......
module_home/src/main/res/layout/fragment_home.xml
View file @ c5b840af
......@@ -6,7 +6,8 @@
android:background="@color/colorLine"
android:orientation="vertical">
<com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
<com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/refresh"
android:layout_width="match_parent"
android:layout_height="match_parent">
......@@ -18,7 +19,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:descendantFocusability="beforeDescendants"
android:focusable="true"
android:focusableInTouchMode="true"
......@@ -618,13 +619,12 @@
android:textSize="@dimen/text_10" />
</LinearLayout>
</android.support.v7.widget.CardView>
</RelativeLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/recyclerView_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_10"
android:paddingLeft="@dimen/size_10"
android:paddingRight="@dimen/size_10" />
......@@ -747,16 +747,16 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:layout_marginTop="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:layout_marginBottom="@dimen/size_15"
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginRight="@dimen/size_5"
android:layout_weight="1"
android:orientation="vertical">
<LinearLayout
......@@ -768,8 +768,8 @@
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/aa1"
android:scaleType="centerCrop" />
android:scaleType="centerCrop"
android:src="@drawable/aa1" />
<TextView
android:layout_width="wrap_content"
......@@ -835,15 +835,15 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_rv_bg_write_semicircle"
android:layout_marginTop="@dimen/size_10"
android:background="@drawable/shape_rv_bg_write_semicircle"
android:orientation="vertical">
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/aa4"
android:scaleType="centerCrop" />
android:scaleType="centerCrop"
android:src="@drawable/aa4" />
<TextView
android:layout_width="wrap_content"
......@@ -911,8 +911,8 @@
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginLeft="@dimen/size_5"
android:layout_weight="1"
android:orientation="vertical">
<LinearLayout
......@@ -924,8 +924,8 @@
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/aa33"
android:scaleType="centerCrop" />
android:scaleType="centerCrop"
android:src="@drawable/aa33" />
<TextView
android:layout_width="wrap_content"
......@@ -998,8 +998,8 @@
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/aa2"
android:scaleType="centerCrop" />
android:scaleType="centerCrop"
android:src="@drawable/aa2" />
<TextView
android:layout_width="wrap_content"
......@@ -1065,13 +1065,14 @@
</LinearLayout>
<!-- <android.support.v7.widget.RecyclerView
<android.support.v7.widget.RecyclerView
android:id="@+id/recyclerView_rv_enthusiast"
android:layout_width="match_parent"
android:visibility="gone"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:paddingLeft="@dimen/size_8"
android:paddingRight="@dimen/size_8" />-->
android:paddingRight="@dimen/size_8" />
</LinearLayout>
</LinearLayout>
......
module_home/src/main/res/layout/rv_act_car_detail.xml
View file @ c5b840af
......@@ -71,12 +71,19 @@
</RelativeLayout>
<include layout="@layout/common_line"/>
<WebView
<com.rv.component.control.ProgressWebView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:id="@+id/webView"
/>
android:id="@+id/webView">
</com.rv.component.control.ProgressWebView>
<!--<WebView-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="match_parent"-->
<!--android:layout_weight="1"-->
<!--android:id="@+id/webView"-->
<!--/>-->
<TextView
android:layout_width="match_parent"
......
module_mine/src/main/res/layout/activity_mine.xml
View file @ c5b840af
......@@ -64,7 +64,6 @@
android:id="@+id/tv_nickname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="333333"
android:textColor="@color/colorYellow"
android:textSize="@dimen/text_16"
android:visibility="gone" />
......@@ -80,7 +79,6 @@
android:paddingTop="@dimen/size_1"
android:paddingRight="@dimen/size_3"
android:paddingBottom="@dimen/size_1"
android:text="股东"
android:textColor="@color/colorGray"
android:textSize="@dimen/text_10"
android:visibility="gone" />
......
module_tourism/src/main/java/com/rv/tourism/other/TravelDetailsActivity.java
View file @ c5b840af
package com.rv.tourism.other;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Intent;
import android.content.res.Configuration;
import android.os.Build;
......@@ -12,6 +14,7 @@ import android.webkit.JavascriptInterface;
import android.webkit.WebChromeClient;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
......@@ -34,6 +37,7 @@ import com.ruiwenliu.wrapper.util.um.CustomShareListener;
import com.ruiwenliu.wrapper.util.um.ShareManager;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.ruiwenliu.wrapper.weight.refresh.IFooterWrapper;
import com.rv.component.control.ProgressWebView;
import com.rv.tourism.R;
import com.rv.tourism.R2;
import com.rv.tourism.api.TourismApi;
......@@ -65,7 +69,7 @@ import static com.ruiwenliu.wrapper.weight.webview.SafeWebView.hasKitkat;
public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter> {
@BindView(R2.id.webView)
WebView mWebView;
ProgressWebView mWebView;
@BindView(R2.id.tv_center)
TextView tvTitleCenter;
@BindView(R2.id.iv_collect)
......@@ -82,6 +86,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
private BeanOrderParam beanOrderParam;
private String mCollectId;
private static String isCollection = "0"; //0 没有收藏 1 收藏
private ClipboardManager myClipboard;
@Autowired()
String id;
......@@ -283,17 +288,23 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
// 如果此设置是允许，则 setAllowFileAccessFromFileURLs 不起做用
webSettings.setAllowUniversalAccessFromFileURLs(true);
mWebView.addJavascriptInterface(new AndroidJs(), "AndroidJs");
mWebView.loadUrl(webUrl);
mWebView.setWebChromeClient(new WebChromeClient() {
mWebView.setWebViewClient(new WebViewClient(){
@Override
public void onProgressChanged(WebView view, int newProgress) {
super.onProgressChanged(view, newProgress);
if (newProgress == 100) {
onHideLoading();
}
public boolean shouldOverrideUrlLoading(WebView view, String url) {
return false;
}
});
mWebView.loadUrl(webUrl);
// mWebView.setWebChromeClient(new WebChromeClient() {
// @Override
// public void onProgressChanged(WebView view, int newProgress) {
// super.onProgressChanged(view, newProgress);
// if (newProgress == 100) {
// onHideLoading();
// }
// }
// });
}
/**
......@@ -306,9 +317,14 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
public void onclick(SnsPlatform snsPlatform, SHARE_MEDIA share_media) {
if (snsPlatform.mShowWord.equals("生成海报")) {
// startActivity(ShareImageActivity.getIntent(mActivity, mCarBean));
ARouter.getInstance()
.build(Constance.ACTIVITY_URL_SHAREIMAGE)
.withString("icon",url)
.withString("name",name)
.withString("keyword",content)
.withDouble("price",0).navigation();
} else if (snsPlatform.mShowWord.equals("复制链接")) {
// copyText();
copyText();
}
shareManager.showShare(share_media, webUrl, name, content, logo
......@@ -399,7 +415,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
new TypeToken<BeanOrderParam>() {
}.getType());
if (Integer.valueOf(beanOrderParam.getAdultNum()) < Integer.valueOf(beanOrderParam.getChildNum())){
showToast("儿童数要大于或等于成人数");
showToast("成人数要大于或等于儿童数");
}else if (Integer.valueOf(beanOrderParam.getAdultNum()) ==0){
showToast("成人数不能为空！");
}else {
......@@ -502,4 +518,17 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
this.status = status;
}
}
/**
* 复制文本
*/
private void copyText() {
if (myClipboard == null) {
myClipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
}
ClipData myClip = ClipData.newPlainText("text", webUrl);
myClipboard.setPrimaryClip(myClip);
showToast("复制成功！");
}
}
module_tourism/src/main/res/layout/activity_travel_details.xml
View file @ c5b840af
......@@ -62,19 +62,13 @@
<include layout="@layout/common_line" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="vertical">
<WebView
<com.rv.component.control.ProgressWebView
android:id="@+id/webView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1" />
android:layout_weight="1"></com.rv.component.control.ProgressWebView>
</LinearLayout>
<include layout="@layout/common_line" />
......
plugin_calendar/src/main/java/com/rv/plugin/calendar/CalendarActivity.java
View file @ c5b840af
......@@ -57,7 +57,7 @@ public class CalendarActivity extends BaseStatusActivity<CalendarPresenter> {
/**
* 最大的日历期限
*/
private final int MAX_SPAN = 366;
private final int MAX_SPAN = 30;
private int spanIndex = 1;
......
plugin_search/src/main/java/com/rv/search/TravelSearchActivity.java
View file @ c5b840af
......@@ -149,7 +149,7 @@ public class TravelSearchActivity extends BaseStatusActivity<SearchPresenter> {
map.put("limit", "10");
map.put("latitudel", latLatitude);
map.put("longitude", lonLongitude);
mPresenter.getData(0, SearchApi.QUERY_RIM_LIST, BeanTravelSearch.class, map, false);
mPresenter.getData(0, SearchApi.QUERY_RIM_LIST, BeanTravelSearch.class, map, true);
}
}
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