Skip to content

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

修改禅道上的bug

parent 391c1631
Show whitespace changes
Inline Side-by-side
Showing with 325 additions and 254 deletions
module_home/src/main/java/com/rv/home/rv/module/ApiConfig.java
View file @ 9f5c007d
......@@ -93,5 +93,5 @@ public class ApiConfig {
public static String HTTP_URL_CONSUME_LIST = RvFrameConfig.HOST + "/api/admin/walletDetail/page";
public static String HTTP_URL_SELECTED_ACTIVITIES = RvFrameConfig.HOST + "/api/activity/activityList/app/unauth/activity/findAll"; // 精选活动
public static String HTTP_URL_SELECTED_ACTIVITIES = RvFrameConfig.HOST + "/api/activity/homeActivities/app/unauth/activity/findAll"; // 精选活动
}
plugin_member/src/main/java/com/rv.member/adapter/MemberListAdapter.java
View file @ 9f5c007d
......@@ -129,7 +129,7 @@ public class MemberListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
}
});
viewHolder.img_agree.setImageResource(hasAgree ? R.drawable.common_icon_like_selected : R.drawable.common_icon_radio_unche);
viewHolder.img_agree.setImageResource(hasAgree ? R.drawable.common_icon_selected : R.drawable.common_icon_radio_unche);
viewHolder.btn_buy.setBackgroundResource(hasAgree ? R.drawable.shape_rv_bg_dark_yellow : R.drawable.shape_rv_bg_btn_grap_yellow);
viewHolder.img_agree.setOnClickListener(new View.OnClickListener() {
@Override
......@@ -141,7 +141,7 @@ public class MemberListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
viewHolder.btn_buy.setBackgroundResource(R.drawable.shape_rv_bg_btn_grap_yellow);
} else {
hasAgree = true;
viewHolder.img_agree.setImageResource(R.drawable.common_icon_like_selected);
viewHolder.img_agree.setImageResource(R.drawable.common_icon_selected);
viewHolder.btn_buy.setBackgroundResource(R.drawable.shape_rv_bg_dark_yellow);
}
}
......
plugin_member/src/main/res/values/strings.xml
View file @ 9f5c007d
......@@ -3,7 +3,7 @@
<string name="tv_title_member_center">会员中心</string>
<string name="tv_outdoors_act">户外活动</string>
<string name="tv_agreement">同意欣新房车 《会员服务协议会员规则》 </string>
<string name="tv_agreement">同意滴房车 《会员服务协议会员规则》 </string>
<string name="tv_use_now">马上使用</string>
......
plugin_share/src/main/java/com/rv/share/ShareActivity.java
View file @ 9f5c007d
......@@ -49,6 +49,8 @@ public class ShareActivity extends BaseStatusActivity<SharePresenter> {
ImageView imgParent;
@BindView(R2.id.tv_parent_phone)
TextView tvParentPhone;
@BindView(R2.id.tv_ruler)
TextView tvRuler;
@BindView(R2.id.tv_more_detail)
TextView tvMoreDetail;
......@@ -108,7 +110,7 @@ public class ShareActivity extends BaseStatusActivity<SharePresenter> {
}
@OnClick({R2.id.tv_weixin, R2.id.tv_weixin_circle, R2.id.tv_bill, R2.id.tv_more, R2.id.tv_more_detail, R2.id.ll_activation, R2.id.ll_comein, R2.id.ll_invite})
@OnClick({R2.id.tv_weixin, R2.id.tv_weixin_circle, R2.id.tv_bill, R2.id.tv_more, R2.id.tv_more_detail, R2.id.ll_activation, R2.id.ll_comein, R2.id.ll_invite,R2.id.tv_ruler})
public void onViewClicked(View view) {
int id = view.getId();
if (TextUtils.isEmpty(shareUrl)) {
......
plugin_share/src/main/java/com/rv/share/adapter/ActivationListAdapter.java
View file @ 9f5c007d
package com.rv.share.adapter;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import com.base.utils.ui.image.round.RoundImageView;
import com.chad.library.adapter.base.BaseQuickAdapter;
......@@ -20,9 +21,18 @@ public class ActivationListAdapter extends BaseQuickAdapter<InviteListBean.invit
@Override
protected void convert(BaseViewHolder helper, InviteListBean.inviteMember item) {
helper.setText(R.id.tv_name, item.getUsername());
helper.setText(R.id.tv_name, dealName(item.getUsername()));
helper.setText(R.id.tv_ac_time, DateUtils.timestampToString1(item.getBindTime()));
GlideManager.getInstance(mContext).loadImage(item.getHeadUrl(), (RoundImageView) helper.itemView.findViewById(R.id.rimg_header));
}
private String dealName(String name) {
if (!TextUtils.isEmpty(name)) {
if (name.length() == 11) {
return name.substring(0, 3) + "****" + name.substring(7, name.length());
}
}
return name;
}
}
plugin_share/src/main/java/com/rv/share/adapter/IncomeListAdapter.java
View file @ 9f5c007d
package com.rv.share.adapter;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.widget.TextView;
import com.base.utils.ui.image.round.RoundImageView;
......@@ -24,15 +25,35 @@ public class IncomeListAdapter extends BaseQuickAdapter<IncomeRecordsBean.Income
@Override
protected void convert(BaseViewHolder helper, IncomeRecordsBean.IncomeItem item) {
StringBuilder buffer = new StringBuilder();
buffer.append(item.getUsername()).append("成交").append(item.getPrice()).append("元");
helper.setText(R.id.tv_income_record, buffer.toString());
if (item.getStatus() == 0) {
buffer.append(dealName(item.getUsername())).append("成交").append(item.getPrice()).append("元");
} else if (item.getStatus() == 1) {
buffer.append(dealName(item.getUsername())).append("退款").append(item.getPrice()).append("元");
}
helper.setText(R.id.tv_income_record, buffer.toString());
helper.setText(R.id.tv_income_time, DateUtils.timestampToString1(item.getCrtTime()));
if (item.getWaiting() == 1 && item.getStatus() == 0) {
StringBuilder builder = new StringBuilder();
builder.append("+").append(item.getCommission()).append("元");
helper.setText(R.id.tv_income_price, builder.toString());
} else if (item.getWaiting() == 1 && item.getStatus() == 1) {
StringBuilder builder = new StringBuilder();
builder.append("-").append(item.getCommission()).append("元");
helper.setText(R.id.tv_income_price, builder.toString());
} else {
helper.setText(R.id.tv_income_price, "进行中");
}
GlideManager.getInstance(mContext).loadImage(item.getHeadUrl(), (RoundImageView) helper.itemView.findViewById(R.id.rimg_header));
}
private String dealName(String name) {
if (!TextUtils.isEmpty(name)) {
if (name.length() == 11) {
return name.substring(0, 3) + "****" + name.substring(7, name.length());
}
}
return name;
}
}
plugin_share/src/main/java/com/rv/share/adapter/InviteListAdapter.java
View file @ 9f5c007d
package com.rv.share.adapter;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import com.base.utils.ui.image.round.RoundImageView;
import com.chad.library.adapter.base.BaseQuickAdapter;
......@@ -27,7 +28,7 @@ public class InviteListAdapter extends BaseQuickAdapter<InviteListBean.inviteMem
@Override
protected void convert(BaseViewHolder helper, InviteListBean.inviteMember item) {
helper.setText(R.id.tv_income_record, item.getUsername());
helper.setText(R.id.tv_income_record, dealName(item.getUsername()));
helper.setText(R.id.tv_income_time, DateUtils.timestampToString1(item.getJoinTime()));
setTimes(effTime, helper, item);
......@@ -54,4 +55,13 @@ public class InviteListAdapter extends BaseQuickAdapter<InviteListBean.inviteMem
notifyDataSetChanged();
}
};
private String dealName(String name) {
if (!TextUtils.isEmpty(name)) {
if (name.length() == 11) {
return name.substring(0, 3) + "****" + name.substring(7, name.length());
}
}
return name;
}
}
plugin_share/src/main/java/com/rv/share/presenter/SharePresenter.java
View file @ 9f5c007d
......@@ -13,10 +13,8 @@ import android.widget.TextView;
import android.widget.Toast;
import com.base.utils.ui.datetime.selector.util.TextUtil;
import com.frame.rv.config.RvFrameConfig;
import com.rv.component.utils.DisplayUtil;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.share.BillActivity;
import com.rv.share.R;
import com.rv.share.ReativeBillActivity;
import com.rv.share.view.ShareChoiceDialog;
......@@ -35,17 +33,17 @@ public class SharePresenter extends CommonPresenter {
private ShareChoiceDialog dialog = null;
public void setShareImage(Context context, TextView tvWeixin, TextView tvWxCircle, TextView tvBill, TextView tvMore) {
Drawable drawable = context.getResources().getDrawable(R.drawable.icon_share_wx);
Drawable drawable = context.getResources().getDrawable(R.drawable.icon_share_weixin);
drawable.setBounds(0, 0, DisplayUtil.dip2px(context, drawableSize), DisplayUtil.dip2px(context, drawableSize));
tvWeixin.setCompoundDrawables(null, drawable, null, null);
tvWeixin.setVisibility(View.VISIBLE);
Drawable drawable1 = context.getResources().getDrawable(R.drawable.icon_share_cir);
Drawable drawable1 = context.getResources().getDrawable(R.drawable.icon_share_wx_circle);
drawable1.setBounds(0, 0, DisplayUtil.dip2px(context, drawableSize), DisplayUtil.dip2px(context, drawableSize));
tvWxCircle.setCompoundDrawables(null, drawable1, null, null);
tvWxCircle.setVisibility(View.VISIBLE);
Drawable drawable2 = context.getResources().getDrawable(R.drawable.icon_share_bill);
Drawable drawable2 = context.getResources().getDrawable(R.drawable.icon_share_code);
drawable2.setBounds(0, 0, DisplayUtil.dip2px(context, drawableSize), DisplayUtil.dip2px(context, drawableSize));
tvBill.setCompoundDrawables(null, drawable2, null, null);
tvBill.setVisibility(View.VISIBLE);
......@@ -61,7 +59,7 @@ public class SharePresenter extends CommonPresenter {
shareAction = new ShareAction((Activity) getPresenterContext()).setCallback(shareListener);
}
UMImage image = new UMImage(getPresenterContext(), R.drawable.logo);
UMImage image = new UMImage(getPresenterContext(), R.drawable.share_logo);
UMWeb web = new UMWeb(mUrl);
web.setTitle(mTitle);//标题
web.setThumb(image); //缩略图
......@@ -80,7 +78,7 @@ public class SharePresenter extends CommonPresenter {
if (shareAction == null) {
shareAction = new ShareAction((Activity) getPresenterContext()).setCallback(shareListener);
}
UMImage image = new UMImage(getPresenterContext(), R.drawable.logo);
UMImage image = new UMImage(getPresenterContext(), R.drawable.share_logo);
UMWeb web = new UMWeb(mUrl);
web.setTitle(mTitle + " " + mDescript);//标题
web.setThumb(image); //缩略图
......
plugin_share/src/main/java/com/rv/share/presenter/WebViewPresenter.java
View file @ 9f5c007d
......@@ -63,7 +63,7 @@ public class WebViewPresenter extends CommonPresenter {
shareAction = new ShareAction((Activity) getPresenterContext()).setCallback(shareListener);
}
UMImage image = new UMImage(getPresenterContext(), R.drawable.logo);
UMImage image = new UMImage(getPresenterContext(), R.drawable.share_logo);
UMWeb web = new UMWeb(mUrl);
web.setTitle(mTitle);//标题
web.setThumb(image); //缩略图
......@@ -82,7 +82,7 @@ public class WebViewPresenter extends CommonPresenter {
if (shareAction == null) {
shareAction = new ShareAction((Activity) getPresenterContext()).setCallback(shareListener);
}
UMImage image = new UMImage(getPresenterContext(), R.drawable.logo);
UMImage image = new UMImage(getPresenterContext(), R.drawable.share_logo);
UMWeb web = new UMWeb(mUrl);
web.setTitle(mTitle);//标题
web.setThumb(image); //缩略图
......
plugin_share/src/main/res/drawable/bg_ruler.xml 0 → 100644
View file @ 9f5c007d
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="30dp" />
<solid android:color="#FE6E2F" />
</shape>
\ No newline at end of file
plugin_share/src/main/res/layout/activity_share.xml
View file @ 9f5c007d
......@@ -10,19 +10,43 @@
tools:context=".ShareActivity">
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="8"
android:background="@color/white"
android:layout_height="195dp"
android:scaleType="fitXY"
android:src="@drawable/bg_share" />
<TextView
android:id="@+id/tv_ruler"
android:layout_width="@dimen/size_80"
android:layout_height="@dimen/size_25"
android:layout_gravity="right"
android:layout_marginTop="@dimen/size_10"
android:layout_marginRight="-13dp"
android:background="@drawable/bg_ruler"
android:gravity="center"
android:text="规则说明"
android:textColor="@color/white"
android:textSize="@dimen/sp_12" />
</FrameLayout>
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_height="wrap_content"
android:layout_margin="@dimen/dp_10"
android:layout_weight="5"
android:background="@color/white"
app:cardCornerRadius="5dp">
......@@ -43,11 +67,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="left|bottom"
android:orientation="horizontal"
android:weightSum="4">
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_10"
android:orientation="horizontal">
<TextView
......@@ -56,7 +78,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_weight="1"
android:drawableTop="@drawable/icon_share_wx"
android:drawableTop="@drawable/icon_share_weixin"
android:gravity="center"
android:text="微信" />
......@@ -67,7 +89,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_weight="1"
android:drawableTop="@drawable/icon_share_cir"
android:drawableTop="@drawable/icon_share_wx_circle"
android:gravity="center"
android:text="朋友圈" />
......@@ -78,7 +100,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_weight="1"
android:drawableTop="@drawable/icon_share_qq"
android:drawableTop="@drawable/icon_share_code"
android:gravity="center"
android:text="邀请码" />
......@@ -89,7 +111,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_weight="1"
android:drawableTop="@drawable/icon_share_bill"
android:drawableTop="@drawable/icon_share_more"
android:gravity="center"
android:text="更多" />
......@@ -102,22 +124,21 @@
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:layout_marginBottom="@dimen/dp_10"
android:layout_weight="4"
android:background="@color/white"
app:cardCornerRadius="5dp">
<RelativeLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10">
......@@ -143,7 +164,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginTop="@dimen/size_20"
android:layout_marginBottom="@dimen/dp_10"
android:orientation="horizontal"
android:weightSum="3">
......@@ -233,24 +254,23 @@
</LinearLayout>
</RelativeLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:layout_marginBottom="@dimen/dp_10"
android:layout_weight="2"
android:background="@color/white"
app:cardCornerRadius="5dp">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
......@@ -279,7 +299,9 @@
android:layout_width="@dimen/size_30"
android:layout_height="@dimen/size_30"
android:layout_centerVertical="true"
android:layout_marginTop="@dimen/size_10"
android:layout_marginRight="@dimen/size_5"
android:layout_marginBottom="@dimen/size_10"
android:layout_toLeftOf="@id/tv_parent_phone"
android:src="@drawable/icon_share_cir" />
......@@ -287,4 +309,7 @@
</android.support.v7.widget.CardView>
</LinearLayout>
</ScrollView>
</LinearLayout>
\ No newline at end of file
plugin_share/src/main/res/values/strings.xml
View file @ 9f5c007d
......@@ -3,7 +3,7 @@
<string-array name="popularize_list">
<item>收益记录</item>
<item>已邀请</item>
<item>待激活</item>
<item>已激活</item>
</string-array>
</resources>
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