Skip to content

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

首页发烧友开发

parents f014039a 3ae56a57
Show whitespace changes
Inline Side-by-side
Showing with 188 additions and 164 deletions
RvClient/build.gradle
View file @ 4d9758f2
......@@ -8,8 +8,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 134
versionName "1.3.4"
versionCode 135
versionName "1.3.5"
multiDexEnabled true
//新版Gradle 是 implementation 为了兼容compile,写上这句话
......
RvWrapper/src/main/java/com/ruiwenliu/wrapper/util/glide/GlideManager.java
View file @ 4d9758f2
......@@ -69,6 +69,23 @@ public class GlideManager {
.into(image);
}
/**
* 加载普通图片
*
* @param url
* @param image
*/
public void loadImage(String url, ImageView image,int defaultImg) {
GlideApp.with(mContext)
.load(url)
.placeholder(defaultImg)
.error(R.drawable.glide_icon_error)
.apply(new RequestOptions()
.skipMemoryCache(false)
.diskCacheStrategy(DiskCacheStrategy.ALL))
.into(image);
}
/**
* 加载普通图片
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/HomeFragment.java
View file @ 4d9758f2
......@@ -342,6 +342,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
mRvEnthusiast.disableLoadMoreIfNotFullPage();
recyclerViewRvEnthusiast.setLayoutManager(new GridLayoutManager(getContext(), 2));
recyclerViewRvEnthusiast.addItemDecoration(new AbSpacesItemDecoration(10));// 分割线。
recyclerViewRvEnthusiast.addItemDecoration(new flow(10));
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/SelectShopActivity.java
View file @ 4d9758f2
......@@ -245,10 +245,9 @@ public class SelectShopActivity extends BaseStatusActivity<CommonPresenter> impl
map.put("page", page);
map.put("limit", 10);
if (mCityId == 0) {
map.put("addrCity", 441900);
} else {
map.put("addrCity", mCityId);
mCityId = 441900;
}
map.put("addrCity", mCityId);
// if (mLat > 0) {
// map.put("lat", mLat);
// map.put("lon", mLon);
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/ShareImageActivity.java
View file @ 4d9758f2
......@@ -116,7 +116,7 @@ public class ShareImageActivity extends SwipeBackActivity<CommonPresenter> {
}
@OnClick({R2.id.img_title_left, R2.id.tv_share})
@OnClick({R2.id.img_title_left, R2.id.tv_share, R2.id.iv_code})
public void onViewClicked(View view) {
int i = view.getId();
if (i == R.id.img_title_left) {
......@@ -126,6 +126,7 @@ public class ShareImageActivity extends SwipeBackActivity<CommonPresenter> {
if (rlBody != null && getViewBitmap(rlBody) != null) {
initShare(getViewBitmap(rlBody));
}
} else if (i == R.id.iv_code) {
}
}
......
module_home/src/main/res/layout/rv_act_share_image.xml
View file @ 4d9758f2
......@@ -149,8 +149,8 @@
<ImageView
android:id="@+id/iv_code"
android:layout_width="@dimen/size_60"
android:layout_height="@dimen/size_60"
android:layout_width="@dimen/size_80"
android:layout_height="@dimen/size_80"
android:layout_marginLeft="@dimen/size_30"
android:scaleType="centerCrop" />
......
module_home/src/main/res/values/strings.xml
View file @ 4d9758f2
......@@ -47,7 +47,7 @@
<string name="rv_ok">确定</string>
<string name="rv_rental_car">租房车</string>
<string name="rv_rental_car_content">开启生活新旅程</string>
<string name="rv_get_car_address">取车分公司</string>
<string name="rv_get_car_address">取车公司</string>
<string name="rv_get_car_address_">取车地址：</string>
<string name="rv_get_car_hint">请选择取车分公司</string>
<string name="rv_get_out_address">还车公司</string>
......
module_mine/src/main/res/layout/activity_mine.xml
View file @ 4d9758f2
......@@ -268,7 +268,7 @@
android:clickable="false"
android:gravity="center"
android:orientation="vertical"
android:visibility="invisible">
android:visibility="visible">
<ImageView
android:layout_width="@dimen/size_25"
......
module_tourism/src/main/java/com/rv/tourism/other/TravelDetailsActivity.java
View file @ 4d9758f2
......@@ -9,6 +9,7 @@ import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.webkit.JavascriptInterface;
import android.webkit.WebChromeClient;
......@@ -123,11 +124,11 @@ 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, "", url);
initShare(webUrl + "&shareType=app", name, "", url);
}
mWebView.loadUrl("JavaScript:getTourStock()"); // Android调用h5
......@@ -143,6 +144,18 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
llItemBottom.setVisibility(View.GONE);
}
});
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
mWebView.setOnScrollChangeListener(new View.OnScrollChangeListener() {
@Override
public void onScrollChange(View v, int scrollX, int scrollY, int oldScrollX, int oldScrollY) {
Log.d("scroll", "scrollX=" + scrollX);
Log.d("scroll", "scrollY=" + scrollY);
Log.d("scroll", "oldScrollX=" + oldScrollX);
Log.d("scroll", "oldScrollY=" + oldScrollY);
}
});
}
}
@OnClick({R2.id.iv_back, R2.id.tv_appointment, R2.id.iv_collect, R2.id.iv_share, R2.id.tv_customer_service})
......@@ -334,10 +347,9 @@ 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);//设置进度值
}
......@@ -357,11 +369,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();
......@@ -375,7 +387,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
......@@ -458,16 +470,25 @@ 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));
}
}
}
@JavascriptInterface
public void showTop(int state) {
if (state == 0) {
} else {
}
}
}
private void getTourDetail() {
......@@ -575,7 +596,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("复制成功！");
}
......
module_tourism/src/main/res/layout/activity_travel_details.xml
View file @ 4d9758f2
......@@ -4,25 +4,11 @@
android:layout_height="match_parent"
android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<WebView
android:id="@+id/webView"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<RelativeLayout
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/lay_title"
android:layout_width="match_parent"
android:layout_height="@dimen/size_55"
android:layout_gravity="top">
android:background="@color/colorWrite">
<ImageView
android:id="@+id/iv_back"
......@@ -42,9 +28,8 @@
android:gravity="center"
android:maxWidth="320dp"
android:maxLines="1"
android:textColor="@color/white"
android:textSize="@dimen/text_18"
android:visibility="gone" />
android:textColor="@color/textMain"
android:textSize="@dimen/text_18" />
<LinearLayout
android:layout_width="wrap_content"
......@@ -75,7 +60,7 @@
</LinearLayout>
</RelativeLayout>
<!--<include layout="@layout/common_line" />-->
<include layout="@layout/common_line" />
<ProgressBar
android:id="@+id/pb_progress"
......@@ -86,7 +71,15 @@
android:max="100"
android:progressDrawable="@drawable/shape_rv_bg_yellow_progress"
android:visibility="gone"></ProgressBar>
</LinearLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<WebView
android:id="@+id/webView"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<LinearLayout
android:id="@+id/ll_item_bottom"
......@@ -104,11 +97,11 @@
<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:background="@color/white"
android:gravity="center"
android:text="联系客服"
android:textColor="@color/colorMain"
......
plugin_points/src/main/java/com/rv/points/Actions.java
View file @ 4d9758f2
......@@ -88,10 +88,10 @@ public class Actions {
* @param context
*/
public void bindwechat(Context context) {
// if (listener == null) {
// listener = new RvUMAuthListener(context);
// }
// UMShareAPI.get(context).getPlatformInfo((Activity) context, SHARE_MEDIA.WEIXIN, listener);
if (listener == null) {
listener = new RvUMAuthListener(context);
}
UMShareAPI.get(context).getPlatformInfo((Activity) context, SHARE_MEDIA.WEIXIN, listener);
}
/*****
......
plugin_share/src/main/java/com/rv/share/ReativeBillActivity.java
View file @ 4d9758f2
......@@ -21,11 +21,15 @@ import android.widget.TextView;
import android.widget.Toast;
import com.base.utils.ui.image.round.RoundImageView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.bumptech.glide.request.RequestOptions;
import com.ruiwenliu.wrapper.SPConstance;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.bean.UserInfoBean;
import com.ruiwenliu.wrapper.util.UtilsManager;
import com.ruiwenliu.wrapper.util.glide.GlideManager;
import com.ruiwenliu.wrapper.util.glide.GlideOptions;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.component.utils.CacheEnum;
import com.rv.component.utils.DisplayUtil;
......@@ -33,6 +37,7 @@ import com.rv.component.utils.RvCache;
import com.rv.component.utils.ZxingUtils;
import com.rv.home.rv.module.basic.BaseStatusActivity;
import com.rv.share.presenter.ReativeBillPresenter;
import com.rv.share.utils.TransformationUtils;
import com.yuyife.okgo.OkGoUtil;
import butterknife.BindView;
......@@ -53,6 +58,8 @@ public class ReativeBillActivity extends BaseStatusActivity<ReativeBillPresenter
Button btnShare;
@BindView(R2.id.ll_bill_content)
CardView llBillContent;
@BindView(R2.id.img_bill_top)
ImageView imgBillTop ;
// @BindView(R2.id.ll_content)
// LinearLayout llContent;
......@@ -73,16 +80,25 @@ public class ReativeBillActivity extends BaseStatusActivity<ReativeBillPresenter
url = intent.getStringExtra("url");
if (!TextUtils.isEmpty(url)) {
Bitmap bitmap = ZxingUtils.createQRImage(url, DisplayUtil.dip2px(this, 150), DisplayUtil.dip2px(this, 150), BitmapFactory.decodeResource(getResources(),R.mipmap.logo));
imgQrcode.setImageBitmap(bitmap);
}
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(imgBillTop);
Glide.with(this)
.asBitmap()
.load(R.drawable.bg_bill)
.apply(options)
.apply(RequestOptions.bitmapTransform(new RoundedCorners(12)).override(imgBillTop.getWidth(), imgBillTop.getHeight()))
.into(utils);
UserInfoBean userInfoBean = (UserInfoBean) RvCache.getInstance(getApplicationContext()).get(CacheEnum.USER);
String name = userInfoBean.getData().getNickname();
String name = userInfoBean.getData().getRealname();
String url = userInfoBean.getData().getHeadimgurl();
if (!TextUtils.isEmpty(url)) {
GlideManager.getInstance(getApplicationContext()).loadImage3(url, roundImageView);
GlideManager.getInstance(getApplicationContext()).loadImage(url, roundImageView,R.drawable.icon_bill_defult);
}
if (!TextUtils.isEmpty(name)) {
tvPhone.setText(name);
......
plugin_share/src/main/res/drawable/bg_btn_bill_save.xml
View file @ 4d9758f2
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<!--空心框 圆角 少量红-->
<corners android:radius="@dimen/size_20" />
<stroke
android:width="@dimen/ui_dimen_stroke"
android:color="@color/colorYellow" />
<solid android:color="@color/uiColorTransparency" />
<solid android:color="@color/white" />
</shape>
\ No newline at end of file
plugin_share/src/main/res/layout/activity_reative_bill.xml
View file @ 4d9758f2
......@@ -26,7 +26,7 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#55eeeeee">
android:background="#F9D993">
<ScrollView
android:layout_width="match_parent"
......@@ -37,38 +37,32 @@
android:layout_marginBottom="@dimen/size_70"
android:scrollbars="none">
<!--<LinearLayout-->
<!--android:background="#55eeeeee"-->
<!--android:id="@+id/ll_content"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="match_parent"-->
<!--android:gravity="center">-->
<android.support.v7.widget.CardView
android:id="@+id/ll_bill_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
app:cardCornerRadius="5dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/size_10"
android:gravity="center_horizontal"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/bg_bill" />
android:id="@+id/img_bill_top"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<LinearLayout
android:layout_marginRight="@dimen/size_20"
android:layout_marginLeft="@dimen/size_20"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_10"
android:layout_marginTop="@dimen/size_20"
android:layout_marginRight="@dimen/size_10"
android:layout_marginBottom="@dimen/size_15"
android:gravity="center_vertical"
android:orientation="horizontal">
......@@ -77,71 +71,57 @@
<com.base.utils.ui.image.round.RoundImageView
android:id="@+id/ring_header"
android:layout_width="@dimen/size_50"
android:layout_height="@dimen/size_50"
android:layout_marginLeft="@dimen/size_10" />
android:layout_height="@dimen/size_50" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_5"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/tv_phone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="155****5918"
android:singleLine="false"
android:text="155****59180000000000000000000000"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_18" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:layout_marginTop="@dimen/size_5"
android:text="邀请你一起参加"
android:textColor="@color/text_Gray"
android:textSize="@dimen/sp_12" />
android:textSize="@dimen/text_10" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="right"
android:layout_marginRight="17dp"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:orientation="vertical">
android:layout_marginLeft="@dimen/text_10"
android:gravity="center_vertical"
android:orientation="horizontal">
<View
android:layout_width="1px"
android:layout_height="@dimen/size_60"
android:background="#E1E1E1" />
<ImageView
android:id="@+id/img_qrcode"
android:layout_width="@dimen/size_80"
android:layout_height="@dimen/size_80"
android:layout_width="@dimen/size_60"
android:layout_height="@dimen/size_60"
android:layout_marginLeft="@dimen/size_20"
android:src="@drawable/icon_share_wx" />
<TextView
android:layout_width="@dimen/size_80"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_8"
android:gravity="center"
android:text="长按领奖励"
android:textColor="@color/colorMain"
android:textSize="@dimen/sp_12" />
</LinearLayout>
</LinearLayout>
<include layout="@layout/common_line" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/size_10"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:src="@drawable/icon_reative_bill" />
</LinearLayout>
</android.support.v7.widget.CardView>
......@@ -167,7 +147,7 @@
android:background="@drawable/bg_btn_bill_save"
android:gravity="center"
android:text="保存海报"
android:textColor="@color/colorYellow"
android:textColor="#FE9C36"
android:textSize="@dimen/sp_16" />
<Button
......
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