Skip to content

android / dayu

Go to a project
Commit 8464cc50 by 罗翻
Options

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

parent 49a27007
Inline Side-by-side
Showing with 329 additions and 293 deletions
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);
......
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'
......
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) {
......
orderCenter/src/main/res/layout/fragment_multi_detail.xml
......@@ -12,351 +12,369 @@
type="com.dayu.order.api.protocol.OrderDetail" />
</data>
<android.support.v4.widget.NestedScrollView
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
<android.support.v4.widget.NestedScrollView
android:id="@+id/nv_top"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_height="0dp"
android:layout_weight="1">
<TextView
android:layout_width="match_parent"
android:layout_height="43dp"
android:paddingLeft="15dp"
android:paddingTop="@dimen/dp_15"
android:text="工单概况"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<RelativeLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:paddingLeft="15dp">
android:orientation="vertical">
<TextView
android:id="@+id/tv_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:text="工单编号:"
android:layout_width="match_parent"
android:layout_height="43dp"
android:paddingLeft="15dp"
android:paddingTop="@dimen/dp_15"
android:text="工单概况"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_order_num"
android:layout_width="wrap_content"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/tv_num"
android:text='@{!TextUtils.isEmpty(item.orderNum)?item.orderNum:@string/no_data,default = @string/no_data}'
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
android:background="@color/white"
android:paddingLeft="15dp">
<TextView
android:id="@+id/tv_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_num"
android:layout_marginTop="15dp"
android:text="工单状态:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:text="工单编号:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_order_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_num"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/tv_state"
android:text="进行中"
android:textColor="@color/cl_tab_read"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_order_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/tv_num"
android:text='@{!TextUtils.isEmpty(item.orderNum)?item.orderNum:@string/no_data,default = @string/no_data}'
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_state"
android:layout_marginTop="15dp"
android:text="服务内容:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_num"
android:layout_marginTop="15dp"
android:text="工单状态:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<LinearLayout
android:id="@+id/ll_server_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/tv_state"
android:layout_marginLeft="19dp"
android:layout_marginTop="15dp"
android:layout_toRightOf="@+id/tv_content">
<TextView
android:id="@+id/tv_order_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_num"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/tv_state"
android:text="进行中"
android:textColor="@color/cl_tab_read"
android:textSize="14sp" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rl_server_content"
<TextView
android:id="@+id/tv_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_state"
android:layout_marginTop="15dp"
android:text="服务内容:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<LinearLayout
android:id="@+id/ll_server_content"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
android:layout_height="wrap_content"
android:layout_below="@id/tv_state"
android:layout_marginLeft="19dp"
android:layout_marginTop="15dp"
android:layout_toRightOf="@+id/tv_content">
<TextView
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/ll_server_content"
android:text="上门时间:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rl_server_content"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<TextView
android:id="@+id/order_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/ll_server_content"
android:layout_marginLeft="19dp"
android:layout_toRightOf="@+id/tv_time"
android:text='@{!TextUtils.isEmpty(item.confirmDoorTime)?item.confirmDoorTime:@string/no_data}'
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/ll_server_content"
android:text="上门时间:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_remark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_time"
android:layout_marginTop="15dp"
android:text="工单备注:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:id="@+id/order_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/ll_server_content"
android:layout_marginLeft="19dp"
android:layout_toRightOf="@+id/tv_time"
android:text='@{!TextUtils.isEmpty(item.confirmDoorTime)?item.confirmDoorTime:@string/no_data}'
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_remark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_time"
android:layout_marginTop="15dp"
android:text="工单备注:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<RelativeLayout
android:id="@+id/rl_info_detail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_time"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/tv_remark">
<TextView
android:id="@+id/order_remark"
<RelativeLayout
android:id="@+id/rl_info_detail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:maxEms="500"
android:maxLines="2"
android:text='@{TextUtils.isEmpty(item.comment)?@string/no_data:item.comment}'
android:textColor="@color/cl_home_title_text_color"
android:textSize="13sp" />
android:layout_below="@+id/tv_time"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/tv_remark">
<TextView
android:id="@+id/order_remark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:maxEms="500"
android:maxLines="2"
android:text='@{TextUtils.isEmpty(item.comment)?@string/no_data:item.comment}'
android:textColor="@color/cl_home_title_text_color"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_look_more"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/order_remark"
android:gravity="center_horizontal"
android:text="@string/look_more"
android:textColor="@color/cl_receiving_order_item_data"
android:textSize="13.3sp"
android:visibility="gone" />
</RelativeLayout>
<TextView
android:id="@+id/tv_look_more"
android:id="@+id/tv_fujian"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_remark"
android:layout_marginTop="15dp"
android:text="附件:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<LinearLayout
android:id="@+id/ll_fujian"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/order_remark"
android:gravity="center_horizontal"
android:text="@string/look_more"
android:textColor="@color/cl_receiving_order_item_data"
android:textSize="13.3sp"
android:visibility="gone" />
android:layout_below="@+id/tv_remark"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/tv_remark">
</RelativeLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/rl_fujian"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</RelativeLayout>
<TextView
android:id="@+id/tv_fujian"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_remark"
android:layout_marginTop="15dp"
android:text="附件:"
android:layout_width="match_parent"
android:layout_height="43dp"
android:paddingLeft="15dp"
android:paddingTop="@dimen/dp_15"
android:text="客户信息"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<LinearLayout
android:id="@+id/ll_fujian"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_remark"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/tv_remark">
android:background="@color/white"
android:paddingLeft="15dp">
<android.support.v7.widget.RecyclerView
android:id="@+id/rl_fujian"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</RelativeLayout>
<TextView
android:id="@+id/tv_customer_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:text="客户类型:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="43dp"
android:paddingLeft="15dp"
android:paddingTop="@dimen/dp_15"
android:text="客户信息"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:paddingLeft="15dp">
<TextView
android:id="@+id/customer_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/tv_customer_type"
android:text="@{item.customerType == 1?@string/personal_customer:@string/enterprise_customer}"
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_customer_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:text="客户类型:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_customer_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBaseline="@+id/customer_name"
android:layout_alignBottom="@+id/customer_name"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:text="客户姓名:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:id="@+id/customer_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/tv_customer_type"
android:text="@{item.customerType == 1?@string/personal_customer:@string/enterprise_customer}"
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
<TextView
android:id="@+id/customer_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_customer_type"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/tv_customer_type"
android:text='@{!TextUtils.isEmpty(item.customerName)?item.customerName:@string/no_data}'
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_customer_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBaseline="@+id/customer_name"
android:layout_alignBottom="@+id/customer_name"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:text="客户姓名:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_customer_mobile"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_customer_name"
android:layout_marginTop="@dimen/dp_15"
android:text="联系方式:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:id="@+id/customer_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_customer_type"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/tv_customer_type"
android:text='@{!TextUtils.isEmpty(item.customerName)?item.customerName:@string/no_data}'
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
<TextView
android:id="@+id/customer_moblie"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_customer_name"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/tv_customer_mobile"
android:text='@{!TextUtils.isEmpty(item.customerMobile)?item.customerMobile:@string/no_data}'
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_customer_mobile"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_customer_name"
android:layout_marginTop="@dimen/dp_15"
android:text="联系方式:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_address"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_customer_mobile"
android:layout_marginTop="@dimen/dp_15"
android:text="客户地址:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:id="@+id/customer_moblie"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_customer_name"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/tv_customer_mobile"
android:text='@{!TextUtils.isEmpty(item.customerMobile)?item.customerMobile:@string/no_data}'
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
<TextView
android:id="@+id/customer_address"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_customer_mobile"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/tv_address"
android:ellipsize="end"
android:maxLines="2"
android:text='@{item.provinceName+item.cityName+item.districtName+item.address}'
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_address"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_customer_mobile"
android:layout_marginTop="@dimen/dp_15"
android:text="客户地址:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_end_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_address"
android:layout_marginTop="@dimen/dp_15"
android:text="期望时间:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:id="@+id/customer_address"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_customer_mobile"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/tv_address"
android:ellipsize="end"
android:maxLines="2"
android:text='@{item.provinceName+item.cityName+item.districtName+item.address}'
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
<TextView
android:id="@+id/end_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_address"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/tv_end_time"
android:text='@{!TextUtils.isEmpty(item.appointmentTime)?item.appointmentTime:@string/no_data}'
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
</RelativeLayout>
<TextView
android:id="@+id/tv_end_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_address"
android:layout_marginTop="@dimen/dp_15"
android:text="期望时间:"
android:layout_width="match_parent"
android:layout_height="43dp"
android:paddingLeft="15dp"
android:paddingTop="@dimen/dp_15"
android:text="费用信息"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:id="@+id/end_time"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_address"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/tv_end_time"
android:text='@{!TextUtils.isEmpty(item.appointmentTime)?item.appointmentTime:@string/no_data}'
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
</RelativeLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="43dp"
android:paddingLeft="15dp"
android:paddingTop="@dimen/dp_15"
android:text="费用信息"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
android:layout_marginLeft="@dimen/dp_15"
android:background="@color/white"
android:orientation="horizontal"
android:paddingBottom="10dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:background="@color/white"
android:orientation="horizontal"
android:paddingBottom="10dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:text="费用承担方:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:text="费用承担方:"
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.repairType == 1?@string/honai:@string/warranty}"
android:textColor="@color/cl_home_title_text_color"
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.repairType == 1?@string/honai:@string/warranty}"
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</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
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" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment