工单优化

0bf5ccfd · mReturn · 3e0b61f3 · 0bf5ccfd · 0bf5ccfd · 0bf5ccfd
Commit 0bf5ccfd authored Mar 24, 2020 by mReturn
Showing with 427 additions and 66 deletions
app/src/main/java/com/dayu/bigfish/MyApplication.java
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
app/src/main/java/com/dayu/bigfish/ui/service/LocationService.java
baseSDK/src/main/res/values/strings.xml
baseSDK/src/main/res/values/styles.xml
orderCenter/src/main/java/com/dayu/order/ui/activity/MultiProcessOrderActivity.java
orderCenter/src/main/java/com/dayu/order/ui/activity/ReturnPartActivity.java
orderCenter/src/main/res/layout/activity_return_part.xml
userCenter/src/main/java/com/dayu/usercenter/presenter/homeuser/HomeUserContract.java
userCenter/src/main/java/com/dayu/usercenter/presenter/homeuser/HomeUserPresenter.java
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/CashRecordActivity.java
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/ServiceRecordActivity.java → userCenter/src/main/java/com/dayu/usercenter/ui/activity2/CommonRecordActivity.java
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/InvateNewActivity.java
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java
userCenter/src/main/release/AndroidManifest.xml
userCenter/src/main/res/layout/activity_cash_record.xml
userCenter/src/main/res/layout/activity_service_record.xml → userCenter/src/main/res/layout/activity_common_record.xml
userCenter/src/main/res/layout/activity_invate_new.xml
userCenter/src/main/res/layout/fragment_home_user.xml
userCenter/src/main/res/values/strings.xml
--- a/app/src/main/java/com/dayu/bigfish/MyApplication.java
+++ b/app/src/main/java/com/dayu/bigfish/MyApplication.java
@@ -7,6 +7,7 @@ import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.net.ConnectivityManager;
 import android.net.wifi.WifiManager;
+import android.os.Build;
 import android.os.Handler;
 import android.support.annotation.NonNull;
@@ -125,13 +126,22 @@ public class MyApplication extends BaseApplication {
    @Override
    public void runBackGround() {
-        startService(new Intent(mContext, LocationService.class));
+        startLocationService();
    }
    @Override
    public void runFrontGround() {
+        startLocationService();
+    }
+    private void startLocationService() {
+//        startService(new Intent(mContext, LocationService.class));
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            startForegroundService(new Intent(mContext, LocationService.class));
+        } else {
            startService(new Intent(mContext, LocationService.class));
        }
+    }
    public static MyApplication getAppContext() {
        return myApplication;

--- a/app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
+++ b/app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
@@ -111,7 +111,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
 //            managerFragment = ManagerFragment.newInstance();
 //            mFragments = new Fragment[]{managerFragment, secondFragment, thirdFragment, fourFragment};
            mFragments = new Fragment[]{ saleFragment,secondFragment, fourFragment};
-            mFirstPositon = 1;
+            mFirstPositon = 0;
            mBind.tabFirst.setText(getString(R.string.send_order));
        }
 //        mTabs = new TextView[]{mBind.tabFirst, mBind.tabSecond, mBind.tabThird, mBind.tabFour};

--- a/app/src/main/java/com/dayu/bigfish/ui/service/LocationService.java
+++ b/app/src/main/java/com/dayu/bigfish/ui/service/LocationService.java
 package com.dayu.bigfish.ui.service;
 import android.annotation.SuppressLint;
+import android.app.Notification;
 import android.app.Service;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
@@ -38,6 +40,9 @@ public class LocationService extends Service {
    @Override
    public void onCreate() {
        super.onCreate();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            startForeground(1,new Notification());
+        }
        mHandler = new Handler() {
            @Override
            public void handleMessage(Message msg) {

--- a/baseSDK/src/main/res/values/strings.xml
+++ b/baseSDK/src/main/res/values/strings.xml
@@ -895,7 +895,15 @@ C) åœ¨ç”²æ–¹ä½¿ç”¨å¤§é±¼å¹³å°æœåŠ¡è¿‡ç¨‹ä¸äº§ç”Ÿçš„ä¸šåŠ¡æ•°æ®ï¼Œå®¢æˆ·æ•°æ
    <!--user-->
    <string name="user_customer_satisfied">客户满意度</string>
+    <string name="user_cash_arrive">现金到账:</string>
+    <string name="cash_arrive_record">现金到账记录</string>
    <string name="user_sale_reward">销售奖励</string>
+    <string name="user_invate_reward">邀请奖励</string>
+    <string name="invate_person_count">邀请人数</string>
+    <string name="reward_total_money">奖励总额</string>
+    <string name="be_rewarded_count">获奖次数</string>
+    <string name="invate_new_reward">邀请新人有奖</string>
+    <string name="user_platform_reward">平台奖励</string>
    <string name="user_service_income">服务收入</string>
    <string name="user_service_record">服务业绩</string>
    <string name="user_sale_record">销售业绩</string>

--- a/baseSDK/src/main/res/values/styles.xml
+++ b/baseSDK/src/main/res/values/styles.xml
@@ -77,7 +77,7 @@
    </style>
    <style name="part_addr_edit" parent="common_text_style">
-        <item name="android:maxLines">1</item>
+        <item name="android:singleLine">true</item>
        <item name="android:layout_width">match_parent</item>
        <item name="android:layout_height">35dp</item>
        <item name="android:padding">2dp</item>

--- a/orderCenter/src/main/java/com/dayu/order/ui/activity/MultiProcessOrderActivity.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/activity/MultiProcessOrderActivity.java
@@ -14,6 +14,7 @@ import com.dayu.order.databinding.ActivityMultiProcessOrderBinding;
 import com.dayu.order.presenter.multiprocessorder.MultiProcessOrderContract;
 import com.dayu.order.presenter.multiprocessorder.MultiProcessOrderPresenter;
 import com.dayu.utils.GlideImageLoader;
+import com.dayu.utils.ToastUtils;
 import com.google.zxing.integration.android.IntentIntegrator;
 import com.google.zxing.integration.android.IntentResult;
 import com.luck.picture.lib.PictureSelectionModel;
@@ -47,6 +48,7 @@ public class MultiProcessOrderActivity extends BaseActivity<MultiProcessOrderPre
    @Override
    public void initView() {
+        ToastUtils.showShortToast("multi");
        mBind.ivSn.setOnClickListener(v -> {
            if (mSnImages.size() > 0) {
                dumpPic(mSnImages);

--- a/orderCenter/src/main/java/com/dayu/order/ui/activity/ReturnPartActivity.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/activity/ReturnPartActivity.java
 package com.dayu.order.ui.activity;
+import android.content.Intent;
+import android.view.View;
 import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
 import com.bigkoo.pickerview.listener.OnOptionsSelectListener;
 import com.bigkoo.pickerview.view.OptionsPickerView;
@@ -8,7 +11,13 @@ import com.dayu.order.R;
 import com.dayu.order.databinding.ActivityReturnPartBinding;
 import com.dayu.order.presenter.returnpart.ReturnPartContract;
 import com.dayu.order.presenter.returnpart.ReturnPartPresenter;
+import com.dayu.utils.GlideImageLoader;
 import com.dayu.utils.UIUtils;
+import com.google.zxing.integration.android.IntentIntegrator;
+import com.google.zxing.integration.android.IntentResult;
+import com.luck.picture.lib.PictureSelector;
+import com.luck.picture.lib.config.PictureConfig;
+import com.luck.picture.lib.entity.LocalMedia;
 import java.util.List;
@@ -25,7 +34,9 @@ public class ReturnPartActivity extends BaseActivity<ReturnPartPresenter, Activi
    @Override
    public void initView() {
+        mBind.scan.setOnClickListener(v ->
+                new IntentIntegrator(this).setOrientationLocked(false)
+                        .setCaptureActivity(CustomScannerActivity.class).initiateScan());
    }
    @Override
@@ -48,4 +59,18 @@ public class ReturnPartActivity extends BaseActivity<ReturnPartPresenter, Activi
    public void hideInput() {
        UIUtils.hideInput(mActivity);
    }
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        IntentResult result = IntentIntegrator.parseActivityResult(requestCode, resultCode, data);
+        if (result != null && requestCode == IntentIntegrator.REQUEST_CODE) {
+            if (result.getContents() == null) {
+//                toast = "Cancelled from fragment";
+            } else {
+                mBind.edtTransCode.setText(result.getContents());
+            }
+            return;
+        }
+    }
 }
--- a/orderCenter/src/main/res/layout/activity_return_part.xml
+++ b/orderCenter/src/main/res/layout/activity_return_part.xml
@@ -161,23 +161,30 @@
                        android:drawableLeft="@drawable/icon_star_necessary"
                        android:text="@string/part_trans_code" />
-                    <RelativeLayout
+                    <LinearLayout
                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+                        android:layout_height="35dp"
+                        android:orientation="horizontal"
+                        android:background="@drawable/bg_input_gray_react"
+                        android:gravity="center_vertical"
+                        >
                        <EditText
                            android:id="@+id/edt_trans_code"
-                            style="@style/part_addr_edit"
+                            android:layout_width="0dp"
+                            android:layout_weight="1"
+                            android:layout_height="match_parent"
+                            android:background="@color/transparent"
+                            android:padding="5dp"
+                            android:singleLine="true"
                            android:text="@={presenter.courierNum}" />
                        <ImageView
                            android:id="@+id/scan"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
-                            android:layout_alignParentRight="true"
-                            android:layout_centerVertical="true"
                            android:layout_marginRight="15dp"
                            android:src="@drawable/icon_scan" />
-                    </RelativeLayout>
+                    </LinearLayout>
                </LinearLayout>

--- a/userCenter/src/main/java/com/dayu/usercenter/presenter/homeuser/HomeUserContract.java
+++ b/userCenter/src/main/java/com/dayu/usercenter/presenter/homeuser/HomeUserContract.java
@@ -25,10 +25,8 @@ public interface HomeUserContract {
         */
        void showAlipayDialog();
-        /**
-         * 跳转到工单记录.
+        void toCommonRecord(int type);
-         */
-        void dumpToOrderRecord();
        /**
@@ -53,11 +51,6 @@ public interface HomeUserContract {
        public abstract void dumpToSetting();
        /**
-         * 跳转到工单记录.
-         */
-        public abstract void dumpToOrderRecord();
-        /**
         * 跳转到资质列表.
         */
        public abstract void dumpToLicence();

--- a/userCenter/src/main/java/com/dayu/usercenter/presenter/homeuser/HomeUserPresenter.java
+++ b/userCenter/src/main/java/com/dayu/usercenter/presenter/homeuser/HomeUserPresenter.java
@@ -2,24 +2,14 @@ package com.dayu.usercenter.presenter.homeuser;
 import android.databinding.ObservableField;
-import com.dayu.common.BaseApplication;
-import com.dayu.common.Constants;
 import com.dayu.usercenter.api.UserApiFactory;
-import com.dayu.usercenter.data.protocol.EngineerInfo;
-import com.dayu.usercenter.data.protocol.OrderRecord;
-import com.dayu.usercenter.data.protocol.TodayAchievement;
-import com.dayu.usercenter.data.protocol.TodayBalance;
-import com.dayu.usercenter.presenter.homefourtab.HomeFourContract;
-import com.dayu.usercenter.ui.activity.PersonInfoActivity;
-import com.dayu.usercenter.ui.activity.QualityCertificationActivity;
 import com.dayu.usercenter.ui.activity2.BusinessTypeActivity;
+import com.dayu.usercenter.ui.activity2.CashRecordActivity;
+import com.dayu.usercenter.ui.activity2.InvateNewActivity;
 import com.dayu.usercenter.ui.activity2.SaleRecordActivity;
-import com.dayu.usercenter.ui.activity2.ServiceRecordActivity;
+import com.dayu.usercenter.ui.activity2.CommonRecordActivity;
 import com.dayu.usercenter.ui.activity2.UserInfoActivity;
 import com.dayu.usercenter.ui.activity2.UserLicenceActivity;
-import com.umeng.analytics.MobclickAgent;
-import io.reactivex.Observable;
 /**
 * Created by luofan
@@ -72,11 +62,6 @@ public class HomeUserPresenter extends HomeUserContract.Presenter {
    }
    @Override
-    public void dumpToOrderRecord() {
-//        mView.startActivity(ServiceRecordActivity.class);
-    }
-    @Override
    public void dumpToLicence() {
        mView.startActivity(UserLicenceActivity.class);
    }
@@ -91,5 +76,16 @@ public class HomeUserPresenter extends HomeUserContract.Presenter {
        mView.startActivity(BusinessTypeActivity.class);
    }
+    public void dumpToInvate() {
+        mView.startActivity(InvateNewActivity.class);
+    }
+    public void dumpToCacheRecord() {
+        mView.startActivity(CashRecordActivity.class);
+    }
+    public void toCommonRecord(int type) {
+        mView.toCommonRecord(type);
+    }
 }
--- a/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/CashRecordActivity.java
+++ b/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/CashRecordActivity.java
+package com.dayu.usercenter.ui.activity2;
+import com.dayu.base.ui.activity.BaseActivity;
+import com.dayu.base.ui.presenter.SImplePresenter;
+import com.dayu.usercenter.R;
+import com.dayu.usercenter.databinding.ActivityCashRecordBinding;
+public class CashRecordActivity extends BaseActivity<SImplePresenter,ActivityCashRecordBinding> {
+    @Override
+    public void setPresenter() {
+    }
+    @Override
+    public int getLayoutId() {
+        return R.layout.activity_cash_record;
+    }
+    @Override
+    public void initView() {
+        mBind.receivingBack.setOnClickListener(view -> dumpBack());
+    }
+}
--- a/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/ServiceRecordActivity.java
+++ b/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/ServiceRecordActivity.java
 package com.dayu.usercenter.ui.activity2;
+import android.content.Context;
+import android.content.Intent;
 import android.support.v7.widget.LinearLayoutManager;
 import com.chad.library.adapter.base.BaseQuickAdapter;
@@ -7,7 +9,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
 import com.dayu.base.ui.activity.BaseActivity;
 import com.dayu.base.ui.presenter.SImplePresenter;
 import com.dayu.usercenter.R;
-import com.dayu.usercenter.databinding.ActivityServiceRecordBinding;
+import com.dayu.usercenter.databinding.ActivityCommonRecordBinding;
 import java.util.ArrayList;
 import java.util.List;
@@ -16,27 +18,55 @@ import java.util.List;
 * Created by mReturn
 * on 2020/2/15
 **/
-public class ServiceRecordActivity extends BaseActivity<SImplePresenter,ActivityServiceRecordBinding> {
+public class CommonRecordActivity extends BaseActivity<SImplePresenter,ActivityCommonRecordBinding> {
-    @Override
+    int mType; // 1.服务业绩 2.邀请奖励 3.平台奖励
-    public void setPresenter() {
+    @Override
+    public int getLayoutId() {
+        return R.layout.activity_common_record;
    }
    @Override
-    public int getLayoutId() {
+    public void setPresenter() {
-        return R.layout.activity_service_record;
+    }
+    public static void launch(Context context,int type){
+        Intent intent = new Intent(context,CommonRecordActivity.class);
+        intent.putExtra("type",type);
+        context.startActivity(intent);
    }
    @Override
    public void initView() {
+        mType = getIntent().getIntExtra("type",0);
        mBind.receivingBack.setOnClickListener(v->dumpBack());
+        initTopView();
        setAdapter();
    }
+    private void initTopView() {
+        switch (mType){
+            case 2:
+                mBind.tvTitle.setText(R.string.user_invate_reward);
+                mBind.tvIncomeDesc.setText(R.string.reward_total_money);
+                mBind.tvCountDesc.setText(R.string.invate_person_count);
+                mBind.tvTableTitle1.setText(R.string.share_reward_money);
+                mBind.tvTableTitle2.setText(R.string.be_invated_person);
+                break;
+            case 3:
+                mBind.tvTitle.setText(R.string.user_platform_reward);
+                mBind.tvIncomeDesc.setText(R.string.reward_total_money);
+                mBind.tvCountDesc.setText(R.string.be_rewarded_count);
+                mBind.tvTableTitle1.setText(R.string.reward_str);
+                mBind.tvTableTitle2.setText(R.string.reward_things);
+                break;
+        }
+    }
    private void setAdapter() {
        List<String> testList = new ArrayList<>();
-        for (int i = 0; i < 15; i++) {
+        for (int i = 0; i < 30; i++) {
            testList.add("test data" + i);
        }

--- a/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/InvateNewActivity.java
+++ b/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/InvateNewActivity.java
+package com.dayu.usercenter.ui.activity2;
+import com.dayu.base.ui.activity.BaseActivity;
+import com.dayu.base.ui.presenter.SImplePresenter;
+import com.dayu.usercenter.R;
+import com.dayu.usercenter.databinding.ActivityInvateNewBinding;
+/**
+ * 邀请新人有奖
+ */
+public class InvateNewActivity extends BaseActivity<SImplePresenter,ActivityInvateNewBinding> {
+    @Override
+    public void setPresenter() {
+    }
+    @Override
+    public int getLayoutId() {
+        return R.layout.activity_invate_new;
+    }
+    @Override
+    public void initView() {
+        mBind.receivingBack.setOnClickListener(v->dumpBack());
+    }
+}
--- a/userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java
+++ b/userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java
@@ -25,6 +25,7 @@ import com.dayu.usercenter.event.RefreshUserRecordEvent;
 import com.dayu.usercenter.presenter.homeuser.HomeUserContract;
 import com.dayu.usercenter.presenter.homeuser.HomeUserPresenter;
 import com.dayu.usercenter.ui.activity.WithdrawalsActivity;
+import com.dayu.usercenter.ui.activity2.CommonRecordActivity;
 import com.dayu.usercenter.ui.activity2.UserInfoActivity;
 import com.dayu.utils.CommonUtils;
 import com.dayu.utils.ProgressUtil;
@@ -139,14 +140,14 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
        //认证资质
        mBind.tvLicence.setText(record.getLicenceInfoNum() + "");
        //工单记录
-        mBind.tvWorkOrders.setText(record.getOrderRecord() + "");
+//        mBind.tvWorkOrders.setText(record.getOrderRecord() + "");
        //个人评分
        mBind.tvScore.setText(record.getScore() + mActivity.getString(R.string.score));
        mScore = record.getScore() + "";
        drawStars(mBind.tvStar, mScore, "5");
        mBind.tvSaleReward.setText(""+record.getSalesPrice());
-        mBind.tvSaleRecord.setText(record.getSalesCount() + "");
+//        mBind.tvSaleRecord.setText(record.getSalesCount() + "");
        mBind.tvServiceIncome.setText(""+record.getServiceTotalPrice());
        mBind.tvBusinessType.setText(record.getCategoryCounts()+"");
    }
@@ -161,9 +162,10 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
        }
    }
-    @Override
-    public void dumpToOrderRecord() {
+    @Override
+    public void toCommonRecord(int type) {
+        CommonRecordActivity.launch(mActivity,type);
    }

--- a/userCenter/src/main/release/AndroidManifest.xml
+++ b/userCenter/src/main/release/AndroidManifest.xml
@@ -84,7 +84,7 @@
            android:name=".ui.activity2.SaleRecordActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name=".ui.activity2.ServiceRecordActivity"
+            android:name=".ui.activity2.CommonRecordActivity"
            android:screenOrientation="portrait" />
        <activity
            android:name=".ui.activity2.EditBankActivity"
@@ -94,6 +94,12 @@
            android:name=".ui.activity2.EditAddressActivity"
            android:windowSoftInputMode="stateHidden"
            android:screenOrientation="portrait" />
+        <activity
+            android:name=".ui.activity2.InvateNewActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".ui.activity2.CashRecordActivity"
+            android:screenOrientation="portrait" />
    </application>
 </manifest>
--- a/userCenter/src/main/res/layout/activity_cash_record.xml
+++ b/userCenter/src/main/res/layout/activity_cash_record.xml
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+        <RelativeLayout
+            android:id="@+id/title_back"
+            style="@style/title">
+            <TextView
+                android:id="@+id/tv_title"
+                style="@style/text_title"
+                android:text="@string/cash_arrive_record" />
+            <ImageView
+                android:id="@+id/receiving_back"
+                style="@style/title_image_back"
+                />
+        </RelativeLayout>
+        <ImageView style="@style/card_line" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_marginTop="5dp"
+            android:padding="1dp"
+            android:orientation="horizontal">
+            <TextView
+                style="@style/sale_item_text"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1.5"
+                android:background="@drawable/bg_order_step_title1"
+                android:gravity="center"
+                android:text="@string/arrive_time" />
+            <TextView
+                style="@style/sale_item_text"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@drawable/bg_order_step_title3"
+                android:gravity="center"
+                android:text="@string/arrive_money" />
+        </LinearLayout>
+        <com.scwang.smartrefresh.layout.SmartRefreshLayout
+            android:id="@+id/refresh_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginBottom="65dp"
+            android:paddingLeft="15dp"
+            android:paddingRight="15dp">
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/rv_cache"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="15dp"
+                android:overScrollMode="never" />
+        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+    </LinearLayout>
+</layout>
\ No newline at end of file
--- a/userCenter/src/main/res/layout/activity_service_record.xml
+++ b/userCenter/src/main/res/layout/activity_service_record.xml
@@ -52,6 +52,7 @@
                    android:textSize="18sp" />
                <TextView
+                    android:id="@+id/tv_income_desc"
                    style="@style/sale_item_text"
                    android:text="@string/record_income_total"
                    android:textSize="14sp" />
@@ -65,6 +66,7 @@
                    android:textSize="18sp" />
                <TextView
+                    android:id="@+id/tv_count_desc"
                    style="@style/sale_item_text"
                    android:text="@string/record_done_service"
                    android:textSize="14sp" />
@@ -72,12 +74,13 @@
        </LinearLayout>
        <LinearLayout
-            android:layout_marginTop="15dp"
            android:layout_width="match_parent"
            android:layout_height="30dp"
+            android:layout_marginTop="15dp"
            android:orientation="horizontal">
            <TextView
+                android:id="@+id/tv_table_title1"
                style="@style/sale_item_text"
                android:layout_width="0dp"
                android:layout_height="match_parent"
@@ -87,6 +90,7 @@
                android:text="@string/income_money" />
            <TextView
+                android:id="@+id/tv_table_title2"
                style="@style/sale_item_text"
                android:layout_width="0dp"
                android:layout_height="match_parent"
@@ -96,6 +100,7 @@
                android:text="@string/oreder_sender_payer" />
            <TextView
+                android:id="@+id/tv_table_title3"
                style="@style/sale_item_text"
                android:layout_width="0dp"
                android:layout_height="match_parent"
@@ -105,11 +110,17 @@
                android:text="@string/pay_date" />
        </LinearLayout>
+        <com.scwang.smartrefresh.layout.SmartRefreshLayout
+            android:id="@+id/refresh_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
            <android.support.v7.widget.RecyclerView
                android:id="@+id/rv_record"
                android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                android:layout_marginBottom="2dp"
                android:overScrollMode="never" />
+        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
    </LinearLayout>
 </layout>
\ No newline at end of file
--- a/userCenter/src/main/res/layout/activity_invate_new.xml
+++ b/userCenter/src/main/res/layout/activity_invate_new.xml
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+        <RelativeLayout
+            android:id="@+id/title_back"
+            style="@style/title">
+            <TextView
+                android:id="@+id/tv_title"
+                style="@style/text_title"
+                android:text="@string/invate_new_reward" />
+            <ImageView
+                android:id="@+id/receiving_back"
+                style="@style/title_image_back"
+                />
+        </RelativeLayout>
+        <ImageView style="@style/card_line" />
+            <android.support.v4.widget.NestedScrollView
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                >
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"
+                    android:padding="15dp">
+                    <TextView
+                        style="@style/common_text_style"
+                        android:textStyle="bold"
+                        android:text="@string/invate_reward_rule"
+                        />
+                    <TextView
+                        style="@style/common_text_style"
+                        android:text="@string/invate_reward_rule1"
+                        android:layout_marginTop="5dp"
+                        android:textColor="#666"
+                        />
+                    <TextView
+                        style="@style/common_text_style"
+                        android:text="@string/invate_reward_rule2"
+                        android:layout_marginTop="5dp"
+                        android:textColor="#666"
+                        />
+                    <TextView
+                        style="@style/common_text_style"
+                        android:text="@string/remember_your_invate_code"
+                        android:layout_marginTop="50dp"
+                        android:textStyle="bold"
+                        />
+                    <TextView
+                        style="@style/common_text_style"
+                        android:layout_gravity="center_horizontal"
+                        android:textSize="20sp"
+                        android:textStyle="bold"
+                        android:textColor="@color/color_orange"
+                        android:text="S01023"
+                        android:layout_marginTop="15dp"
+                        />
+                </LinearLayout>
+            </android.support.v4.widget.NestedScrollView>
+        <TextView
+            android:id="@+id/tv_forward"
+            style="@style/btn_bottom_common"
+            android:layout_height="60dp"
+            android:layout_marginLeft="50dp"
+            android:layout_marginRight="50dp"
+            android:layout_marginBottom="30dp"
+            android:text="@string/forward_invate_now" />
+    </LinearLayout>
+</layout>
\ No newline at end of file
--- a/userCenter/src/main/res/layout/fragment_home_user.xml
+++ b/userCenter/src/main/res/layout/fragment_home_user.xml
@@ -31,8 +31,10 @@
        <com.scwang.smartrefresh.layout.SmartRefreshLayout
            android:id="@+id/refresh_layout"
            android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
            android:paddingBottom="2dp">
            <android.support.v4.widget.NestedScrollView
                android:layout_width="match_parent"
                android:layout_height="match_parent"
@@ -58,8 +60,7 @@
                        android:layout_height="wrap_content"
                        android:background="@color/table_record_title_bg"
                        android:onClick="@{()->presenter.toUserSetting()}"
-                    android:padding="10dp"
+                        android:padding="10dp">
-                    >
                        <ImageView
                            android:layout_width="wrap_content"
@@ -221,7 +222,34 @@
                        android:background="@color/cl_work_raiod"
                        android:visibility="gone" />
-                <LinearLayout style="@style/ll_user_bottom">
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="70dp"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginRight="15dp"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        android:background="@drawable/personal_center_selector"
+                        android:onClick="@{()->presenter.dumpToCacheRecord()}">
+                        <TextView
+                            style="@style/tv_user_bottom1"
+                            android:layout_marginTop="0dp"
+                            android:layout_marginLeft="25dp"
+                            android:text="@string/user_cash_arrive" />
+                        <TextView
+                            android:id="@+id/tv_cash_arrive"
+                            style="@style/tv_user_bottom2"
+                            android:layout_marginTop="0dp"
+                            android:layout_marginLeft="10dp"
+                            android:text="0"
+                            android:textColor="@color/cl_order_item_date" />
+                    </LinearLayout>
+                    <LinearLayout style="@style/ll_user_bottom"
+                        android:layout_marginTop="10dp"
+                        >
                        <LinearLayout
                            style="@style/ll_user_bottom2"
@@ -241,7 +269,7 @@
                        <LinearLayout
                            style="@style/ll_user_bottom2"
                            android:layout_marginLeft="10dp"
-                        android:onClick="@{()->presenter.dumpToOrderRecord()}">
+                            android:onClick="@{()->presenter.toCommonRecord(1)}">
                            <TextView
                                style="@style/tv_user_bottom1"
@@ -257,42 +285,46 @@
                    <LinearLayout
                        style="@style/ll_user_bottom"
-                    android:layout_marginTop="15dp">
+                        android:layout_marginTop="10dp">
                        <LinearLayout
                            style="@style/ll_user_bottom2"
-                        android:onClick="@{()->presenter.dumpToSaleRecord()}">
+                            android:onClick="@{()->presenter.toCommonRecord(2)}"
+                            >
                            <TextView
                                style="@style/tv_user_bottom1"
-                            android:text="@string/user_sale_record" />
+                                android:text="@string/user_invate_reward" />
                            <TextView
-                            android:id="@+id/tv_sale_record"
+                                android:id="@+id/tv_invate_reward"
                                style="@style/tv_user_bottom2"
+                                android:textColor="@color/text_common_green"
                                android:text="0" />
                        </LinearLayout>
                        <LinearLayout
                            style="@style/ll_user_bottom2"
                            android:layout_marginLeft="10dp"
-                        android:onClick="@{()->presenter.dumpToOrderRecord()}">
+                            android:onClick="@{()->presenter.toCommonRecord(3)}"
+                            >
                            <TextView
                                style="@style/tv_user_bottom1"
-                            android:text="@string/user_word_orders" />
+                                android:text="@string/user_platform_reward" />
                            <TextView
-                            android:id="@+id/tv_work_orders"
+                                android:id="@+id/tv_platform_reward"
                                style="@style/tv_user_bottom2"
+                                android:textColor="@color/text_common_green"
                                android:text="0" />
                        </LinearLayout>
                    </LinearLayout>
                    <LinearLayout
                        style="@style/ll_user_bottom"
-                    android:layout_marginTop="15dp"
+                        android:layout_marginTop="10dp"
-                    android:layout_marginBottom="15dp">
+                        android:layout_marginBottom="10dp">
                        <LinearLayout
                            style="@style/ll_user_bottom2"
@@ -327,5 +359,19 @@
                </LinearLayout>
            </android.support.v4.widget.NestedScrollView>
        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+        <TextView
+            android:id="@+id/apply_part"
+            android:layout_width="match_parent"
+            android:layout_height="49dp"
+            android:gravity="center"
+            android:text="@string/invate_new_reward"
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_16"
+            android:background="@drawable/btn_blue_commom"
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="15dp"
+            android:layout_marginBottom="15dp"
+            android:onClick="@{()->presenter.dumpToInvate()}"
+            />
    </LinearLayout>
 </layout>
\ No newline at end of file
--- a/userCenter/src/main/res/values/strings.xml
+++ b/userCenter/src/main/res/values/strings.xml
@@ -3,8 +3,12 @@
    <string name="input_new_pwd">填写新密码</string>
    <string name="income_money">收入金额</string>
    <string name="oreder_sender_payer">派单付费方</string>
-    <string name="pay_date">支付日期</string>
+    <string name="pay_date">结算日期</string>
+    <string name="reward_str">奖金</string>
+    <string name="reward_things">奖励事项</string>
+    <string name="share_reward_money">分享奖金</string>
    <string name="reward_money">奖励金额</string>
+    <string name="be_invated_person">被邀请人</string>
    <string name="reward_company">奖励方</string>
    <string name="reward_date">奖励日期</string>
    <string name="deatail_addr_">详细地址:</string>
@@ -28,4 +32,9 @@
    <string name="sale_record_rule4_1_2">的佣金。（佣金含依法代扣代缴个人劳务收入所得税费和支付手续费等）</string>
    <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_rule2">2、请务必提醒被邀请人在注册APP时准确输入您的【专属邀请码】；如果输入错误或忘记输入，系统无法识别并记账。</string>
+    <string name="remember_your_invate_code">请牢记您的专属邀请码：</string>
+    <string name="forward_invate_now">马上转发\n【大鱼师傅APP】注册链接</string>
 </resources>