活体检测去除竖直检测判断

8464cc50 · 罗翻 · 49a27007 · 8464cc50 · 8464cc50 · 8464cc50
Commit 8464cc50 authored May 29, 2018 by 罗翻
Showing with 42 additions and 6 deletions
IDCardLib/src/main/java/com/megvii/idcardlib/LivenessActivity.java
app/release/app-release.apk
build.gradle
orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
orderCenter/src/main/res/layout/fragment_multi_detail.xml
orderCenter/src/main/res/layout/recycler_server_info_header.xml
--- a/IDCardLib/src/main/java/com/megvii/idcardlib/LivenessActivity.java
+++ b/IDCardLib/src/main/java/com/megvii/idcardlib/LivenessActivity.java
@@ -294,7 +294,7 @@ public class LivenessActivity extends Activity
    @Override
    public void onFrameDetected(long timeout, DetectionFrame detectionFrame) {
        // 如果需要适配加速度传感有问题的机型，可以加入超时自动过垂直判断机制，使用判断条件: sensorUtil.isVertical()||sensorUtil.isSensorFault()
-        if (sensorUtil.isVertical()) {
+        if (sensorUtil.isVertical()||sensorUtil.isSensorFault()) {
            faceOcclusion(detectionFrame);
            handleNotPass(timeout);
            mFaceMask.setFaceInfo(detectionFrame);

--- a/app/release/app-release.apk
+++ b/app/release/app-release.apk
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
    ext.verson_name = "1.6.0"
    ext.gradle_version = '3.0.1'
    ext.isReleaseMinify = true
-    ext.isDebugMinify = false
+    ext.isDebugMinify = true
    ext.arouter_api_version = '1.3.1'
    ext.arouter_compiler_version = '1.1.4'

--- a/orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
@@ -3,6 +3,7 @@ package com.dayu.order.ui.fragment;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
+import android.view.View;
 import com.dayu.base.ui.adapter.CoreAdapter;
 import com.dayu.base.ui.fragment.DataBindingFragment;
@@ -16,9 +17,11 @@ import com.dayu.order.databinding.FragmentOrderDatailsBinding;
 import com.dayu.order.databinding.ItemAccessoriesLayoutBinding;
 import com.dayu.order.databinding.ItemDetailServerInfoBinding;
 import com.dayu.order.ui.activity.PdfWebViewActivity;
+import com.dayu.order.ui.activity.QrCodeActivity;
 import com.dayu.order.ui.activity.ServerInstructionActivity;
 import com.dayu.utils.ToastUtils;
 import com.dayu.widgets.listener.OnItemClickListener;
+import com.umeng.analytics.MobclickAgent;
 /**
 * Created by luofan
@@ -81,6 +84,15 @@ public class MultiOrderDetailFragment extends DataBindingFragment<FragmentMultiD
        mBind.tvOrderState.setText(getStaus(detail.getStatus()));
        mBind.tvLookMore.setOnClickListener(o -> lookMore());
+        if (detail.getStatus() == 4 && detail.getSubStatus() == 6) {
+            mBind.customerAcceptance.setVisibility(View.VISIBLE);
+        } else {
+            mBind.customerAcceptance.setVisibility(View.GONE);
+        }
+        mBind.customerAcceptance.setOnClickListener(v -> {
+            startActivity(new Intent(mActivity, QrCodeActivity.class));
+            MobclickAgent.onEvent(mActivity, "customer_apponitment");
+        });
    }
    public String getStaus(int staus) {

--- a/orderCenter/src/main/res/layout/fragment_multi_detail.xml
+++ b/orderCenter/src/main/res/layout/fragment_multi_detail.xml
@@ -12,13 +12,20 @@
            type="com.dayu.order.api.protocol.OrderDetail" />
    </data>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
        <android.support.v4.widget.NestedScrollView
+            android:id="@+id/nv_top"
            android:layout_width="match_parent"
-        android:layout_height="match_parent">
+            android:layout_height="0dp"
+            android:layout_weight="1">
            <LinearLayout
                android:layout_width="match_parent"
-            android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                android:orientation="vertical">
                <TextView
@@ -359,4 +366,15 @@
                </LinearLayout>
            </LinearLayout>
        </android.support.v4.widget.NestedScrollView>
+        <TextView
+            android:id="@+id/customer_acceptance"
+            android:layout_width="match_parent"
+            android:layout_height="49dp"
+            android:background="@color/cl_home_button"
+            android:gravity="center"
+            android:text="@string/customer_acceptance"
+            android:textColor="@color/white"
+            android:textSize="16sp" />
+    </LinearLayout>
 </layout>
\ No newline at end of file
--- a/orderCenter/src/main/res/layout/recycler_server_info_header.xml
+++ b/orderCenter/src/main/res/layout/recycler_server_info_header.xml
@@ -6,7 +6,8 @@
        <variable
            name="item"
            type="com.dayu.order.api.protocol.Order" />
-        <import type="android.text.TextUtils"/>
+        <import type="android.text.TextUtils" />
    </data>
@@ -113,6 +114,7 @@
                android:textSize="14sp" />
            <TextView
+                android:id="@+id/tv_location"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_below="@+id/tv_phone"
@@ -127,8 +129,11 @@
                android:layout_height="wrap_content"
                android:layout_alignParentRight="true"
                android:layout_below="@+id/tv_phone"
+                android:layout_marginLeft="20dp"
                android:layout_marginTop="14dp"
-                android:text="@{item.getProvinceName()+item.cityName+item.address}"
+                android:layout_toRightOf="@+id/tv_location"
+                android:gravity="right"
+                android:text='@{item.getProvinceName()+item.cityName+item.address}'
                android:textColor="@color/tv_cl"
                android:textSize="14sp" />