处理工单前增加活体检测

31d44116 · 罗翻 · 33d53e1f · 31d44116 · 31d44116 · 31d44116
Commit 31d44116 authored Jun 21, 2018 by 罗翻
Showing with 87 additions and 74 deletions
IDCardLib/src/main/java/com/megvii/idcardlib/util/IDetection.java
IDCardLib/src/main/java/com/megvii/idcardlib/util/Screen.java
baseSDK/src/main/java/com/dayu/base/api/ServerException.java
baseSDK/src/main/java/com/dayu/utils/UserManager.java
baseSDK/src/main/res/values/strings.xml
build.gradle
orderCenter/src/main/java/com/dayu/order/api/OrderService.java
orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessPresenter.java
orderCenter/src/main/java/com/dayu/order/presenter/multiprocessorder/MultiProcessOrderPresenter.java
orderCenter/src/main/java/com/dayu/order/presenter/orderliveness/OrderLivenessPresenter.java
orderCenter/src/main/java/com/dayu/order/presenter/serverinfo/ServerInfoPresenter.java
orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java
orderCenter/src/main/java/com/dayu/order/ui/activity/QrCodeActivity.java
orderCenter/src/main/java/com/dayu/order/ui/activity/ServerInfoActivity.java
orderCenter/src/main/java/com/dayu/order/ui/activity/ServerListActivity.java
orderCenter/src/main/java/com/dayu/order/ui/activity/SignatureActivity.java
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
orderCenter/src/main/res/layout/activity_multi_process_order.xml
orderCenter/src/main/res/layout/activity_process_order.xml
orderCenter/src/main/res/layout/activity_server_info.xml
--- a/IDCardLib/src/main/java/com/megvii/idcardlib/util/IDetection.java
+++ b/IDCardLib/src/main/java/com/megvii/idcardlib/util/IDetection.java
@@ -34,7 +34,7 @@ public class IDetection {
    public IDetection(Context mContext, View view) {
        this.mContext = mContext;
        this.rootView = view;
-        mDrawableCache = new HashMap<Integer, Drawable>();
+        mDrawableCache = new HashMap<>();
    }
    public void animationInit() {

--- a/IDCardLib/src/main/java/com/megvii/idcardlib/util/Screen.java
+++ b/IDCardLib/src/main/java/com/megvii/idcardlib/util/Screen.java
@@ -39,7 +39,6 @@ public class Screen {
 				|| density == 0) {
 			Resources res = context.getResources();
 			DisplayMetrics metrics = res.getDisplayMetrics();
-			// TODO // - 50
 			density = metrics.density;
 			mNotificationBarHeight = (int) (35 * density);
 			mWidth = metrics.widthPixels;// - (int)(50 * density)
@@ -58,7 +57,6 @@ public class Screen {
 			drawPaddingBottom = density * PADDING_B;
 			drawWidth = mWidth - drawPaddingLeft - drawPaddingRight;
-			// TODO 如果非全屏，�?��减去标题栏的高度
 			drawHeight = mHeight - drawPaddingTop - drawPaddingBottom;
 		}
 	}

--- a/baseSDK/src/main/java/com/dayu/base/api/ServerException.java
+++ b/baseSDK/src/main/java/com/dayu/base/api/ServerException.java
@@ -150,7 +150,7 @@ public class ServerException extends Exception {
            case "GLOBAL1005":
                message = BaseApplication.getContext().getString(R.string.global1005);   //数据越界异
                break;
-            case Constants.ERROR_NULL:
+            case Constants.ERROR_NULL:   //数据返回为null
                message = Constants.NOT_SHOW;
                break;
            default:

--- a/baseSDK/src/main/java/com/dayu/utils/UserManager.java
+++ b/baseSDK/src/main/java/com/dayu/utils/UserManager.java
@@ -63,13 +63,8 @@ public class UserManager {
        UserInfo userInfo = getUser();
        if (userInfo != null) {
            //有数据
-            //TODO
+            return !TextUtils.isEmpty(userInfo.getAccountId()) && !TextUtils.isEmpty(userInfo.getSiteId())
-            if (!TextUtils.isEmpty(userInfo.getAccountId()) && !TextUtils.isEmpty(userInfo.getSiteId())
+                    && !TextUtils.isEmpty(userInfo.getAccountName()) && userInfo.getDetectStatus() == 1 && !TextUtils.isEmpty((String) SPUtils.get("USER_IDENTITY", ""));
-                    && !TextUtils.isEmpty(userInfo.getAccountName()) && userInfo.getDetectStatus() == 1 && !TextUtils.isEmpty((String) SPUtils.get("USER_IDENTITY", ""))) {
-                return true;
-            } else {
-                return false;
-            }
        }
        return false;
    }

--- a/baseSDK/src/main/res/values/strings.xml
+++ b/baseSDK/src/main/res/values/strings.xml
@@ -62,6 +62,7 @@
    <string name="wait">等待验收</string>
    <string name="order_pm">产品</string>
    <string name="order_pm_text">请输入产品类型</string>
+    <string name="input_product_name">请输入产品名称</string>
    <string name="order_pinpai">品牌</string>
    <string name="order_pinpai_text">请输入品牌</string>
    <string name="order_xinghao">型号</string>
@@ -296,6 +297,7 @@
    <string name="sn_num">SN&#160;&#160;&#160;&#160;&#160;&#160;码</string>
    <string name="charge_record">收费记录</string>
    <string name="total_money">总金额数</string>
+    <string name="total_price">总金额</string>
    <string name="door_money">上门费用</string>
    <string name="server_money">服务费用</string>
    <string name="material_money">材料费用</string>
@@ -335,7 +337,17 @@
    <string name="single_server_num">已完成%1$d/共%2$d</string>
    <string name="server_num">共%1$d项服务</string>
    <string name="company_mobile">联系技术支持</string>
+    <string name="task_list">任务列表</string>
+    <string name="process">处理</string>
+    <string name="no_signature">您还没有签名!</string>
+    <string name="electronic_signature">电子签名</string>
+    <string name="signature_again">重新签名</string>
+    <string name="finish_signature">完成签名</string>
+    <string name="special_plane">座机</string>
+    <string name="sn_photo_not_null">序列号和序列号照片不能为空</string>
+    <string name="can_not_repet_get_money">您上次已经收取过客户费用，请勿重新收取!</string>
+    <string name="process_order_success">提交验收成功</string>
+    <string name="signature_name">请先签名!</string>
@@ -438,7 +450,7 @@
    <string name="please_upload_yourself_face">请采集您本人的面孔</string>
    <string name="server_error">系统异常,请稍后重试</string>
    <string name="please_upload_identity_front">请上传身份证正面</string>
-    <string name="certification_not_pass">您的活检认证暂未通过</string>
+    <string name="certification_not_pass">您的活检认证暂未通过,请重新认证</string>
    <string name="certificaiton_import_notice">信息仅用于身份验证，大鱼师傅保障您的信息安全</string>
    <string name="certificaiton_notice">&#160;1.&#160;&#160;&#160;&#160;请摘下帽子口罩，不要遮挡面部\n
 	2.&#160;&#160;&#160;&#160;保证光线充足，保持水平拍摄\n
@@ -451,7 +463,7 @@
    <string name="error_time_out">连接服务器超时</string>
    <string name="error_connect">连接服务器失败</string>
    <string name="error_internet">网络错误</string>
-    <string name="error_parse">解析错误</string>
+    <string name="error_parse">json解析错误</string>
    <string name="error_ssl">证书验证错误</string>
    <string name="error_connect_time">连接超时</string>
    <string name="error_unknow">未知错误</string>

--- a/build.gradle
+++ b/build.gradle
@@ -5,8 +5,8 @@ buildscript {
    ext.build_tools_version = "27.0.2"
    ext.min_sdk_version = 16
    ext.target_sdk_version = 23
-    ext.version_code = 11
+    ext.version_code = 12
-    ext.verson_name = "1.7.0"
+    ext.verson_name = "1.8.0"
    ext.gradle_version = '3.0.1'
    ext.isReleaseMinify = true
    ext.isDebugMinify = true

--- a/orderCenter/src/main/java/com/dayu/order/api/OrderService.java
+++ b/orderCenter/src/main/java/com/dayu/order/api/OrderService.java
@@ -313,6 +313,6 @@ interface OrderService {
     *
     * @return
     */
-    @GET(OrderConstant.FACE_CERTIFICAITON)
+    @POST(OrderConstant.FACE_CERTIFICAITON)
    Observable<BaseResponse<Boolean>> certificationLive(@Body RequestBody body);
 }
--- a/orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessPresenter.java
+++ b/orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessPresenter.java
@@ -70,7 +70,7 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter 
    public void process() {
        File file = new File(SignatureActivity.path);
        if (mNeedEsignature == 1 && !file.exists()) {
-            ToastUtils.showShortToast("请让客户签名!");
+            ToastUtils.showShortToast(R.string.signature_name);
            return;
        }
        if (mView.getSelectPayer()) {
@@ -163,7 +163,7 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter 
        JSONObject jsonObject = new JSONObject(params);
        RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
        OrderApiFactory.commitOrder(body).subscribe(baseObserver(integer -> {
-            ToastUtils.showShortToast("提交验收成功");
+            ToastUtils.showShortToast(R.string.process_order_success);
            if (integer == 6) {
                Bundle bundle = new Bundle();
                bundle.putInt(Constants.TYPE, 1);

--- a/orderCenter/src/main/java/com/dayu/order/presenter/multiprocessorder/MultiProcessOrderPresenter.java
+++ b/orderCenter/src/main/java/com/dayu/order/presenter/multiprocessorder/MultiProcessOrderPresenter.java
@@ -173,7 +173,7 @@ public class MultiProcessOrderPresenter extends MultiProcessOrderContract.Presen
    @Override
    public void commitPhoto() {
        if (mIsShowSn.get() && (TextUtils.isEmpty(mSn.get()) || mView.getSnImages().size() == 0)) {
-            ToastUtils.showShortToast("序列号和序列号照片不能为空");
+            ToastUtils.showShortToast(R.string.sn_photo_not_null);
            return;
        }
        mView.showDialog();

--- a/orderCenter/src/main/java/com/dayu/order/presenter/orderliveness/OrderLivenessPresenter.java
+++ b/orderCenter/src/main/java/com/dayu/order/presenter/orderliveness/OrderLivenessPresenter.java
@@ -80,7 +80,7 @@ public class OrderLivenessPresenter extends OrderLivenessContract.Presenter {
        Bundle bundle = new Bundle();
        OrderApiFactory.certificationLive(body).subscribe(baseObserver(aBoolean -> {
            if (aBoolean) {
-                SPUtils.put(Constants.ORDER_ID+mOrder.getId(),true);
+                SPUtils.put(Constants.ORDER_ID + mOrder.getId(), true);
                if (mOrder.getKaCompanyId() != null) {
                    bundle.putInt(OrderConstant.KAADDRESSID, mOrder.getKaCompanyId());
                }
@@ -91,15 +91,18 @@ public class OrderLivenessPresenter extends OrderLivenessContract.Presenter {
                    bundle.putInt(Constants.ID, mOrder.getSpus().get(0).getId());
                    mView.startActivity(ServerListActivity.class, bundle);
                }
+            } else {
+                ToastUtils.showShortToast(R.string.certification_not_pass);
+                mView.dumpBack();
            }
        }, responeThrowable -> {
            if ("DETECT_ERROR00001".equals(responeThrowable.subCode)) {
                ToastUtils.showShortToast(R.string.please_upload_cleare_identity);
            } else if ("DETECT_ERROR00003".equals(responeThrowable.subCode)) {
                ToastUtils.showShortToast(R.string.please_upload_yourself_face);
-            } else if ("DETECT_ERROR00003".equals(responeThrowable.subCode)) {
+            } else if ("DETECT_ERROR00004".equals(responeThrowable.subCode)) {
                ToastUtils.showShortToast(R.string.server_error);
-            } else if ("DETECT_ERROR00003".equals(responeThrowable.subCode)) {
+            } else if ("DETECT_ERROR00005".equals(responeThrowable.subCode)) {
                ToastUtils.showShortToast(R.string.please_upload_identity_front);
            } else {
                ToastUtils.showShortToast(R.string.certification_not_pass);

--- a/orderCenter/src/main/java/com/dayu/order/presenter/serverinfo/ServerInfoPresenter.java
+++ b/orderCenter/src/main/java/com/dayu/order/presenter/serverinfo/ServerInfoPresenter.java
@@ -8,14 +8,11 @@ import android.os.Bundle;
 import com.dayu.common.Constants;
 import com.dayu.order.api.OrderApiFactory;
 import com.dayu.order.api.protocol.Spu;
-import com.dayu.order.api.protocol.companyManager;
 import com.dayu.order.common.OrderConstant;
 import com.dayu.order.ui.activity.ServerListActivity;
 import java.util.List;
-import io.reactivex.functions.Consumer;
 /**
 * Created by luofan
 * on 2017/11/8.
@@ -78,14 +75,11 @@ public class ServerInfoPresenter extends ServerInfoContract.Presenter {
    @Override
    public void getPhone() {
        mView.showDialog();
-        OrderApiFactory.getManagerMobile(mKaId, 3).subscribe(baseObserver(new Consumer<companyManager>() {
+        OrderApiFactory.getManagerMobile(mKaId, 3).subscribe(baseObserver(companyManager -> {
-            @Override
-            public void accept(companyManager companyManager) throws Exception {
            mPhone = companyManager.getMobile();
            if (mPhone != null) {
                mIsShowPhone.set(true);
            }
-            }
        }, responeThrowable -> {
            if (Constants.ERROR_NULL.equals(responeThrowable.subCode)) {
                mIsShowPhone.set(false);

--- a/orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java
@@ -83,7 +83,7 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
    @Override
    public void initView() {
-        mBind.tvTitle.setText("提交验收");
+        mBind.tvTitle.setText(getString(R.string.submit_order));
        mIvWeight = (UtilsScreen.getScreenWidth(mActivity) - UtilsScreen.dip2px(mActivity, 20)) / 5;
        mBind.recyclerView.mCoreAdapter.addFooterViewType(R.layout.item_multi_process_foot, null);
        mBind.recyclerView.postDelayed(() -> {
@@ -123,7 +123,7 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
        swtich.setOnClickListener(v -> {
            if (canPay) {
-                ToastUtils.showShortToast("您上次已经收取过客户费用，请勿重新收取!");
+                ToastUtils.showShortToast(getString(R.string.can_not_repet_get_money));
            } else {
                if (swtich.getSwitchButton()) {
                    swtich.setSwitchButton(false);
@@ -339,7 +339,7 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
    public void setPayStatus() {
        canPay = true;
        swtich.setOnClickListener(v -> {
-            ToastUtils.showShortToast("您上次已经收取过客户费用，请勿重新收取!");
+            ToastUtils.showShortToast(getString(R.string.can_not_repet_get_money));
        });
    }

--- a/orderCenter/src/main/java/com/dayu/order/ui/activity/QrCodeActivity.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/activity/QrCodeActivity.java
 package com.dayu.order.ui.activity;
 import android.os.Bundle;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.style.ForegroundColorSpan;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.dayu.base.ui.activity.DataBindingActivity;
@@ -18,6 +21,8 @@ import org.greenrobot.eventbus.EventBus;
 */
 public class QrCodeActivity extends DataBindingActivity<QrCodeLayoutBinding> {
+    private int mType;
    @Override
    public int getLayoutId() {
        return R.layout.qr_code_layout;
@@ -26,14 +31,19 @@ public class QrCodeActivity extends DataBindingActivity<QrCodeLayoutBinding> {
    @Override
    public void initView() {
        Bundle bundle = getIntent().getBundleExtra(Constants.BUNDLE);
-        int type = bundle.getInt(Constants.TYPE, 0);
+        if (bundle!=null){
+            mType = bundle.getInt(Constants.TYPE, 0);
+        }
        mBind.titleBack.setOnClickListener(v -> {
-            if (type == 0) {
+            if (mType == 0) {
                finish();
            } else {
                ARouter.getInstance().build(RouterPath.PATH_MAIN).navigation();
                EventBus.getDefault().post(new RefreshServe(1));
            }
        });
+        SpannableString spannableString = new SpannableString(getString(R.string.scan_code_for_appointment_two));
+        spannableString.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.bg_button)),3,7, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        mBind.notice.setText(spannableString);
    }
 }
--- a/orderCenter/src/main/java/com/dayu/order/ui/activity/ServerInfoActivity.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/activity/ServerInfoActivity.java
@@ -34,7 +34,7 @@ public class ServerInfoActivity extends BaseActivity<ServerInfoPresenter, Activi
    @Override
    public void initView() {
-        mBind.tvTitle.setText("任务列表");
+        mBind.tvTitle.setText(getString(R.string.task_list));
        ServerInfoAdapter adapter = new ServerInfoAdapter(false);
        mBind.recyclerView.setAdapter(adapter);
        mBind.tvProcess.setOnClickListener(v -> {

--- a/orderCenter/src/main/java/com/dayu/order/ui/activity/ServerListActivity.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/activity/ServerListActivity.java
@@ -35,7 +35,7 @@ public class ServerListActivity extends BaseActivity<ServerListPresenter, Activi
    @Override
    public void initView() {
-        mBind.tvTitle.setText("任务列表");
+        mBind.tvTitle.setText(getString(R.string.task_list));
        mBind.tvProcess.setOnClickListener(o -> {
        });
        mBind.recyclerView.setOnItemClickListener(new OnItemClickListener<Spu, ActivityServerListBinding>() {

--- a/orderCenter/src/main/java/com/dayu/order/ui/activity/SignatureActivity.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/activity/SignatureActivity.java
@@ -41,7 +41,7 @@ public class SignatureActivity extends DataBindingActivity<ActivitySignatureLayo
                    e.printStackTrace();
                }
            } else {
-                ToastUtils.showLongToast("还没有签名!");
+                ToastUtils.showLongToast(R.string.no_signature);
            }
        });
    }

--- a/orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
@@ -269,6 +269,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
    private void processClick(Order it, FragmentOrderdoingItemBinding h, int posiiton) {
        mItem = it;
        mBind = h;
+        //createdsource为2，3，4并且status为4，进行中时跳转到任务列表.
        if ((mItem.getCreatedSource() == 2 || mItem.getCreatedSource() == 3 || mItem.getCreatedSource() == 4) && mItem.getStatus() == 4) {
            dumpServerActivity(mItem);
        } else if (mItem.getStatus() == 4 && mItem.getSubStatus() == 3) {

--- a/orderCenter/src/main/res/layout/activity_multi_process_order.xml
+++ b/orderCenter/src/main/res/layout/activity_multi_process_order.xml
@@ -69,7 +69,7 @@
                    android:background="@color/tv_bg"
                    android:paddingLeft="@dimen/dp_15"
                    android:paddingTop="18dp"
-                    android:text="产品信息"
+                    android:text="@string/prodcut_info"
                    android:textColor="@color/tv_cl"
                    android:textSize="14sp" />
@@ -108,7 +108,7 @@
                            android:layout_marginLeft="90dp"
                            android:layout_toEndOf="@+id/text_one_text"
                            android:layout_toRightOf="@+id/text_one_text"
-                            android:hint="请输入产品名称"
+                            android:hint="@string/input_product_name"
                            android:text="@{presenter.mDetail.categoryThreeName??@string/now_no}"
                            android:textColor="@color/cl_selector_hui"
                            android:textSize="@dimen/sp_15" />

--- a/orderCenter/src/main/res/layout/activity_process_order.xml
+++ b/orderCenter/src/main/res/layout/activity_process_order.xml
@@ -68,7 +68,7 @@
                    android:background="@color/tv_bg"
                    android:paddingLeft="@dimen/dp_15"
                    android:paddingTop="18dp"
-                    android:text="产品信息"
+                    android:text="@string/prodcut_info"
                    android:textColor="@color/tv_cl"
                    android:textSize="14sp" />
@@ -697,17 +697,17 @@
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:layout_below="@+id/image_two_four_lin"
+                            android:layout_marginBottom="15dp"
                            android:layout_marginLeft="@dimen/dp_13.3"
                            android:layout_marginRight="@dimen/dp_13.3"
                            android:layout_marginTop="15.7dp"
-                            android:layout_marginBottom="15dp"
                            android:orientation="horizontal">
                            <TextView
                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
                                android:layout_alignParentLeft="true"
-                                android:text="总金额"
+                                android:text="@string/total_price"
                                android:textColor="@color/cl_tab_line"
                                android:textSize="@dimen/sp_13.3" />
@@ -795,7 +795,8 @@
            android:background="@drawable/tab_blue_react"
            android:gravity="center"
            android:onClick="@{()->presenter.dumpToServerInstruction()}"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:visibility="gone">
            <ImageView
                android:layout_width="wrap_content"

--- a/orderCenter/src/main/res/layout/activity_server_info.xml
+++ b/orderCenter/src/main/res/layout/activity_server_info.xml
@@ -61,7 +61,7 @@
            android:background='@{presenter.mCanProcess==2?@color/bg_button:@color/cl_selector_hui}'
            android:clickable='@{presenter.mCanProcess==2?true:false}'
            android:gravity="center"
-            android:text="提交验收"
+            android:text="@string/submit_order"
            android:textColor="@color/white" />
    </RelativeLayout>
 </layout>
\ No newline at end of file
--- a/orderCenter/src/main/res/layout/activity_server_list.xml
+++ b/orderCenter/src/main/res/layout/activity_server_list.xml
@@ -54,7 +54,7 @@
            android:layout_height="wrap_content"
            android:layout_centerVertical="true"
            android:layout_toLeftOf="@+id/iv_arrow"
-            android:text='@{item.status==1?"处理":"已完成"}'
+            android:text='@{item.status==1?@string/process:@string/order_finish}'
            android:textColor="@color/bg_button"
            android:textSize="@dimen/sp_14" />

--- a/orderCenter/src/main/res/layout/activity_server_list_recycle.xml
+++ b/orderCenter/src/main/res/layout/activity_server_list_recycle.xml
@@ -66,7 +66,7 @@
            android:clickable='@{presenter.mCanProcess?true:false}'
            android:onClick="@{()->presenter.dumpToProcess()}"
            android:gravity="center"
-            android:text="提交验收"
+            android:text="@string/submit_order"
            android:textColor="@color/white"
            android:visibility="@{presenter.mIsShowProcess?View.VISIBLE:View.GONE}" />
    </RelativeLayout>

--- a/orderCenter/src/main/res/layout/activity_signature_layout.xml
+++ b/orderCenter/src/main/res/layout/activity_signature_layout.xml
@@ -14,12 +14,12 @@
            <TextView
                style="@style/text_title"
-                android:text="电子签名" />
+                android:text="@string/electronic_signature" />
            <TextView
                android:id="@+id/title_right"
                style="@style/title_right_text"
-                android:text="重新签名" />
+                android:text="@string/signature_again" />
        </RelativeLayout>
        <ImageView style="@style/card_line" />
@@ -48,7 +48,7 @@
                android:layout_marginBottom="10dp"
                android:layout_marginTop="10dp"
                android:background="@color/bg_button"
-                android:text="完成签名"
+                android:text="@string/finish_signature"
                android:gravity="center"
                android:textColor="@color/white"
                android:textSize="16sp" />

--- a/orderCenter/src/main/res/layout/fragment_order_datails.xml
+++ b/orderCenter/src/main/res/layout/fragment_order_datails.xml
@@ -715,7 +715,8 @@
            android:layout_marginRight="10dp"
            android:background="@drawable/tab_blue_react"
            android:gravity="center"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:visibility="gone">
            <ImageView
                android:layout_width="wrap_content"

--- a/orderCenter/src/main/res/layout/item_server_info.xml
+++ b/orderCenter/src/main/res/layout/item_server_info.xml
@@ -74,7 +74,6 @@
                    android:id="@+id/tv_repair_type"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
-                    android:text="安装"
                    android:textColor="@color/cl_tab_init"
                    android:textSize="13sp" />
@@ -83,7 +82,6 @@
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_toRightOf="@id/tv_repair_type"
-                    android:text="-平板电视"
                    android:textColor="@color/cl_tab_init"
                    android:textSize="13sp" />
@@ -102,7 +100,6 @@
                    android:layout_height="wrap_content"
                    android:layout_below="@+id/tv_repair_type"
                    android:layout_marginTop="10dp"
-                    android:text="服务方式"
                    android:textColor="@color/cl_tab_init"
                    android:textSize="13sp" />
@@ -112,7 +109,6 @@
                    android:layout_height="wrap_content"
                    android:layout_below="@+id/tv_server_type"
                    android:layout_marginTop="5dp"
-                    android:text="服务要求"
                    android:textColor="@color/cl_tab_init"
                    android:textSize="13sp" />
            </RelativeLayout>
@@ -130,7 +126,7 @@
            android:layout_width="match_parent"
            android:layout_height="39dp"
            android:gravity="center"
-            android:text="处理"
+            android:text="@string/process"
            android:textColor="@color/bg_button"
            android:textSize="14sp" />
    </LinearLayout>

--- a/orderCenter/src/main/res/layout/qr_code_layout.xml
+++ b/orderCenter/src/main/res/layout/qr_code_layout.xml
@@ -29,8 +29,8 @@
            android:orientation="vertical">
            <ImageView
-                android:layout_width="wrap_content"
+                android:layout_width="110dp"
-                android:layout_height="wrap_content"
+                android:layout_height="110dp"
                android:layout_marginTop="100dp"
                android:src="@drawable/icon_appointment_code" />
@@ -43,6 +43,7 @@
                android:textSize="14sp" />
            <TextView
+                android:id="@+id/notice"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="center"

--- a/orderCenter/src/main/res/layout/recycler_server_info_header.xml
+++ b/orderCenter/src/main/res/layout/recycler_server_info_header.xml
@@ -23,7 +23,7 @@
            android:layout_height="43dp"
            android:paddingLeft="15dp"
            android:paddingTop="@dimen/dp_18"
-            android:text="顾客信息"
+            android:text="@string/customer_info"
            android:textColor="@color/tv_cl"
            android:textSize="14sp" />
@@ -38,7 +38,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginTop="18dp"
-                android:text="客户类型"
+                android:text="@string/customer_type"
                android:textColor="@color/tv_cl"
                android:textSize="14sp" />
@@ -57,7 +57,7 @@
                android:layout_height="wrap_content"
                android:layout_below="@+id/tv_type"
                android:layout_marginTop="14dp"
-                android:text="客户姓名"
+                android:text="@string/customer_name"
                android:textColor="@color/tv_cl"
                android:textSize="14sp" />
@@ -78,7 +78,7 @@
                android:layout_height="wrap_content"
                android:layout_below="@+id/tv_name"
                android:layout_marginTop="14dp"
-                android:text="联系方式"
+                android:text="@string/ka_mobile"
                android:textColor="@color/tv_cl"
                android:textSize="14sp" />
@@ -98,7 +98,7 @@
                android:layout_height="wrap_content"
                android:layout_below="@+id/tv_mobile"
                android:layout_marginTop="14dp"
-                android:text="座机"
+                android:text="@string/special_plane"
                android:textColor="@color/tv_cl"
                android:textSize="14sp" />
@@ -119,7 +119,7 @@
                android:layout_height="wrap_content"
                android:layout_below="@+id/tv_phone"
                android:layout_marginTop="14dp"
-                android:text="客户地址"
+                android:text="@string/tv_two_text_foure"
                android:textColor="@color/tv_cl"
                android:textSize="14sp" />
@@ -143,7 +143,7 @@
                android:layout_below="@+id/tv_address"
                android:layout_marginBottom="@dimen/dp_15"
                android:layout_marginTop="14dp"
-                android:text="预约时间"
+                android:text="@string/appointment_time"
                android:textColor="@color/tv_cl"
                android:textSize="14sp" />
@@ -164,7 +164,7 @@
            android:layout_height="43dp"
            android:paddingLeft="15dp"
            android:paddingTop="@dimen/dp_18"
-            android:text="任务列表"
+            android:text="@string/task_list"
            android:textColor="@color/tv_cl"
            android:textSize="14sp" />
    </LinearLayout>

--- a/userCenter/src/main/java/com/dayu/usercenter/data/protocol/TodayAchievement.java
+++ b/userCenter/src/main/java/com/dayu/usercenter/data/protocol/TodayAchievement.java
 package com.dayu.usercenter.data.protocol;
 /**
- * Created by luofan on 2017/11/14.
+ * Created by luofan
+ * on 2017/11/14.
 */
 public class TodayAchievement {
-    private int achievement;
+    private double achievement;
-    public int getAchievement() {
+    public double getAchievement() {
        return achievement;
    }
-    public void setAchievement(int achievement) {
+    public void setAchievement(double achievement) {
        this.achievement = achievement;
    }
 }
--- a/userCenter/src/main/java/com/dayu/usercenter/presenter/facecertification/FaceCertificaitonPresenter.java
+++ b/userCenter/src/main/java/com/dayu/usercenter/presenter/facecertification/FaceCertificaitonPresenter.java
@@ -89,14 +89,13 @@ public class FaceCertificaitonPresenter extends FaceCertificaitonContract.Presen
                bundle.putString(UserConstant.DETECT_STATE, UIUtils.getString(R.string.please_upload_cleare_identity));
            }else if ("DETECT_ERROR00003".equals(responeThrowable.subCode)) {
                bundle.putString(UserConstant.DETECT_STATE, UIUtils.getString(R.string.please_upload_yourself_face));
-            } else if ("DETECT_ERROR00003".equals(responeThrowable.subCode)) {
+            } else if ("DETECT_ERROR00004".equals(responeThrowable.subCode)) {
                bundle.putString(UserConstant.DETECT_STATE, UIUtils.getString(R.string.server_error));
-            } else if ("DETECT_ERROR00003".equals(responeThrowable.subCode)) {
+            } else if ("DETECT_ERROR00005".equals(responeThrowable.subCode)) {
                bundle.putString(UserConstant.DETECT_STATE, UIUtils.getString(R.string.please_upload_identity_front));
            } else {
                bundle.putString(UserConstant.DETECT_STATE, UIUtils.getString(R.string.certification_not_pass));
            }
            mView.startActivity(CertificationResultActivity.class, bundle);
        }));
    }

--- a/userCenter/src/main/java/com/dayu/usercenter/presenter/login/LoginPresenter.java
+++ b/userCenter/src/main/java/com/dayu/usercenter/presenter/login/LoginPresenter.java
@@ -76,8 +76,8 @@ public class LoginPresenter extends LoginContract.Presenter {
        UserApiFactory.login(userName.get(), password.get()).subscribe(baseObserver(userInfo -> {
            if (userInfo.getDetectStatus() == 1) {
                loginHx(userInfo.getHxAccount(), userInfo.getHxPwd());
-                getUserInfo(Integer.parseInt(userInfo.getAccountId()));
                dumpAndSave(userInfo);
+                getUserInfo(Integer.parseInt(userInfo.getAccountId()));
            }
 //            else if (userInfo.getDetectStatus() == 2) {
 //                ToastUtils.showShortToast(R.string.engineer_identity_auditing);