Skip to content

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

Merge branch 'master' of http://113.105.137.151:22280/lify/rvapp into dev-member-john

parents 0eba54ba 3052d304
Hide whitespace changes
Inline Side-by-side
Showing with 137 additions and 68 deletions
RvFrame/src/main/java/com/frame/rv/config/RvFrameConfig.java
View file @ ac00a7fd
......@@ -8,13 +8,14 @@ package com.frame.rv.config;
*/
public interface RvFrameConfig extends RvFrameConstant {
// String HOST = "https://xxtest.upyuns.com";
// String HOST = "https://xxtest.upyuns.com";
// String HOST = "http://10.1.37.192:8765";
// String HOST = "http://10.1.37.245:10000";
// String HOST = "https://dev.dfangche.com";
// String HOST = "https://api.dfangche.com";
String HOST = "https://mgmt.dfangche.com";
String HOST_H5_DETAIL = "https://mgmt.dfangche.com";
// String HOST_H5_DETAIL = "https://dev.dfangche.com";
String ADMIN_POST = HOST + "/api/admin/";
String AUTH_POST = HOST + "/api/auth/";
String VEHICLE_POST = HOST + "/vehicle/";//租车
......
RvWrapper/src/main/java/com/ruiwenliu/wrapper/util/glide/GlideManager.java
View file @ ac00a7fd
package com.ruiwenliu.wrapper.util.glide;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.util.Log;
......@@ -18,7 +20,9 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.bumptech.glide.load.resource.gif.GifDrawable;
import com.bumptech.glide.request.RequestListener;
import com.bumptech.glide.request.RequestOptions;
import com.bumptech.glide.request.target.SimpleTarget;
import com.bumptech.glide.request.target.Target;
import com.bumptech.glide.request.transition.Transition;
import com.ruiwenliu.wrapper.R;
import com.ruiwenliu.wrapper.util.ScaleUtils;
......@@ -133,6 +137,9 @@ public class GlideManager {
// .apply(RequestOptions.bitmapTransform(new CenterCrop(),new RoundedCorners(round)))
.apply(RequestOptions.bitmapTransform(new GlideRoundTransform(mContext, round)))
.into(image);
}
......@@ -153,6 +160,7 @@ public class GlideManager {
.into(image);
}
/**
* 加载圆角图片
* 通过RequestOptions扩展功能,override:采样率,因为ImageView就这么大,可以压缩图片,降低内存消耗,设置图片压缩比例
......
module_camp/src/main/java/com/rv/camp/CampFragment.java
View file @ ac00a7fd
......@@ -86,9 +86,10 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
mSimpleRefreshLayout.setOnSimpleRefreshListener(this);
permissionProcess();
campAdapter = new CampListAdapter();
rvContent.setItemAnimator(null);
rvContent.setLayoutManager(new GridLayoutManager(_mActivity, 2));
rvContent.addItemDecoration(new AbSpacesItemDecoration(20,10));// 分割线。
rvContent.setNestedScrollingEnabled(false);
// rvContent.setNestedScrollingEnabled(false);
rvContent.setAdapter(campAdapter);
campTypeListAdapter = new CampTypeListAdapter();
......@@ -120,6 +121,25 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
.navigation();
}
});
campAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
@Override public void onLoadMoreRequested() {
if (rvContent != null) {
rvContent.postDelayed(new Runnable() {
@Override
public void run() {
if (mPage >= countPage) {
campAdapter.loadMoreEnd();
} else {
mPage++;
getCampList(mPage);
}
}
}, 200);
}
}
}, rvContent);
}
@Override
......@@ -166,12 +186,12 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
@Override
public void onLoadMoreRequested() {
if (mPage >= countPage) {
campAdapter.loadMoreEnd();
} else {
mPage++;
getCampList(mPage);
}
// if (mPage >= countPage) {
// campAdapter.loadMoreEnd();
// } else {
// mPage++;
// getCampList(mPage);
// }
}
......@@ -180,7 +200,7 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
*/
private void getCampList(int page) {
Map<String, Object> map = new LinkedHashMap<>();
map.put("page", page);
map.put("pageNo", page);
if (type != null) {
map.put("type", type);
}
......@@ -212,7 +232,6 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
private void processData(CampListBean bean) {
if (mPage == 1) {
campAdapter.getData().clear();
if (bean.getData().getTotalCount() == 0) {
campAdapter.notifyDataSetChanged();
// campAdapter.setEmptyView(getEmptyView(rvContent, -1, "还没有营地信息！"));
......@@ -223,7 +242,6 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
if (bean.getData().getData() != null) {
campAdapter.setNewData(bean.getData().getData());
}
campAdapter.loadMoreComplete();
} else {
if (bean.getData().getData() != null) {
campAdapter.addData(bean.getData().getData());
......
module_camp/src/main/java/com/rv/camp/camp/CampShopShowActivity.java
View file @ ac00a7fd
......@@ -156,7 +156,7 @@ public class CampShopShowActivity extends BaseStatusActivity<CampPresenter> {
*/
private void getShopList(int page) {
Map<String, Object> map = new LinkedHashMap<>();
map.put("page", 1000);
map.put("pageSize", 1000);
mPresenter.getData(RvFrameConfig.VEHICLE_CAMPLIST, 0, CampApi.TRAVEL_CAMPSITESHOP, CampListBean.class, map, page == 1 ? false : false);
}
......
module_discovery/src/main/java/com/xxfc/discovery/DiscoveryFragment.java
View file @ ac00a7fd
......@@ -129,7 +129,7 @@ public class DiscoveryFragment extends BaseFragment<DiscoveryPresenter> {
list.add(_mActivity.getString(R.string.discovery_recommend));
list.add(_mActivity.getString(R.string.discovery_pat));
// list.add(_mActivity.getString(R.string.discovery_short_video));
list.add(_mActivity.getString(R.string.discovery_question_and_answer));
// list.add(_mActivity.getString(R.string.discovery_question_and_answer));
menuAdapter.setNewData(list);
menuAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
......@@ -174,7 +174,7 @@ public class DiscoveryFragment extends BaseFragment<DiscoveryPresenter> {
list.add(RecommendFragment.getInstance(TYPE_RECOMMEND));
list.add(PatFragment.getInstance(TYPE_PAT));
// list.add(ShortVideoFragment.getInstance(TYPE_SHORT_VIDEO));
list.add(QuestionAndAnswerFragment.getInstance(TYPE_QUESTION_AND_ANSWER));
// list.add(QuestionAndAnswerFragment.getInstance(TYPE_QUESTION_AND_ANSWER));
return list;
}
......
module_discovery/src/main/java/com/xxfc/discovery/adapter/DiscoveryRecommendAdapter.java
View file @ ac00a7fd
package com.xxfc.discovery.adapter;
import android.graphics.Bitmap;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.view.Display;
import android.view.ViewGroup;
import android.widget.ImageView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.target.SimpleTarget;
import com.bumptech.glide.request.transition.Transition;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.ruiwenliu.wrapper.util.glide.GlideManager;
......@@ -13,19 +22,40 @@ import com.xxfc.discovery.bean.DiscoveryRecommendBean;
public class DiscoveryRecommendAdapter extends BaseQuickAdapter<DiscoveryRecommendBean.DataBeanX.DataBean, BaseViewHolder> {
public DiscoveryRecommendAdapter() {
private Display display;
public DiscoveryRecommendAdapter(Display display) {
super(R.layout.rv_item_discovery_recommend);
this.display = display;
}
@Override
protected void convert(BaseViewHolder helper, DiscoveryRecommendBean.DataBeanX.DataBean item) {
if (item == null) {
return;
}
DiscoveryRecommendBean.DataBeanX.DataBean.Body body = item.getBody();
if (body != null) {
if (body.getImages() != null && body.getImages().size() > 0) {
GlideManager.getInstance(mContext).loadRoundImage2(body.getImages().get(0).getOurl(), (ImageView) helper.getView(R.id.iv_icon),8);
Glide.with(mContext)
.asBitmap()//强制Glide返回一个Bitmap对象
.load(body.getImages().get(0).getOurl())
.into(new SimpleTarget<Bitmap>() {
@Override
public void onResourceReady(@NonNull Bitmap bitmap, @Nullable Transition<? super Bitmap> transition) {
ViewGroup.LayoutParams lp =helper.getView(R.id.iv_icon_pat).getLayoutParams();
lp.height = bitmap.getHeight() * (int) (display.getWidth() / 2 - 60 ) / bitmap.getWidth() ;
helper.getView(R.id.iv_icon_pat).setLayoutParams(lp);
}
});
GlideManager.getInstance(mContext).loadRoundImage2(body.getImages().get(0).getOurl(), (ImageView) helper.getView(R.id.iv_icon_pat),8);
}
helper.setText(R.id.tv_title, body.getText());
if ("4".equals(body.getType())) { //消息类型 基础属性 1=文字消息、2=图文消息、3=语音消息、4=视频消息、 5=文件消
......
module_discovery/src/main/java/com/xxfc/discovery/api/DiscoveryApi.java
View file @ ac00a7fd
......@@ -3,7 +3,7 @@ package com.xxfc.discovery.api;
import com.frame.rv.config.RvFrameConfig;
public interface DiscoveryApi extends RvFrameConfig {
String IMA_BASEUSRL = "https://imapi.dfangche.com/xxfcim";
String IMA_BASEUSRL = "https://imapi.dfangche.com";
//问题列表
String DISCOVERY_IMQUESTION_LIST = HOST + "/api/im/imQuestion/list";
......@@ -11,7 +11,7 @@ public interface DiscoveryApi extends RvFrameConfig {
String DISCOVERY_IMQUESTION_ADD = HOST + "/api/im/imQuestion/add";
//获取推荐消息列表
String DISCOVERY_HOTMSG_LIST = HOST + "/api/im/msg/hotMsg/list";
String DISCOVERY_HOTMSG_LIST = HOST + "/api/im/app/unauth/hotMsg/list";
//获取拍拍、短视频请求列表
String DISCOVERY_UNAUTH_LIST = HOST + "/api/im/msg/app/unauth/list";
......
module_discovery/src/main/java/com/xxfc/discovery/fragment/PatFragment.java
View file @ ac00a7fd
......@@ -2,12 +2,10 @@ package com.xxfc.discovery.fragment;
import android.graphics.Rect;
import android.os.Bundle;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.StaggeredGridLayoutManager;
import android.util.TypedValue;
import android.view.Display;
import android.view.View;
import com.alibaba.android.arouter.launcher.ARouter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.frame.base.bus.Observer;
......@@ -24,15 +22,11 @@ import com.xxfc.discovery.adapter.DiscoveryRecommendAdapter;
import com.xxfc.discovery.api.DiscoveryApi;
import com.xxfc.discovery.bean.DiscoveryIMTokenBean;
import com.xxfc.discovery.bean.DiscoveryRecommendBean;
import com.xxfc.discovery.event.DiscoveryAddEvent;
import com.xxfc.discovery.event.PostPatEvent;
import com.xxfc.discovery.presenter.DiscoveryPresenter;
import com.yuyife.okgo.OkGoUtil;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.Map;
import butterknife.BindView;
import io.reactivex.schedulers.Schedulers;
......@@ -71,7 +65,10 @@ public class PatFragment extends BaseFragment<DiscoveryPresenter> implements Sim
mSimpleRefreshLayout.setHeaderView(new SimpleRefreshView(_mActivity));
mSimpleRefreshLayout.setOnSimpleRefreshListener(this);
initRxbus();
mAdapter = new DiscoveryRecommendAdapter();
Display display = _mActivity.getWindowManager().getDefaultDisplay();
mAdapter = new DiscoveryRecommendAdapter(display);
StaggeredGridLayoutManager staggeredGridLayoutManager = new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL);
rvContent.setItemAnimator(null);
......
module_discovery/src/main/java/com/xxfc/discovery/fragment/RecommendFragment.java
View file @ ac00a7fd
......@@ -2,9 +2,9 @@ package com.xxfc.discovery.fragment;
import android.graphics.Rect;
import android.os.Bundle;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.StaggeredGridLayoutManager;
import android.view.Display;
import android.view.View;
import com.alibaba.android.arouter.launcher.ARouter;
......@@ -62,7 +62,8 @@ public class RecommendFragment extends BaseFragment<DiscoveryPresenter> implemen
protected void initView(Bundle savedInstanceState) {
mSimpleRefreshLayout.setHeaderView(new SimpleRefreshView(_mActivity));
mSimpleRefreshLayout.setOnSimpleRefreshListener(this);
mRecommendAdapter = new DiscoveryRecommendAdapter();
Display display = _mActivity.getWindowManager().getDefaultDisplay();
mRecommendAdapter = new DiscoveryRecommendAdapter(display);
StaggeredGridLayoutManager staggeredGridLayoutManager = new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL);
......
module_discovery/src/main/java/com/xxfc/discovery/fragment/ShortVideoFragment.java
View file @ ac00a7fd
......@@ -4,10 +4,10 @@ import android.graphics.Rect;
import android.os.Bundle;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.Display;
import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseFragment;
import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
......@@ -18,9 +18,7 @@ import com.xxfc.discovery.adapter.DiscoveryRecommendAdapter;
import com.xxfc.discovery.api.DiscoveryApi;
import com.xxfc.discovery.bean.DiscoveryRecommendBean;
import com.xxfc.discovery.presenter.DiscoveryPresenter;
import com.yuyife.okgo.OkGoUtil;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.Map;
......@@ -58,7 +56,8 @@ public class ShortVideoFragment extends BaseFragment<DiscoveryPresenter> implem
protected void initView(Bundle savedInstanceState) {
mSimpleRefreshLayout.setHeaderView(new SimpleRefreshView(_mActivity));
mSimpleRefreshLayout.setOnSimpleRefreshListener(this);
mAdapter = new DiscoveryRecommendAdapter();
Display display = _mActivity.getWindowManager().getDefaultDisplay();
mAdapter = new DiscoveryRecommendAdapter(display);
rvContent.setLayoutManager(new GridLayoutManager(_mActivity, 2));
rvContent.addItemDecoration(new AbSpacesItemDecoration(15));// 分割线。
rvContent.setAdapter(mAdapter);
......
module_discovery/src/main/res/layout/rv_item_discovery_recommend.xml
View file @ ac00a7fd
......@@ -16,10 +16,9 @@
android:layout_height="wrap_content">
<ImageView
android:id="@+id/iv_icon"
android:id="@+id/iv_icon_pat"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="centerCrop" />
android:layout_height="wrap_content" />
<ImageView
android:id="@+id/iv_isvideo"
......@@ -38,6 +37,8 @@
android:layout_marginTop="@dimen/size_5"
android:paddingLeft="@dimen/size_5"
android:paddingRight="@dimen/size_5"
android:maxLines="2"
android:ellipsize="end"
android:text="行摄川西邂逅生命中未知的精彩"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" />
......
module_home/src/main/java/com/rv/home/rv/module/ApiConfig.java
View file @ ac00a7fd
......@@ -121,5 +121,5 @@ public class ApiConfig {
public static String HTTP_URL_WEBVIEW_CARGOODS = RvFrameConfig.HOST_H5_DETAIL + "/h5/appHtml/view/carGoods.html";
//押金退还进度
public static String HTTP_URL_WEBVIEW_REFUNDPROGRESS = RvFrameConfig.HOST_H5_DETAIL + "/h5/appHtml/view/refundProgress.html";
public static String HTTP_URL_WEBVIEW_REFUNDPROGRESS = RvFrameConfig.HOST_H5_DETAIL + "/h5/appHtml/view/depositProgress.html";
}
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/HomeFragment.java
View file @ ac00a7fd
......@@ -59,6 +59,7 @@ import com.rv.home.R2;
import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.main.home.adapter.HotCarTypeAdapter;
import com.rv.home.rv.module.ui.main.home.adapter.RVEnthusiastAdapter;
import com.rv.home.rv.module.ui.main.home.adapter.RVTourListAdapter;
import com.rv.home.rv.module.ui.main.home.adapter.RVTourListLabelAdapter;
import com.rv.home.rv.module.ui.main.home.adapter.SelectedEventsAdapter;
......@@ -233,7 +234,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
private HotCarTypeAdapter mAdapter;
private SelectedEventsAdapter mActivityAdapter;
// private RVEnthusiastAdapter mRvEnthusiast;
// private RVEnthusiastAdapter mRvEnthusiast;
private RVTourListAdapter mRvTourAdapter;
private RVTourListLabelAdapter mRvTourLabelAdapter;
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/AllOrderFragment.java
View file @ ac00a7fd
......@@ -125,6 +125,7 @@ public class AllOrderFragment extends BaseFragment<CommonPresenter> implements B
break;
case 5:
if (id == R.id.tv_process) {
startActivity(PickUpTheCarQRCodeActivity.getIntent(_mActivity, dataBean));
} else if (id == R.id.tv_camp_process) {
startActivity(GetOnTheCarQRCodeActivity.getIntent(_mActivity, dataBean));
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/DepositefundProgressDetailsActivity.java
View file @ ac00a7fd
......@@ -53,10 +53,11 @@ public class DepositefundProgressDetailsActivity extends BaseStatusActivity<Pick
titleView.setTitle("押金退还进度");
String orderId = intent.getStringExtra("orderId");
webUrl = ApiConfig.HTTP_URL_WEBVIEW_REFUNDPROGRESS + "?orderId=" + orderId;
webUrl = ApiConfig.HTTP_URL_WEBVIEW_REFUNDPROGRESS + "?orderNo=" + orderId;
initWeb();
}
private void initWeb() {
WebSettings webSettings = mWebView.getSettings();
if (webSettings == null) return;
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/HaveToTravelFragment.java
View file @ ac00a7fd
......@@ -80,7 +80,7 @@ public class HaveToTravelFragment extends BaseFragment<CommonPresenter>implement
@Override
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
int id = view.getId();
if (id == R.id.tv_rvtour_label){
if (id == R.id.tv_process){
OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
startActivity(PickUpTheCarQRCodeActivity.getIntent(_mActivity,dataBean));
}
......
module_tourism/src/main/java/com/rv/tourism/TourismFragment.java
View file @ ac00a7fd
......@@ -181,11 +181,18 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements S
mTourAroundAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
@Override
public void onLoadMoreRequested() {
if (mPage >= countPage) {
mTourAroundAdapter.loadMoreEnd();
} else {
mPage++;
getLoadTourAroundData(mPage);
if (rvTourAround != null) {
rvTourAround.postDelayed(new Runnable() {
@Override
public void run() {
if (mPage >= countPage) {
mTourAroundAdapter.loadMoreEnd();
} else {
mPage++;
getLoadTourAroundData(mPage);
}
}
}, 200);
}
}
}, rvTourAround);
......@@ -195,7 +202,6 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements S
protected void loadData(Bundle savedInstanceState) {
loadBannerData();
loadPopularBrigadeData();
loadTourAroundData();
loadPopularBrigadeAllData();
}
......@@ -335,14 +341,19 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements S
if (mPage == 1) {
if (bean.getData().getTotalCount() == 0) {
// mTourAroundAdapter.setEmptyView(getEmptyView(recyclerView, -1, mActivity.getString(R.string.rv_driving_data_null)));
mTourAroundAdapter.notifyDataSetChanged();
return;
}
countPage = bean.getData().getTotalPage();
mTourAroundAdapter.addNewData(bean);
if (bean.getData().getData() != null) {
mTourAroundAdapter.setNewData(bean.getData().getData());
}
mTourAroundAdapter.loadMoreComplete();
} else {
mTourAroundAdapter.addData(bean.getData().getData());
if (bean.getData().getData() != null) {
mTourAroundAdapter.addData(bean.getData().getData());
}
mTourAroundAdapter.loadMoreComplete();
}
}
......@@ -606,6 +617,7 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements S
latLatitude = location.getLatitude();
lonLongitude = location.getLongitude();
mLatLng = new LatLng(location.getLatitude(), location.getLongitude());
loadTourAroundData();
if (!TextUtils.isEmpty(location.getCity()))
travelCityText.setText(location.getCity());
locationManager.stopLocation();
......
module_tourism/src/main/java/com/rv/tourism/adapter/TourAroundAdapter.java
View file @ ac00a7fd
......@@ -24,10 +24,4 @@ public class TourAroundAdapter extends BaseQuickAdapter<BeanTourAround.DataBeanX
helper.setText(R.id.tv_people,item.getStock());
helper.setText(R.id.tv_price,String.format("¥%1$s%2$s",item.getPrice(),item.getUnit()));
}
public void addNewData(BeanTourAround bean) {
mData.clear();
addData(bean.getData().getData());
notifyDataSetChanged();
}
}
module_tourism/src/main/java/com/rv/tourism/other/TravelDetailsActivity.java
View file @ ac00a7fd
......@@ -123,12 +123,13 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
showTitle(false);
tvTitleCenter.setText("旅游详情");
webUrl = TourismApi.TRAVEL_DETAILS + "?id=" + id;
webUrl = TourismApi.TRAVEL_DETAILS +"?id=" + id;
initWeb();
initRxbus();
if (!TextUtils.isEmpty(name) && !TextUtils.isEmpty(url)) {
initShare(webUrl + "&shareType=app", name, content, url);
initShare(webUrl+"&shareType=app", name, "", url);
}
mWebView.loadUrl("JavaScript:getTourStock()"); // Android调用h5
}
......@@ -190,7 +191,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
// }
// }
//
mWebView.loadUrl("JavaScript:openModal()"); // Android调用h5
mWebView.loadUrl("JavaScript:openModal()"); // Android调用h5
}
}
......@@ -333,9 +334,10 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
mWebView.setWebChromeClient(new WebChromeClient() {
@Override
public void onProgressChanged(WebView view, int newProgress) {
if (newProgress == 100) {
if(newProgress==100){
pbProgress.setVisibility(View.GONE);//加载完网页进度条消失
} else {
}
else{
pbProgress.setVisibility(View.VISIBLE);//开始加载网页时显示进度条
pbProgress.setProgress(newProgress);//设置进度值
}
......@@ -355,11 +357,11 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
if (snsPlatform.mShowWord.equals("生成海报")) {
ARouter.getInstance()
.build(Constance.ACTIVITY_URL_SHAREIMAGE)
.withString("icon", url)
.withString("name", name)
.withString("keyword", content)
.withDouble("price", price)
.withString("url", webUrl)
.withString("icon",url)
.withString("name",name)
.withString("keyword",content)
.withDouble("price",price)
.withString("url",webUrl)
.navigation();
} else if (snsPlatform.mShowWord.equals("复制链接")) {
copyText();
......@@ -373,7 +375,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
if (platform.name().equals("WEIXIN_FAVORITE")) {
showToast(" 收藏成功啦");
showToast( " 收藏成功啦");
} else {
if (platform != SHARE_MEDIA.MORE && platform != SHARE_MEDIA.SMS
......@@ -457,11 +459,11 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
beanOrderParam = new Gson().fromJson(orderJson,
new TypeToken<BeanOrderParam>() {
}.getType());
if (Integer.valueOf(beanOrderParam.getAdultNum()) < Integer.valueOf(beanOrderParam.getChildNum())) {
if (Integer.valueOf(beanOrderParam.getAdultNum()) < Integer.valueOf(beanOrderParam.getChildNum())){
showToast("成人数要大于或等于儿童数");
} else if (Integer.valueOf(beanOrderParam.getAdultNum()) == 0) {
}else if (Integer.valueOf(beanOrderParam.getAdultNum()) ==0){
showToast("成人数不能为空！");
} else {
}else {
startActivity(TravelerConfirmOrderActivity.getIntent(mActivity, beanOrderParam));
}
......@@ -511,6 +513,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
mWebView.removeJavascriptInterface("AndroidNative");// 向 Web端注入 java 对象
}
mWebView.destroy();// 生命周期销毁
}
private class AddCollection {
......@@ -573,7 +576,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
if (myClipboard == null) {
myClipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
}
ClipData myClip = ClipData.newPlainText("text", webUrl + "&shareType=app");
ClipData myClip = ClipData.newPlainText("text", webUrl+"&shareType=app");
myClipboard.setPrimaryClip(myClip);
showToast("复制成功！");
}
......
plugin_member/src/main/java/com/rv.member/MemberCenterActivity.java
View file @ ac00a7fd
......@@ -15,6 +15,7 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import com.alibaba.android.arouter.launcher.ARouter;
import com.alipay.sdk.app.EnvUtils;
import com.base.utils.ui.image.round.RoundImageView;
import com.frame.base.bus.PaymentFailedEvent;
import com.frame.base.bus.PaymentSuccessfulEvent;
......@@ -104,6 +105,7 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
EnvUtils.setEnv(EnvUtils.EnvEnum.SANDBOX);
// StatusBarUtil.setRootViewFitsSystemWindows(mActivity, false);
}
......
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