fix bug

9cfc3748 · mReturn · 16d0953d · 9cfc3748 · 9cfc3748 · 9cfc3748
Commit 9cfc3748 authored Apr 14, 2020 by mReturn
Showing with 161 additions and 29 deletions
baseSDK/src/main/java/com/dayu/utils/CommonUtils.java
baseSDK/src/main/res/values/strings.xml
orderCenter/src/main/java/com/dayu/order/api/protocol/OrderDetail.java
orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessPresenter.java
orderCenter/src/main/java/com/dayu/order/presenter/orderserver/OrderServerContract.java
orderCenter/src/main/java/com/dayu/order/presenter/orderserver/OrderServerPresenter.java
orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderServerAdapter.java
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderDetailsServeFragment.java
orderCenter/src/main/res/layout/fragment_multi_detail.xml
orderCenter/src/main/res/layout/item_multi_process_foot.xml
userCenter/src/main/java/com/dayu/usercenter/ui/activity/FaceCertificationActivity.java
userCenter/src/main/res/values/strings.xml
--- a/baseSDK/src/main/java/com/dayu/utils/CommonUtils.java
+++ b/baseSDK/src/main/java/com/dayu/utils/CommonUtils.java
@@ -90,7 +90,9 @@ public class CommonUtils {
        return Double.valueOf(money).intValue() + context.getString(R.string.money);
    }
-    //计算并设置时间
+    /**
+     * 计算并设置时间
+     */
    public static String getTimeDesc(Context context, String time) {
        if (TextUtils.isEmpty(time)) {
            return "";
@@ -130,6 +132,27 @@ public class CommonUtils {
            return "";
        }
    }
+    /**
+     * 计算工单（预约/服务）时间差
+     */
+    public static long caluteTimeDiff(String time) {
+        if (TextUtils.isEmpty(time)) {
+            return 0;
+        }
+        try {
+            long nowTime = System.currentTimeMillis();
+            Date nowData = new Date(nowTime);
+            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            Date nowDate = df.parse(df.format(nowData));
+            Date pubData = df.parse(time);
+            // 计算时间差
+            long dTime = pubData.getTime() - nowDate.getTime(); //时间差
+            return dTime;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
    /**
     * List转String

--- a/baseSDK/src/main/res/values/strings.xml
+++ b/baseSDK/src/main/res/values/strings.xml
@@ -394,6 +394,7 @@
    <string name="no_cancle">取消原因:暂无</string>
    <string name="check_content">验收内容</string>
    <string name="system_chcek">系统验收</string>
+    <string name="user_chcek">提交验收</string>
    <string name="single_server_num">已完成%1$d/共%2$d</string>
    <string name="server_num">共%1$d项服务</string>
    <string name="company_mobile">联系技术支持</string>
@@ -778,7 +779,8 @@ C) åœ¨ç”²æ–¹ä½¿ç”¨å¤§é±¼å¹³å°æœåŠ¡è¿‡ç¨‹ä¸äº§ç”Ÿçš„ä¸šåŠ¡æ•°æ®ï¼Œå®¢æˆ·æ•°æ
    <string name="order_sender">派单方</string>
    <string name="order_send_info">派单信息</string>
    <string name="order_send_company">派单商家</string>
-    <string name="order_take_price">接单费用</string>
+    <string name="order_take_price">接单工费</string>
+    <string name="take_price_subsidy">工费补贴</string>
    <string name="contact_seller_support">联系商家技术支持</string>
    <string name="stand_operate_step_">标准操作步骤：</string>
    <string name="no_mobile">暂无联系方式</string>

--- a/orderCenter/src/main/java/com/dayu/order/api/protocol/OrderDetail.java
+++ b/orderCenter/src/main/java/com/dayu/order/api/protocol/OrderDetail.java
@@ -79,7 +79,15 @@ public class OrderDetail implements Serializable {
    private Integer payStatus;//或null:未支付 2.已支付3.支付成功4.支付失败
    private String createdProvider;
    private double price;
+    private double subsidyPrice;
+    public double getSubsidyPrice() {
+        return subsidyPrice;
+    }
+    public void setSubsidyPrice(double subsidyPrice) {
+        this.subsidyPrice = subsidyPrice;
+    }
    public Integer getNeedSerialNumPic() {
        return needSerialNumPic;

--- a/orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessPresenter.java
+++ b/orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessPresenter.java
@@ -221,6 +221,7 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter 
            if (payType != null ) {
                mView.setOrderDetail(detail);
                mView.setPayType(payType);
+                mView.setOrderSource(detail.getSource());
            }
            if (detail.getPayStatus() == 3 && detail.getPayType() == 1) {
                mCanProcess = true;

--- a/orderCenter/src/main/java/com/dayu/order/presenter/orderserver/OrderServerContract.java
+++ b/orderCenter/src/main/java/com/dayu/order/presenter/orderserver/OrderServerContract.java
@@ -11,6 +11,7 @@ import com.dayu.common.BaseView;
 public interface OrderServerContract {
    interface View extends BaseView {
+        void checkSignature(String esignatureImg);
    }
    abstract class Presenter extends BaseListPresenter<View> {
@@ -22,5 +23,6 @@ public interface OrderServerContract {
        public abstract void dumpLogistics(String courierNum,String shipperCode);
+        public abstract void dumpCheckSignature(int position);
    }
 }
--- a/orderCenter/src/main/java/com/dayu/order/presenter/orderserver/OrderServerPresenter.java
+++ b/orderCenter/src/main/java/com/dayu/order/presenter/orderserver/OrderServerPresenter.java
@@ -2,7 +2,9 @@ package com.dayu.order.presenter.orderserver;
 import android.databinding.ObservableField;
 import android.os.Bundle;
+import android.text.TextUtils;
+import com.dayu.base.ui.activity.ImgGalleryActivty;
 import com.dayu.common.Constants;
 import com.dayu.location.base.BaseMapActivity;
 import com.dayu.order.R;
@@ -95,6 +97,15 @@ public class OrderServerPresenter extends OrderServerContract.Presenter {
        mView.startActivity(LogisticsInfoActivity.class, bundle);
    }
+    @Override
+    public void dumpCheckSignature(int position) {
+        if (TextUtils.isEmpty(mDetails.getEsignatureImg())){
+            ToastUtils.showShortToast("暂无签名");
+        }else{
+            mView.checkSignature(mDetails.getEsignatureImg());
+        }
+    }
    public OrderDetail getDetail() {
        return mDetails;
    }

--- a/orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java
@@ -66,7 +66,7 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
    private TextView mIcon;
    private LinearLayout mSignature;
    private boolean isShowSignature;
-    private boolean payTypeSetted;
+    private boolean isSpmOrder; //是否是服务站下的单
    private TextView mTotalMoney;
    private TextView mCashPay;
    private TextView mPublicPay;
@@ -130,7 +130,7 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
        llPaywayNotice = view.findViewById(R.id.ll_payway_notice);
        mNoPay.setOnClickListener(v -> {
-            if (payTypeSetted) {
+            if (isSpmOrder) {
 //                ToastUtils.showShortToast(getString(R.string.can_not_repet_get_money));
            } else {
                mPayType = 3;
@@ -141,7 +141,7 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
            }
        });
        mWechatPay.setOnClickListener(v -> {
-            if (payTypeSetted) {
+            if (isSpmOrder) {
 //                ToastUtils.showShortToast(getString(R.string.can_not_repet_get_money));
            } else {
                if (mWechatStatus) {
@@ -157,7 +157,7 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
            }
        });
 //        mCashPay.setOnClickListener(v -> {
-//            if (payTypeSetted) {
+//            if (isSpmOrder) {
 ////                ToastUtils.showShortToast(getString(R.string.can_not_repet_get_money));
 //            } else {
 //                mPayType = 2;
@@ -168,7 +168,7 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
 //        });
        mPublicPay.setOnClickListener(v -> {
-            if (payTypeSetted) {
+            if (isSpmOrder) {
 //                ToastUtils.showShortToast(getString(R.string.can_not_repet_get_money));
            } else {
                mPayType = 4;
@@ -193,10 +193,10 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
        initTotal();
        mScanPay.setOnClickListener(v -> {
-//            if (TextUtils.isEmpty(getSum()) || Double.parseDouble(getSum()) == 0.00) {
+            if (TextUtils.isEmpty(getSum()) || Double.parseDouble(getSum()) == 0.00) {
-//                ToastUtils.showShortToast("请输入金额!");
+                ToastUtils.showShortToast("收款金额需大于0");
-//                return;
+                return;
-//            }
+            }
            new IntentIntegrator(this).setOrientationLocked(false).setCaptureActivity(CustomScannerActivity.class).initiateScan();
        });
    }
@@ -245,6 +245,7 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
        mScan.setImageResource(R.drawable.icon_succeed);
        mNoPay.setEnabled(false);
        mWechatPay.setEnabled(false);
+        mPublicPay.setEnabled(false);
        mCashPay.setEnabled(false);
        mDoorPrice.setEnabled(false);
        mMaterialsPrice.setEnabled(false);
@@ -346,11 +347,17 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
    @Override
    public HashMap<String, Object> getParams() {
+        String doorPrice = mMaterialsPrice.getText().toString().trim();
+        String servicePrice = mServerPrice.getText().toString().trim();
+        if (TextUtils.isEmpty(doorPrice))
+            doorPrice = "0.00";
+        if (TextUtils.isEmpty(servicePrice))
+            servicePrice = "0.00";
        HashMap<String, Object> params = new HashMap<>();
        if (mDoorPrice != null) {
 //            params.put("doorPrice", mDoorPrice.getText().toString().trim());
-            params.put("doorPrice", mMaterialsPrice.getText().toString().trim());
+            params.put("doorPrice", doorPrice);
-            params.put("servicePrice", mServerPrice.getText().toString().trim());
+            params.put("servicePrice", servicePrice);
            params.put("materialCost", mMaterialsPrice.getText().toString().trim());
            params.put("otherPrice", mOtherPrice.getText().toString().trim());
            params.put("doorPriceComment", mDoorInfo.getText().toString().trim());
@@ -371,7 +378,15 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
    public HashMap<String, Object> getPayParam() {
        HashMap<String, Object> params = new HashMap<>();
        if (mDoorPrice != null) {
-            params.put("doorPrice", mDoorPrice.getText().toString().trim());
+            String doorPrice = mMaterialsPrice.getText().toString().trim();
+            String servicePrice = mServerPrice.getText().toString().trim();
+            if (TextUtils.isEmpty(doorPrice))
+                doorPrice = "0.00";
+            if (TextUtils.isEmpty(servicePrice))
+                servicePrice = "0.00";
+//            params.put("doorPrice", mDoorPrice.getText().toString().trim());
+            params.put("doorPrice", doorPrice);
+            params.put("servicePrice", servicePrice);
            params.put("materialCost", mMaterialsPrice.getText().toString().trim());
            params.put("otherPrice", mOtherPrice.getText().toString().trim());
            params.put("doorPriceComment", mDoorInfo.getText().toString().trim());
@@ -434,16 +449,16 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
            case 1:
                setPayWayBackGround(mWechatPay);
                mRlPay.setVisibility(View.VISIBLE);
-                if (Double.parseDouble(getTotalMoney()) > 0){
+//                if (Double.parseDouble(getTotalMoney()) > 0){
                    llScanPay.setVisibility(View.VISIBLE);
                    llPaywayNotice.setVisibility(View.VISIBLE);
                    mScanPay.setVisibility(View.VISIBLE);
-                }else {
+//                }else {
-                    llScanPay.setVisibility(View.GONE);
+//                    llScanPay.setVisibility(View.GONE);
-                    llPaywayNotice.setVisibility(View.GONE);
+//                    llPaywayNotice.setVisibility(View.GONE);
-                    mScanPay.setVisibility(View.GONE);
+//                    mScanPay.setVisibility(View.GONE);
-                    mPresenter.setmCanProcess(true);
+//                    mPresenter.setmCanProcess(true);
-                }
+//                }
                break;
            case 3:
                setPayWayBackGround(mNoPay);
@@ -458,11 +473,14 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
    @Override
    public void setOrderSource(int source) {
+        //1,5服务站/服务商  4,6小程序/EU
        if (source == 1 || source == 5){
-            payTypeSetted = false;
+            isSpmOrder = true;
        }else {
-            payTypeSetted = false;
+            isSpmOrder = false;
        }
+        mServerPrice.setEnabled(!isSpmOrder);
+        mMaterialsPrice.setEnabled(!isSpmOrder);
    }
    @Override

--- a/orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
 package com.dayu.order.ui.adapter;
 import android.content.Intent;
+import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -28,6 +29,8 @@ import com.dayu.order.ui.activity.SubcribeTimeActivity;
 import com.dayu.provider.event.RefreshServe;
 import com.dayu.provider.event.RefreshTab;
 import com.dayu.provider.router.RouterPath;
+import com.dayu.utils.CommonUtils;
+import com.dayu.utils.LogUtils;
 import com.dayu.utils.ProgressUtil;
 import com.dayu.utils.SPUtils;
 import com.dayu.utils.UIUtils;
@@ -143,6 +146,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
                holder.tvOrderTime.setText(mContext.getString(R.string.have_appointment));
                time = item.getAppointmentTime();
+                setTimeStatus(holder,time);
                break;
            case 3://待服务
                holder.tvItemProcess.setVisibility(View.GONE);
@@ -163,6 +167,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
                    holder.tvItemProcess.setText(mContext.getString(R.string.begain_server));
                }
                time = item.getConfirmDoorTime();
+                setTimeStatus(holder,time);
                break;
            case 4://待处理
                holder.tvItemProcess.setVisibility(View.GONE);
@@ -198,6 +203,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
                    holder.orderLineTwo.setVisibility(View.VISIBLE);
                }
                time = item.getConfirmDoorTime();
+                setTimeStatus(holder,time);
                break;
            case 5://已完成
                holder.tvErrorState.setText(mContext.getString(R.string.order_finish));
@@ -318,6 +324,23 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
        }
    }
+    //根据时间状态设置不同颜色
+    private void setTimeStatus(FragmentOrderdoingItemBinding holder,String time) {
+        long timeDiff = CommonUtils.caluteTimeDiff(time);
+        double timeMin = timeDiff/60000.0; //相差分钟数
+        if (timeMin<0){
+            holder.itemTody.setTextColor(Color.parseColor("#FF5A4B"));
+            holder.itemTime.setTextColor(Color.parseColor("#FF5A4B"));
+        }else if (timeMin<120){
+            holder.itemTody.setTextColor(Color.parseColor("#ffbe2d"));
+            holder.itemTime.setTextColor(Color.parseColor("#ffbe2d"));
+        }else{
+            holder.itemTody.setTextColor(Color.parseColor("#FF3FAAFC"));
+            holder.itemTime.setTextColor(Color.parseColor("#FF3FAAFC"));
+        }
+    }
    private void processClickNew(Order it, FragmentOrderdoingItemBinding h, int posiiton) {
        mItem = it;

--- a/orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderServerAdapter.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderServerAdapter.java
@@ -9,6 +9,7 @@ import com.dayu.order.R;
 import com.dayu.order.api.protocol.OrderDetail;
 import com.dayu.order.databinding.ServeDatailsItemBinding;
 import com.dayu.order.presenter.orderserver.OrderServerPresenter;
+import com.dayu.utils.LogUtils;
 import com.dayu.utils.UIUtils;
 /**
@@ -97,7 +98,16 @@ public class OrderServerAdapter extends CoreAdapter<OrderDetail.RecordBean, Serv
                holder.serverCheck.setText(item.getCommentName());
            }
        }
-        if (UIUtils.getString(R.string.check_accept).equals(item.getCommentName()) || UIUtils.getString(R.string.system_chcek).equals(item.getOperation())) {
+        if (UIUtils.getString(R.string.user_chcek).equals(item.getOperation())) {
+            holder.serverCheck.setText(UIUtils.getString(R.string.check_signature));
+            holder.serverCheck.setVisibility(View.VISIBLE);
+            holder.serverTimeComment.setVisibility(View.GONE);
+        }
+//        if (UIUtils.getString(R.string.check_accept).equals(item.getCommentName()) || UIUtils.getString(R.string.system_chcek).equals(item.getOperation())) {
+        if (UIUtils.getString(R.string.system_chcek).equals(item.getOperation())) {
            if (mDetail.getCreatedSource() == 2 || mDetail.getCreatedSource() == 3 || mDetail.getCreatedSource() == 4) {
                holder.serverCheck.setVisibility(View.GONE);
            } else {
@@ -105,6 +115,9 @@ public class OrderServerAdapter extends CoreAdapter<OrderDetail.RecordBean, Serv
            }
            holder.serverCheck.setOnClickListener(v -> presenter.dumpCheckContent(position));
        }
+        if (UIUtils.getString(R.string.user_chcek).equals(item.getOperation())) {
+            holder.serverCheck.setOnClickListener(v -> presenter.dumpCheckSignature(position));
+        }
        if (UIUtils.getString(R.string.order_remark).equals(item.getCommentName())) {
            holder.serverCheck.setOnClickListener(v -> presenter.dumpCheckContent(position));
        }

--- a/orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderDetailsServeFragment.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderDetailsServeFragment.java
@@ -2,6 +2,7 @@ package com.dayu.order.ui.fragment;
 import android.os.Bundle;
+import com.dayu.base.ui.activity.ImgGalleryActivty;
 import com.dayu.base.ui.fragment.BaseFragment;
 import com.dayu.common.Constants;
 import com.dayu.order.R;
@@ -54,4 +55,9 @@ public class OrderDetailsServeFragment extends BaseFragment<OrderServerPresenter
            MobclickAgent.onPageStart(TAG);
        }
    }
+    @Override
+    public void checkSignature(String esignatureImg) {
+        ImgGalleryActivty.launch(mActivity,esignatureImg);
+    }
 }
--- a/orderCenter/src/main/res/layout/fragment_multi_detail.xml
+++ b/orderCenter/src/main/res/layout/fragment_multi_detail.xml
@@ -322,6 +322,7 @@
                        android:textSize="14sp" />
                    <TextView
+                        android:visibility="gone"
                        android:id="@+id/customer_signature"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
@@ -395,7 +396,7 @@
                        <TextView
                            android:id="@+id/tv_customer_address"
-                            android:layout_width="0dp"
+                            android:layout_width="245dp"
                            android:layout_height="wrap_content"
                            android:layout_weight="1"
                            android:ellipsize="end"
@@ -536,6 +537,28 @@
                        android:text='@{item.price+"元"}'
                        android:textColor="@color/common_red"
                        android:textSize="14sp" />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/dp_15"
+                        android:text="@string/take_price_subsidy"
+                        android:textColor="@color/tv_cl"
+                        android:textSize="14sp" />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:layout_marginTop="@dimen/dp_15"
+                        android:text='@{item.subsidyPrice+"元"}'
+                        android:textColor="@color/common_red"
+                        android:layout_marginRight="50dp"
+                        android:textSize="14sp" />
                </LinearLayout>
                <TextView

--- a/orderCenter/src/main/res/layout/item_multi_process_foot.xml
+++ b/orderCenter/src/main/res/layout/item_multi_process_foot.xml
@@ -251,6 +251,7 @@
                    android:layout_centerHorizontal="true"
                    android:background="@null"
                    android:hint="@string/input_up_door_money"
+                    android:text="0.00"
                    android:inputType="numberDecimal"
                    android:textColor="@color/cl_home_title_text_color"
                    android:textColorHint="@color/cl_selector_hui"
@@ -291,7 +292,6 @@
                    android:textSize="@dimen/sp_13.3" />
                <EditText
-                    android:enabled="false"
                    android:id="@+id/et_serve_price"
                    android:layout_width="@dimen/dp_205"
                    android:layout_height="match_parent"
@@ -339,7 +339,6 @@
                    android:textSize="@dimen/sp_13.3" />
                <EditText
-                    android:enabled="false"
                    android:id="@+id/et_materials_price"
                    android:layout_width="@dimen/dp_205"
                    android:layout_height="match_parent"
@@ -394,6 +393,7 @@
                    android:layout_centerHorizontal="true"
                    android:background="@null"
                    android:hint="@string/input_other_money"
+                    android:text="0.00"
                    android:inputType="numberDecimal"
                    android:textColor="@color/cl_home_title_text_color"
                    android:textColorHint="@color/cl_selector_hui"

--- a/userCenter/src/main/java/com/dayu/usercenter/ui/activity/FaceCertificationActivity.java
+++ b/userCenter/src/main/java/com/dayu/usercenter/ui/activity/FaceCertificationActivity.java
@@ -127,8 +127,10 @@ public class FaceCertificationActivity extends BaseActivity<FaceCertificaitonPre
                if (image_best == null || image_env == null || image_action1 == null
                        || image_action2 == null || image_action3 == null) {
                    MobclickAgent.onEvent(this, "face_img_null");
+                    ToastUtils.showShortToast("图片获取失败");
+                }else {
+                    mPresenter.commitePhoto(list, delta);
                }
-                mPresenter.commitePhoto(list, delta);
            } else {
                checkID(resID);
            }

--- a/userCenter/src/main/res/values/strings.xml
+++ b/userCenter/src/main/res/values/strings.xml
@@ -33,7 +33,7 @@
    <string name="sale_record_rule4_2">的佣金，对于[消费返利]平台收取每笔返利金额</string>
    <string name="sale_record_rule4_3">的佣金。（佣金含依法代扣代缴个人劳务收入所得税费和支付手续费等）</string>
    <string name="invate_reward_rule">奖励规则:</string>
-    <string name="invate_reward_rule1">1、成功邀请一名新人注册大鱼师傅APP，被邀请人前三单销售奖励/服务收入的10%都归您。</string>
+    <string name="invate_reward_rule1">1、成功邀请一名新人注册大鱼师傅APP, 被邀请人的销售奖励/服务收入的5%给您。</string>
    <string name="invate_reward_rule2">2、请务必提醒被邀请人在注册APP时准确输入您的【专属邀请码】；如果输入错误或忘记输入，系统无法识别并记账。</string>
    <string name="remember_your_invate_code">请牢记您的专属邀请码：</string>
    <string name="forward_invate_now">马上转发\n【大鱼师傅APP】注册链接</string>