修改禅道上的bug

module_home/src/main/java/com/rv/home/rv/module/ApiConfig.java

@@ -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

@@ -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

@@ -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

@@ -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

 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

 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()));
 
-        StringBuilder builder = new StringBuilder();
-        builder.append("+").append(item.getCommission()).append("元");
-        helper.setText(R.id.tv_income_price, builder.toString());
-
+        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

 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

@@ -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

@@ -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

+<?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/values/strings.xml

@@ -3,7 +3,7 @@
 
     <string-array name="popularize_list">
         <item>收益记录</item>
-        <item>已邀请</item>
+        <item>待激活</item>
         <item>已激活</item>
     </string-array>
 </resources>