提交分类： 打包版本；

提交内容：  B2B商务UI风格调整
当前版本：
是否冲突：  否

WeiChat/build.gradle

@@ -149,7 +149,6 @@ dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     testCompile deps.junit
     compile deps.appcompatV7
-    compile deps.cardviewV7
     compile deps.design
     compile(deps.stetho) {
         force = true

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/WebViewCommActivity.java

@@ -243,7 +243,8 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
                 if (!TextUtils.isEmpty(url)) {
                     Log.d("loadurl", url);
                     if (url.contains("https://account.ubtob.com/sso/login") ||
-                            url.contains("https://sso.ubtob.com/") || url.contains("http://surecloseweb.com")) {
+//                            url.equals("https://sso.ubtob.com/") ||
+                            url.equals("http://surecloseweb.com")) {
                         Intent loginIntent = new Intent();
                         loginIntent.setClass(WebViewCommActivity.this, LoginActivity.class);
                         startActivity(loginIntent);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -484,7 +484,9 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                 }
             }
         } else {
-            master_tv.setText(CommonUtil.getSharedPreferences(ct, "erp_master"));
+            String erp_master = CommonUtil.getSharedPreferences(ct, "erp_master");
+            master_tv.setText(erp_master);
+            CommonUtil.setSharedPreferences(ct, "Master_ch", erp_master);
         }
     }
 

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue Apr 24 09:41:13 CST 2018
+#Thu Apr 26 16:33:09 CST 2018
 debugName=143
-versionName=613
+versionName=614
 debugCode=143
-versionCode=152
+versionCode=153

app_core/common/build.gradle

@@ -39,6 +39,7 @@ dependencies {
     compile deps.photoView
     compile deps.stickyListHeaders
     compile deps.stickyGridHeaders
+    compile deps.cardviewV7
 //    compile deps.vlayout
     compile deps.BaseRecyclerViewAdapterHelper
     compile deps.design

app_core/common/src/main/java/com/core/widget/DottedLine.java

@@ -0,0 +1,50 @@
+package com.core.widget;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.DashPathEffect;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.PathEffect;
+import android.support.annotation.Nullable;
+import android.util.AttributeSet;
+import android.view.View;
+
+import com.core.app.R;
+
+/**
+ * @author RaoMeng
+ * @describe 竖直虚线
+ * @date 2018/4/26 8:49
+ */
+
+public class DottedLine extends View {
+    private Context context;
+
+    public DottedLine(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        this.context = context;
+    }
+
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+
+        Paint paint = new Paint();
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setColor(getResources().getColor(R.color.red));
+        paint.setStrokeWidth(dip2px(context, 2));
+        Path path = new Path();
+        path.moveTo(0, 0);
+        path.lineTo(0, 900);
+        PathEffect effects = new DashPathEffect(new float[]{6, 4, 4, 4}, 2);
+        paint.setPathEffect(effects);
+        canvas.drawPath(path, paint);
+    }
+
+    public static int dip2px(Context context, float dpValue) {
+        final float scale = context.getResources().getDisplayMetrics().density;
+        return (int) (dpValue * scale + 0.5f);
+    }
+}

app_core/common/src/main/res/drawable/selector_b2b_business_tab.xml

@@ -2,14 +2,14 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Non focused states -->
-    <item android:state_focused="false" android:state_pressed="false" android:state_selected="false" android:color="@color/black"/>
-    <item android:state_focused="false" android:state_pressed="false" android:state_selected="true" android:color="@color/b2b_tab_selected"/>
+    <item android:color="@color/black" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
+    <item android:color="@color/white" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
 
     <!-- Focused states -->
-    <item android:state_focused="true" android:state_pressed="false" android:state_selected="false" android:color="@color/black"/>
-    <item android:state_focused="true" android:state_pressed="false" android:state_selected="true" android:color="@color/b2b_tab_selected"/>
+    <item android:color="@color/black" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
+    <item android:color="@color/white" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
 
     <!-- Pressed -->
-    <item android:state_pressed="true" android:color="@color/black"/>
+    <item android:color="@color/black" android:state_pressed="true" />
 
 </selector>

app_core/common/src/main/res/drawable/selector_b2b_business_tab_bg.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- Non focused states -->
+    <item android:drawable="@color/white" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
+    <item android:drawable="@color/b2b_tab_selected" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
+
+    <!-- Focused states -->
+    <item android:drawable="@color/white" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
+    <item android:drawable="@color/b2b_tab_selected" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
+
+    <!-- Pressed -->
+    <!--    Non focused states -->
+    <item android:drawable="@color/b2b_tab_selected" android:state_focused="false" android:state_pressed="true" android:state_selected="false" />
+    <item android:drawable="@color/b2b_tab_selected" android:state_focused="false" android:state_pressed="true" android:state_selected="true" />
+
+    <!--    Focused states -->
+    <item android:drawable="@color/b2b_tab_selected" android:state_focused="true" android:state_pressed="true" android:state_selected="false" />
+    <item android:drawable="@color/b2b_tab_selected" android:state_focused="true" android:state_pressed="true" android:state_selected="true" />
+</selector>

app_core/common/src/main/res/drawable/shape_dotted_line.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+        android:fromDegrees="90"
+        android:toDegrees="90">
+    <shape android:shape="line">
+        <stroke
+            android:width="1dp"
+            android:color="@color/gray_light"
+            android:dashGap="1.5dp"
+            android:dashWidth="2.5dp"
+            />
+    </shape>
+</rotate>

app_core/common/src/main/res/drawable/shape_horizontal_dotted_line.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="line">
+    <solid android:color="@color/red"></solid>
+    <stroke
+        android:width="1dp"
+        android:color="@color/gray_light"
+        android:dashGap="1dp"
+        android:dashWidth="2dp"
+        />
+</shape>

app_core/common/src/main/res/values/colors.xml

@@ -345,7 +345,7 @@
     <!--B2B商务-->
     <color name="b2b_tab_bg">#f2f8fc</color>
     <color name="b2b_tab_selected">#2F95DD</color>
-    <color name="b2b_btn_todo">#2F95DD</color>
+    <color name="b2b_btn_todo">#00ff00</color>
     <color name="b2b_btn_done">#62B1CB</color>
     <color name="b2b_btn_end">#AAAAAA</color>
 </resources>

app_core/common/src/main/res/values/styles.xml

@@ -1052,13 +1052,13 @@
 
     <style name="StyledBlueIndicators" parent="@style/AppTheme">
         <item name="vpiTabPageIndicatorStyle">@style/CustomBlueTabPageIndicator</item>
-        <item name="vpiUnderlinePageIndicatorStyle">@style/CustomBlueUnderlinePageIndicator</item>
+        <!--<item name="vpiUnderlinePageIndicatorStyle">@style/CustomBlueUnderlinePageIndicator</item>-->
     </style>
 
     <style name="CustomBlueTabPageIndicator" parent="Widget.TabPageIndicator">
         <!-- 点击时在不同状态下显示的背景色 -->
         <!--<item name="android:background">@drawable/vpi__tab_indicator</item>-->
-        <item name="android:background">@color/b2b_tab_bg</item>
+        <item name="android:background">@drawable/selector_b2b_business_tab_bg</item>
         <!-- 分割线图片设置 -->
         <item name="android:divider">@drawable/dividing_line</item>
         <!-- 设置分割线的显示位置，或是不显示 -->

app_core/network/src/main/java/com/me/network/app/http/HttpRequest.java

@@ -94,7 +94,7 @@ public class HttpRequest {
 
             @Override
             public void onFailure(Object t) {
-                String failMsg = "系统错误";
+                String failMsg = "服务器异常";
                 if (t != null) {
                     String result = t.toString();
                     try {
@@ -114,6 +114,9 @@ public class HttpRequest {
                     }
                 }
                 try {
+                    if (failMsg.length() > 40) {
+                        failMsg = "服务器异常";
+                    }
                     callback.onFail(httpParams.getFlag(), failMsg);
                 } catch (Exception e) {
                     e.printStackTrace();

app_modular/appworks/src/main/java/com/uas/appworks/activity/B2BBusinessMainActivity.java

@@ -26,7 +26,6 @@ import com.core.base.activity.BaseMVPActivity;
 import com.core.utils.CommonUtil;
 import com.core.utils.SpanUtils;
 import com.core.widget.DrawableCenterTextView;
-import com.core.widget.RecycleViewDivider;
 import com.me.network.app.base.HttpCallback;
 import com.me.network.app.base.HttpParams;
 import com.me.network.app.http.HttpRequest;
@@ -114,21 +113,21 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
 
         mPurchaseOrderRv.setLayoutManager(new LinearLayoutManager(mContext));
         mPurchaseOrderRv.setNestedScrollingEnabled(false);
-        mPurchaseOrderRv.addItemDecoration(new RecycleViewDivider(mContext, LinearLayout.HORIZONTAL, 1, getResources().getColor(R.color.gray_light)));
+//        mPurchaseOrderRv.addItemDecoration(new RecycleViewDivider(mContext, LinearLayout.HORIZONTAL, 1, getResources().getColor(R.color.gray_light)));
         mPurchaseOrderBeans = new ArrayList<>();
         mPurchaseOrderAdapter = new B2bBusinessListAdapter(mContext, mPurchaseOrderBeans);
         mPurchaseOrderRv.setAdapter(mPurchaseOrderAdapter);
 
         mCustomerInquiryRv.setLayoutManager(new LinearLayoutManager(mContext));
         mCustomerInquiryRv.setNestedScrollingEnabled(false);
-        mCustomerInquiryRv.addItemDecoration(new RecycleViewDivider(mContext, LinearLayout.HORIZONTAL, 1, getResources().getColor(R.color.gray_light)));
+//        mCustomerInquiryRv.addItemDecoration(new RecycleViewDivider(mContext, LinearLayout.HORIZONTAL, 1, getResources().getColor(R.color.gray_light)));
         mCustomerInquiryBeans = new ArrayList<>();
         mCustomerInquiryAdapter = new B2bBusinessListAdapter(mContext, mCustomerInquiryBeans);
         mCustomerInquiryRv.setAdapter(mCustomerInquiryAdapter);
 
         mPublicInquiryRv.setLayoutManager(new LinearLayoutManager(mContext));
         mPublicInquiryRv.setNestedScrollingEnabled(false);
-        mPublicInquiryRv.addItemDecoration(new RecycleViewDivider(mContext, LinearLayout.HORIZONTAL, 1, getResources().getColor(R.color.gray_light)));
+//        mPublicInquiryRv.addItemDecoration(new RecycleViewDivider(mContext, LinearLayout.HORIZONTAL, 1, getResources().getColor(R.color.gray_light)));
         mPublicInquiryBeans = new ArrayList<>();
         mPublicInquiryAdapter = new B2bBusinessListAdapter(mContext, mPublicInquiryBeans);
         mPublicInquiryRv.setAdapter(mPublicInquiryAdapter);
@@ -202,14 +201,14 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
                 mSelectPosition = position;
                 Intent intent = new Intent();
                 String billState = mPublicInquiryBeans.get(position).getBillState();
-                if (Constants.FLAG.STATE_PUBLIC_INQUIRY_DONE.equals(billState)
-                        || Constants.FLAG.STATE_PUBLIC_INQUIRY_INVALID.equals(billState)) {
+                if (Constants.FLAG.STATE_PUBLIC_INQUIRY_DONE.equals(billState)) {
                     intent.setClass(mContext, PublicInquiryDetailActivity.class);
                     intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_ID, mPublicInquiryBeans.get(position).getId());
                     intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_STATE, mPublicInquiryBeans.get(position).getBillState());
                     intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_JSON, mPublicInquiryBeans.get(position).getJsonData());
                     startActivity(intent);
-                } else if (Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO.equals(billState)) {
+                } else if (Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO.equals(billState)
+                        || Constants.FLAG.STATE_PUBLIC_INQUIRY_INVALID.equals(billState)) {
                     intent.setClass(mContext, CustomerInquiryDetailActivity.class);
                     intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_ID, mPublicInquiryBeans.get(position).getId());
                     intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_STATE, mPublicInquiryBeans.get(position).getBillState());
@@ -402,6 +401,10 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
                 if (date != 0) {
                     b2BBusinessListBean.setBillDate(DateFormatUtil.long2Str(date, DateFormatUtil.YMD));
                 }
+
+                String needquantity = JSONUtil.getText(contentObject, "needquantity");
+                b2BBusinessListBean.setProductAmount(needquantity);
+
                 JSONObject inquiryObject = contentObject.getJSONObject("inquiry");
                 JSONObject productObject = contentObject.getJSONObject("product");
 
@@ -426,6 +429,13 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
                 String overdue = JSONUtil.getText(contentObject, "overdue");
                 String status = JSONUtil.getText(contentObject, "status");
                 long remainingTime = JSONUtil.getLong(contentObject, "remainingTime");//剩余时间
+
+                if (remainingTime <= 0) {
+                    b2BBusinessListBean.setRemainTime(0);
+                } else {
+                    b2BBusinessListBean.setRemainTime((int) Math.ceil((float) remainingTime / (1000 * 60 * 60 * 24)));
+                }
+
                 if (quoted == 1) {
                     b2BBusinessListBean.setBillState(Constants.FLAG.STATE_PUBLIC_INQUIRY_DONE);
                 } else {
@@ -458,6 +468,7 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
 
                 JSONObject inquiryObject = contentObject.getJSONObject("inquiry");
                 JSONObject productObject = contentObject.getJSONObject("product");
+                long endDate = 0, billDate = 0;
                 if (inquiryObject != null) {
                     JSONObject enterpriseObject = inquiryObject.getJSONObject("enterprise");
                     if (enterpriseObject != null) {
@@ -465,7 +476,7 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
                     }
                     b2BBusinessListBean.setBillNum(JSONUtil.getText(inquiryObject, "code"));
 
-                    long endDate = inquiryObject.getLongValue("endDate");
+                    endDate = inquiryObject.getLongValue("endDate");
                     if (endDate != 0) {
                         b2BBusinessListBean.setExpiryDate(DateFormatUtil.long2Str(endDate, DateFormatUtil.YMD));
                     }
@@ -475,9 +486,17 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
                     b2BBusinessListBean.setMaterialName(JSONUtil.getText(productObject, "title"));
                     b2BBusinessListBean.setMaterialSpec(JSONUtil.getText(productObject, "spec"));
                 }
-                long date = contentObject.getLongValue("date");
-                if (date != 0) {
-                    b2BBusinessListBean.setBillDate(DateFormatUtil.long2Str(date, DateFormatUtil.YMD));
+                billDate = contentObject.getLongValue("date");
+                if (billDate != 0) {
+                    b2BBusinessListBean.setBillDate(DateFormatUtil.long2Str(billDate, DateFormatUtil.YMD));
+                }
+
+                long remainDate = endDate - System.currentTimeMillis();
+                if (remainDate <= 0) {
+                    remainDate = 0;
+                    b2BBusinessListBean.setRemainTime(0);
+                } else {
+                    b2BBusinessListBean.setRemainTime((int) Math.ceil((float) remainDate / (1000 * 60 * 60 * 24)));
                 }
 
                 String invalid = JSONUtil.getText(contentObject, "invalid");

app_modular/appworks/src/main/java/com/uas/appworks/adapter/B2BDetailListAdapter.java

@@ -166,8 +166,9 @@ public class B2BDetailListAdapter extends RecyclerView.Adapter<RecyclerView.View
                             @Override
                             public boolean onSelection(MaterialDialog materialDialog, View view, int which, CharSequence charSequence) {
                                 String option = options.get(which);
-                                holder.valueTextView.setText(option);
+//                                holder.valueTextView.setText(option);
                                 b2BDetailListBean.setValue(option);
+                                notifyDataSetChanged();
                                 return true;
                             }
                         }).positiveText(mContext.getString(com.core.app.R.string.common_sure)).build().show();

app_modular/appworks/src/main/java/com/uas/appworks/adapter/B2BQuotePriceAdapter.java

@@ -64,10 +64,19 @@ public class B2BQuotePriceAdapter extends RecyclerView.Adapter<B2BQuotePriceAdap
         }
 
         if (isEditable) {
-            holder.mAmountEditText.setVisibility(View.VISIBLE);
-            holder.mPriceEditText.setVisibility(View.VISIBLE);
-            holder.mAmountTextView.setVisibility(View.GONE);
-            holder.mPriceTextView.setVisibility(View.GONE);
+            if (position == 0) {
+                holder.mAmountEditText.setVisibility(View.GONE);
+                holder.mPriceEditText.setVisibility(View.VISIBLE);
+                holder.mAmountTextView.setVisibility(View.VISIBLE);
+                holder.mPriceTextView.setVisibility(View.GONE);
+
+                holder.mAmountTextView.setText("0");
+            } else {
+                holder.mAmountEditText.setVisibility(View.VISIBLE);
+                holder.mPriceEditText.setVisibility(View.VISIBLE);
+                holder.mAmountTextView.setVisibility(View.GONE);
+                holder.mPriceTextView.setVisibility(View.GONE);
+            }
 
             holder.mDeleteLine.setVisibility(View.VISIBLE);
 

app_modular/appworks/src/main/java/com/uas/appworks/adapter/B2bBusinessListAdapter.java

@@ -1,10 +1,14 @@
 package com.uas.appworks.adapter;
 
 import android.content.Context;
+import android.graphics.Color;
+import android.text.SpannableStringBuilder;
 
 import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
+import com.common.system.DisplayUtil;
 import com.core.app.Constants;
+import com.core.utils.SpanUtils;
 import com.uas.appworks.R;
 import com.uas.appworks.model.bean.B2BBusinessListBean;
 
@@ -17,6 +21,7 @@ import java.util.List;
  */
 
 public class B2bBusinessListAdapter extends BaseMultiItemQuickAdapter<B2BBusinessListBean, BaseViewHolder> {
+    private SpanUtils mSpanUtils;
 
     public B2bBusinessListAdapter(Context context, List<B2BBusinessListBean> b2BBusinessListBeans) {
         super(b2BBusinessListBeans);
@@ -52,6 +57,15 @@ public class B2bBusinessListAdapter extends BaseMultiItemQuickAdapter<B2BBusines
         holder.setText(R.id.list_public_inquiry_product_brand_tv, b2BBusinessListBean.getProductBrand());
         holder.setText(R.id.list_public_inquiry_expiry_date_tv, b2BBusinessListBean.getExpiryDate());
 
+        mSpanUtils = new SpanUtils();
+        SpannableStringBuilder stringBuilder = mSpanUtils.append(mContext.getString(R.string.str_remain))
+                .append(b2BBusinessListBean.getRemainTime() + "").setForegroundColor(Color.RED)
+                .setBold().setFontSize(DisplayUtil.sp2px(mContext, 20))
+                .append(mContext.getString(R.string.str_days)).create();
+        if (stringBuilder != null) {
+            holder.setText(R.id.list_public_inquiry_remaintime_tv, stringBuilder);
+        }
+
         String billState = b2BBusinessListBean.getBillState();
         if (billState != null) {
             switch (billState) {
@@ -89,6 +103,15 @@ public class B2bBusinessListAdapter extends BaseMultiItemQuickAdapter<B2BBusines
         holder.setText(R.id.list_customer_inquiry_material_spec_tv, b2BBusinessListBean.getMaterialSpec());
         holder.setText(R.id.list_customer_inquiry_expiry_date_tv, b2BBusinessListBean.getExpiryDate());
 
+        mSpanUtils = new SpanUtils();
+        SpannableStringBuilder stringBuilder = mSpanUtils.append(mContext.getString(R.string.str_remain))
+                .append(b2BBusinessListBean.getRemainTime() + "").setForegroundColor(Color.RED)
+                .setBold().setFontSize(DisplayUtil.sp2px(mContext, 20))
+                .append(mContext.getString(R.string.str_days)).create();
+        if (stringBuilder != null) {
+            holder.setText(R.id.list_customer_inquiry_remaintime_tv, stringBuilder);
+        }
+
         String billState = b2BBusinessListBean.getBillState();
         if (billState != null) {
             switch (billState) {

app_modular/appworks/src/main/java/com/uas/appworks/fragment/B2BBusinessListFragment.java

@@ -6,7 +6,6 @@ import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.LinearLayout;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -21,7 +20,6 @@ import com.core.app.MyApplication;
 import com.core.base.activity.BaseMVPActivity;
 import com.core.base.fragment.BaseMVPFragment;
 import com.core.utils.CommonUtil;
-import com.core.widget.RecycleViewDivider;
 import com.me.network.app.base.HttpCallback;
 import com.me.network.app.base.HttpParams;
 import com.me.network.app.http.HttpRequest;
@@ -118,7 +116,7 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
 
         mRecyclerView.setLayoutManager(new LinearLayoutManager(mContext));
         mRecyclerView.setNestedScrollingEnabled(false);
-        mRecyclerView.addItemDecoration(new RecycleViewDivider(mContext, LinearLayout.HORIZONTAL, 1, getResources().getColor(R.color.gray_light)));
+//        mRecyclerView.addItemDecoration(new RecycleViewDivider(mContext, LinearLayout.HORIZONTAL, 1, getResources().getColor(R.color.gray_light)));
         mRecyclerView.setAdapter(mB2BBusinessListAdapter);
 
     }
@@ -151,14 +149,14 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
                     case B2BBusinessListBean.PUBLIC_INQUIRY_LIST:
                         intent = new Intent();
                         String billState = data.get(position).getBillState();
-                        if (Constants.FLAG.STATE_PUBLIC_INQUIRY_DONE.equals(billState)
-                                || Constants.FLAG.STATE_PUBLIC_INQUIRY_INVALID.equals(billState)) {
+                        if (Constants.FLAG.STATE_PUBLIC_INQUIRY_DONE.equals(billState)) {
                             intent.setClass(mContext, PublicInquiryDetailActivity.class);
                             intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_ID, mB2BBusinessListBeans.get(position).getId());
                             intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_STATE, mB2BBusinessListBeans.get(position).getBillState());
                             intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_JSON, mB2BBusinessListBeans.get(position).getJsonData());
                             startActivity(intent);
-                        } else if (Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO.equals(billState)) {
+                        } else if (Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO.equals(billState)
+                                || Constants.FLAG.STATE_PUBLIC_INQUIRY_INVALID.equals(billState)) {
                             intent.setClass(mContext, CustomerInquiryDetailActivity.class);
                             intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_ID, mB2BBusinessListBeans.get(position).getId());
                             intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_STATE, mB2BBusinessListBeans.get(position).getBillState());
@@ -416,6 +414,10 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
                 if (date != 0) {
                     b2BBusinessListBean.setBillDate(DateFormatUtil.long2Str(date, DateFormatUtil.YMD));
                 }
+
+                String needquantity = JSONUtil.getText(contentObject, "needquantity");
+                b2BBusinessListBean.setProductAmount(needquantity);
+
                 JSONObject inquiryObject = contentObject.getJSONObject("inquiry");
                 JSONObject productObject = contentObject.getJSONObject("product");
 
@@ -440,6 +442,13 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
                 String overdue = JSONUtil.getText(contentObject, "overdue");
                 String status = JSONUtil.getText(contentObject, "status");
                 long remainingTime = JSONUtil.getLong(contentObject, "remainingTime");//剩余时间
+
+                if (remainingTime <= 0) {
+                    b2BBusinessListBean.setRemainTime(0);
+                } else {
+                    b2BBusinessListBean.setRemainTime((int) Math.ceil((float) remainingTime / (1000 * 60 * 60 * 24)));
+                }
+
                 if (quoted == 1) {
                     b2BBusinessListBean.setBillState(Constants.FLAG.STATE_PUBLIC_INQUIRY_DONE);
                 } else {
@@ -472,6 +481,8 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
 
                 JSONObject inquiryObject = contentObject.getJSONObject("inquiry");
                 JSONObject productObject = contentObject.getJSONObject("product");
+
+                long endDate = 0, billDate = 0;
                 if (inquiryObject != null) {
                     JSONObject enterpriseObject = inquiryObject.getJSONObject("enterprise");
                     if (enterpriseObject != null) {
@@ -479,7 +490,7 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
                     }
                     b2BBusinessListBean.setBillNum(JSONUtil.getText(inquiryObject, "code"));
 
-                    long endDate = inquiryObject.getLongValue("endDate");
+                    endDate = inquiryObject.getLongValue("endDate");
                     if (endDate != 0) {
                         b2BBusinessListBean.setExpiryDate(DateFormatUtil.long2Str(endDate, DateFormatUtil.YMD));
                     }
@@ -489,10 +500,19 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
                     b2BBusinessListBean.setMaterialName(JSONUtil.getText(productObject, "title"));
                     b2BBusinessListBean.setMaterialSpec(JSONUtil.getText(productObject, "spec"));
                 }
-                long date = contentObject.getLongValue("date");
-                if (date != 0) {
-                    b2BBusinessListBean.setBillDate(DateFormatUtil.long2Str(date, DateFormatUtil.YMD));
+                billDate = contentObject.getLongValue("date");
+                if (billDate != 0) {
+                    b2BBusinessListBean.setBillDate(DateFormatUtil.long2Str(billDate, DateFormatUtil.YMD));
                 }
+
+                long remainDate = endDate - System.currentTimeMillis();
+                if (remainDate <= 0) {
+                    remainDate = 0;
+                    b2BBusinessListBean.setRemainTime(0);
+                } else {
+                    b2BBusinessListBean.setRemainTime((int) Math.ceil((float) remainDate / (1000 * 60 * 60 * 24)));
+                }
+
                 String invalid = JSONUtil.getText(contentObject, "invalid");
                 String status = JSONUtil.getText(contentObject, "status");
                 String overdue = JSONUtil.getText(contentObject, "overdue");
@@ -564,10 +584,9 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
                     b2BBusinessListBean.setBillState(Constants.FLAG.STATE_PURCHASE_ORDER_END);
                 } else {
                     String status = JSONUtil.getText(contentObject, "status");
-                    String reply = JSONUtil.getText(contentObject, "reply");
                     if ("200".equals(status)) {
                         b2BBusinessListBean.setBillState(Constants.FLAG.STATE_PURCHASE_ORDER_TODO);
-                    } else if ("201".equals(status) && "1".equals(reply)) {
+                    } else if ("201".equals(status)) {
                         b2BBusinessListBean.setBillState(Constants.FLAG.STATE_PURCHASE_ORDER_DONE);
                     }
                 }

app_modular/appworks/src/main/java/com/uas/appworks/model/bean/B2BBusinessListBean.java

@@ -30,6 +30,7 @@ public class B2BBusinessListBean implements MultiItemEntity {
     private String mProductSpecification;//产品规格
     private String mProductAmount;//产品数量
     private String mProductBrand;//产品品牌
+    private int mRemainTime;//剩余天数
     private String mJsonData;
 
     @Override
@@ -169,6 +170,14 @@ public class B2BBusinessListBean implements MultiItemEntity {
         mProductBrand = productBrand;
     }
 
+    public int getRemainTime() {
+        return mRemainTime;
+    }
+
+    public void setRemainTime(int remainTime) {
+        mRemainTime = remainTime;
+    }
+
     public String getJsonData() {
         return mJsonData;
     }

app_modular/appworks/src/main/res/drawable/selector_b2b_list_item_bg.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/me_menu_item_press" android:state_checked="true" />
-    <item android:drawable="@color/me_menu_item_press" android:state_pressed="true" />
-    <item android:drawable="@color/me_menu_item_press" android:state_selected="true" />
+    <item android:drawable="@drawable/shape_b2b_gray_light_line_press_bg" android:state_checked="true" />
+    <item android:drawable="@drawable/shape_b2b_gray_light_line_press_bg" android:state_pressed="true" />
+    <item android:drawable="@drawable/shape_b2b_gray_light_line_press_bg" android:state_selected="true" />
 
-    <item android:drawable="@color/white" />
+    <item android:drawable="@drawable/shape_b2b_gray_light_line_bg" />
 </selector>

app_modular/appworks/src/main/res/drawable/shape_b2b_gray_light_line_bg.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <corners android:radius="8dp" />
+    <stroke
+        android:width="1dp"
+        android:color="#ddd" />
+    <solid android:color="@color/white" />
+</shape>

app_modular/appworks/src/main/res/drawable/shape_b2b_gray_light_line_press_bg.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <corners android:radius="8dp" />
+    <stroke
+        android:width="1dp"
+        android:color="#ddd" />
+    <solid android:color="@color/me_menu_item_press" />
+</shape>

app_modular/appworks/src/main/res/drawable/shape_b2b_list_company.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:bottom="-2dp">
+        <shape
+            android:shape="rectangle">
+
+            <corners
+                android:topLeftRadius="8dp"
+                android:topRightRadius="8dp" />
+
+            <solid android:color="#e9e9e9" />
+            <stroke
+                android:width="1dp"
+                android:color="#ddd" />
+        </shape>
+    </item>
+</layer-list>

app_modular/appworks/src/main/res/drawable/shape_b2b_quote_bg.xml

@@ -2,5 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
     <corners android:radius="6dp" />
-    <solid android:color="@color/red" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/red" />
 </shape>

app_modular/appworks/src/main/res/layout/activity_b2b_business_main.xml

@@ -22,16 +22,13 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="#f3f3f3"
             android:orientation="vertical">
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="8dp"
-                android:background="@color/gray_light" />
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="100dp"
+                android:background="@color/white"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
@@ -121,101 +118,135 @@
 
             </LinearLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="8dp"
-                android:background="@color/gray_light" />
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@color/b2b_tab_bg"
-                android:padding="8dp">
-
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/str_purchase_order_list" />
+                android:orientation="vertical">
 
-                <TextView
-                    android:id="@+id/b2b_business_main_purchase_order_all_tv"
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/all"
-                    android:textColor="@color/titleBlue" />
-            </LinearLayout>
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginTop="8dp"
+                    android:padding="6dp">
 
-            <android.support.v7.widget.RecyclerView
-                android:id="@+id/b2b_business_main_purchase_order_rv"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:overScrollMode="never"
-                android:scrollbars="none" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="8dp"
-                android:background="@color/gray_light" />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/str_purchase_order_list"
+                        android:textColor="@color/black" />
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="6dp"
+                        android:layout_marginRight="6dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/shape_horizontal_dotted_line"
+                        android:layerType="software" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/b2b_tab_bg"
-                android:padding="8dp">
+                    <TextView
+                        android:id="@+id/b2b_business_main_purchase_order_all_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:drawablePadding="4dp"
+                        android:drawableRight="@drawable/ic_b2b_all_list"
+                        android:text="@string/all"
+                        android:textColor="@color/titleBlue" />
+                </LinearLayout>
 
-                <TextView
-                    android:layout_width="0dp"
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/b2b_business_main_purchase_order_rv"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/str_customer_inquiry_list" />
+                    android:overScrollMode="never"
+                    android:scrollbars="none" />
 
-                <TextView
-                    android:id="@+id/b2b_business_main_customer_inquiry_all_tv"
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/all"
-                    android:textColor="@color/titleBlue" />
-            </LinearLayout>
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginTop="8dp"
+                    android:padding="6dp">
 
-            <android.support.v7.widget.RecyclerView
-                android:id="@+id/b2b_business_main_customer_inquiry_rv"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:overScrollMode="never"
-                android:scrollbars="none" />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/str_customer_inquiry_list"
+                        android:textColor="@color/black"
+                        />
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="6dp"
+                        android:layout_marginRight="6dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/shape_horizontal_dotted_line"
+                        android:layerType="software" />
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="8dp"
-                android:background="@color/gray_light" />
+                    <TextView
+                        android:id="@+id/b2b_business_main_customer_inquiry_all_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:drawablePadding="4dp"
+                        android:drawableRight="@drawable/ic_b2b_all_list"
+                        android:text="@string/all"
+                        android:textColor="@color/titleBlue" />
+                </LinearLayout>
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/b2b_tab_bg"
-                android:padding="8dp">
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/b2b_business_main_customer_inquiry_rv"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:overScrollMode="never"
+                    android:scrollbars="none" />
 
-                <TextView
-                    android:layout_width="0dp"
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/str_public_inquiry_list" />
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginTop="8dp"
+                    android:padding="6dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/str_public_inquiry_list"
+                        android:textColor="@color/black" />
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="6dp"
+                        android:layout_marginRight="6dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/shape_horizontal_dotted_line"
+                        android:layerType="software" />
 
-                <TextView
-                    android:id="@+id/b2b_business_main_public_inquiry_all_tv"
-                    android:layout_width="wrap_content"
+                    <TextView
+                        android:id="@+id/b2b_business_main_public_inquiry_all_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:drawablePadding="4dp"
+                        android:drawableRight="@drawable/ic_b2b_all_list"
+                        android:text="@string/all"
+                        android:textColor="@color/titleBlue" />
+                </LinearLayout>
+
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/b2b_business_main_public_inquiry_rv"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/all"
-                    android:textColor="@color/titleBlue" />
+                    android:overScrollMode="never"
+                    android:scrollbars="none" />
             </LinearLayout>
-
-            <android.support.v7.widget.RecyclerView
-                android:id="@+id/b2b_business_main_public_inquiry_rv"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:overScrollMode="never"
-                android:scrollbars="none" />
         </LinearLayout>
     </android.support.v4.widget.NestedScrollView>
 </com.scwang.smartrefresh.layout.SmartRefreshLayout>

app_modular/appworks/src/main/res/layout/activity_customer_inquiry_detail.xml

@@ -17,6 +17,7 @@
             android:id="@+id/customer_inquiry_detail_data_rv"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:cacheColorHint="#00000000"
             android:overScrollMode="never"
             android:scrollbars="none" />
 
@@ -102,7 +103,8 @@
             android:id="@+id/customer_inquiry_detail_quote_rv"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="20dp" />
+            android:layout_marginBottom="20dp"
+            android:cacheColorHint="#00000000" />
 
         <Button
             android:id="@+id/customer_inquiry_detail_quote_btn"
@@ -114,6 +116,6 @@
             android:text="@string/str_quote_price"
             android:textColor="@color/white"
             android:textSize="@dimen/text_main"
-            android:visibility="gone"/>
+            android:visibility="gone" />
     </LinearLayout>
 </android.support.v4.widget.NestedScrollView>

app_modular/appworks/src/main/res/layout/activity_tab_viewpager.xml

@@ -14,7 +14,8 @@
     <com.viewpagerindicator.UnderlinePageIndicatorEx
         android:id="@+id/tab_viewpager_undertab"
         android:layout_width="match_parent"
-        android:layout_height="3dp" />
+        android:layout_height="3dp"
+        android:visibility="gone" />
 
     <android.support.v4.view.ViewPager
         android:id="@+id/tab_viewpager_vp"

app_modular/appworks/src/main/res/layout/fragment_b2b_list.xml

@@ -16,6 +16,7 @@
         android:id="@+id/b2b_list_rv"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="#f3f3f3"
         android:overScrollMode="never"
         android:scrollbars="none" />
 

app_modular/appworks/src/main/res/layout/layout_list_customer_inquiry.xml

@@ -1,267 +1,231 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<android.support.v7.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/selector_b2b_list_item_bg"
-    android:padding="12dp">
-
-    <LinearLayout
-        android:id="@+id/linearLayout2"
+    android:layout_marginLeft="4dp"
+    android:layout_marginRight="4dp"
+    android:layerType="software"
+    app:cardBackgroundColor="@color/white"
+    app:cardCornerRadius="8dp"
+    app:cardElevation="4dp"
+    app:cardPreventCornerOverlap="false"
+    app:cardUseCompatPadding="true">
+
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:background="@drawable/selector_b2b_list_item_bg">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
+            android:orientation="vertical">
 
             <TextView
                 android:id="@+id/list_customer_inquiry_company_tv"
-                android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
+                android:background="@drawable/shape_b2b_list_company"
+                android:padding="6dp"
                 android:textColor="@color/black"
                 android:textSize="16sp"
                 tools:text="深圳市英唐数码电器有限公司" />
 
-            <TextView
-                android:id="@+id/list_customer_inquiry_bill_date_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textSize="14sp"
-                tools:text="2018-01-21" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="0dp"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/str_bill_num"
-                android:textSize="14sp" />
-
-            <TextView
-                android:id="@+id/list_customer_inquiry_bill_num_tv"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="4dp"
-                android:layout_weight="3"
-                android:textColor="@color/black"
-                android:textSize="14sp"
-                tools:text="2018-01-21" />
+                android:orientation="horizontal"
+                android:padding="8dp">
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="7"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="6dp"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            style="@style/b2b_business_item_caption"
+                            android:text="@string/str_bill_num" />
+
+                        <TextView
+                            android:id="@+id/list_customer_inquiry_bill_num_tv"
+                            style="@style/b2b_business_item_value"
+                            tools:text="2018-01-21" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="6dp"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            style="@style/b2b_business_item_caption"
+                            android:text="@string/str_material_num" />
+
+                        <TextView
+                            android:id="@+id/list_customer_inquiry_material_num_tv"
+                            style="@style/b2b_business_item_value"
+                            tools:text="2018-01-21" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="6dp"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            style="@style/b2b_business_item_caption"
+                            android:text="@string/str_material_name" />
+
+                        <TextView
+                            android:id="@+id/list_customer_inquiry_material_name_tv"
+                            style="@style/b2b_business_item_value"
+                            tools:text="2018-01-21" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="6dp"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            style="@style/b2b_business_item_caption"
+                            android:text="@string/str_material_spec" />
+
+                        <TextView
+                            android:id="@+id/list_customer_inquiry_material_spec_tv"
+                            style="@style/b2b_business_item_value"
+                            tools:text="2018-01-21" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="6dp"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            style="@style/b2b_business_item_caption"
+                            android:text="@string/caption_inquiry_date" />
+
+                        <TextView
+                            android:id="@+id/list_customer_inquiry_bill_date_tv"
+                            style="@style/b2b_business_item_value"
+                            tools:text="2018-01-21" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="6dp"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            style="@style/b2b_business_item_caption"
+                            android:text="@string/str_expiry_date" />
+
+                        <TextView
+                            android:id="@+id/list_customer_inquiry_expiry_date_tv"
+                            style="@style/b2b_business_item_value"
+                            android:textStyle="bold"
+                            android:textColor="@color/red"
+                            tools:text="1323" />
+                    </LinearLayout>
+                </LinearLayout>
+
+                <View
+                    android:layout_width="200dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginBottom="6dp"
+                    android:layout_marginLeft="-100dp"
+                    android:layout_marginRight="-90dp"
+                    android:layout_marginTop="6dp"
+                    android:background="@drawable/shape_dotted_line" />
+
+                <RelativeLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="2"
+                    android:paddingBottom="6dp">
+
+                    <TextView
+                        android:id="@+id/list_customer_inquiry_remaintime_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerInParent="true"
+                        android:textSize="16sp"
+                        tools:text="剩余0天" />
+
+                    <TextView
+                        android:id="@+id/list_customer_inquiry_quotation_adopted_btn"
+                        style="@style/b2b_business_state_btn"
+                        android:background="@drawable/shape_b2b_end_bg"
+                        android:text="@string/str_quotation_adopted"
+                        android:textColor="@color/b2b_btn_end"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/list_customer_inquiry_expired_btn"
+                        style="@style/b2b_business_state_btn"
+                        android:background="@drawable/shape_b2b_end_bg"
+                        android:text="@string/str_expired"
+                        android:textColor="@color/b2b_btn_end"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/list_customer_inquiry_quoted_price_btn"
+                        style="@style/b2b_business_state_btn"
+                        android:background="@drawable/shape_b2b_end_bg"
+                        android:text="@string/str_quoted_price"
+                        android:textColor="@color/b2b_btn_end"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/list_customer_inquiry_wait_quoted_btn"
+                        style="@style/b2b_business_state_btn"
+                        android:background="@drawable/shape_b2b_todo_bg"
+                        android:text="@string/str_wait_quoted"
+                        android:textColor="@color/b2b_btn_todo"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/list_customer_inquiry_quotation_unadopted_btn"
+                        style="@style/b2b_business_state_btn"
+                        android:background="@drawable/shape_b2b_done_bg"
+                        android:text="@string/str_quotation_unadopted"
+                        android:textColor="@color/b2b_btn_done"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/list_customer_inquiry_invalid_btn"
+                        style="@style/b2b_business_state_btn"
+                        android:background="@drawable/shape_b2b_end_bg"
+                        android:text="@string/str_invalid"
+                        android:textColor="@color/b2b_btn_end"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/list_customer_inquiry_abandoned_btn"
+                        style="@style/b2b_business_state_btn"
+                        android:background="@drawable/shape_b2b_end_bg"
+                        android:text="@string/str_abandoned"
+                        android:textColor="@color/b2b_btn_end"
+                        android:visibility="gone" />
+                </RelativeLayout>
+            </LinearLayout>
         </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/str_material_num"
-                android:textSize="14sp" />
-
-            <TextView
-                android:id="@+id/list_customer_inquiry_material_num_tv"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="4dp"
-                android:layout_weight="3"
-                android:textColor="@color/black"
-                android:textSize="14sp"
-                tools:text="2018-01-21" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/str_material_name"
-                android:textSize="14sp" />
-
-            <TextView
-                android:id="@+id/list_customer_inquiry_material_name_tv"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="4dp"
-                android:layout_weight="3"
-                android:textColor="@color/black"
-                android:textSize="14sp"
-                tools:text="2018-01-21" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/str_material_spec"
-                android:textSize="14sp" />
-
-            <TextView
-                android:id="@+id/list_customer_inquiry_material_spec_tv"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="4dp"
-                android:layout_weight="3"
-                android:textColor="@color/black"
-                android:textSize="14sp"
-                tools:text="2018-01-21" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/str_expiry_date"
-                android:textSize="14sp" />
-
-            <TextView
-                android:id="@+id/list_customer_inquiry_expiry_date_tv"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="4dp"
-                android:layout_weight="3"
-                android:textColor="@color/red"
-                android:textSize="14sp"
-                android:textStyle="bold"
-                tools:text="1323" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/list_customer_inquiry_quotation_adopted_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:background="@drawable/shape_b2b_done_bg"
-        android:paddingBottom="4dp"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        android:paddingTop="4dp"
-        android:text="@string/str_quotation_adopted"
-        android:textColor="@color/b2b_btn_done"
-        android:visibility="gone" />
-
-    <TextView
-        android:id="@+id/list_customer_inquiry_expired_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:background="@drawable/shape_b2b_end_bg"
-        android:paddingBottom="4dp"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        android:paddingTop="4dp"
-        android:text="@string/str_expired"
-        android:textColor="@color/b2b_btn_end"
-        android:visibility="gone" />
-
-    <TextView
-        android:id="@+id/list_customer_inquiry_quoted_price_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:background="@drawable/shape_b2b_todo_bg"
-        android:paddingBottom="4dp"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        android:paddingTop="4dp"
-        android:text="@string/str_quoted_price"
-        android:textColor="@color/b2b_btn_todo"
-        android:visibility="gone" />
-
-    <TextView
-        android:id="@+id/list_customer_inquiry_wait_quoted_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:background="@drawable/shape_b2b_todo_bg"
-        android:paddingBottom="4dp"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        android:paddingTop="4dp"
-        android:text="@string/str_wait_quoted"
-        android:textColor="@color/b2b_btn_todo"
-        android:visibility="gone" />
-
-    <TextView
-        android:id="@+id/list_customer_inquiry_quotation_unadopted_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:background="@drawable/shape_b2b_end_bg"
-        android:paddingBottom="4dp"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        android:paddingTop="4dp"
-        android:text="@string/str_quotation_unadopted"
-        android:textColor="@color/b2b_btn_end"
-        android:visibility="gone" />
-
-    <TextView
-        android:id="@+id/list_customer_inquiry_invalid_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:background="@drawable/shape_b2b_end_bg"
-        android:paddingBottom="4dp"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        android:paddingTop="4dp"
-        android:text="@string/str_invalid"
-        android:textColor="@color/b2b_btn_end"
-        android:visibility="gone" />
-
-    <TextView
-        android:id="@+id/list_customer_inquiry_abandoned_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:background="@drawable/shape_b2b_end_bg"
-        android:paddingBottom="4dp"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        android:paddingTop="4dp"
-        android:text="@string/str_abandoned"
-        android:textColor="@color/b2b_btn_end"
-        android:visibility="gone" />
-
-</RelativeLayout>
+    </RelativeLayout>
+</android.support.v7.widget.CardView>

app_modular/appworks/src/main/res/layout/layout_list_public_inquiry.xml

@@ -1,233 +1,217 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<android.support.v7.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/selector_b2b_list_item_bg"
-    android:padding="12dp">
-
-    <LinearLayout
-        android:id="@+id/linearLayout2"
+    android:layout_marginLeft="4dp"
+    android:layout_marginRight="4dp"
+    android:layerType="software"
+    app:cardBackgroundColor="@color/white"
+    app:cardCornerRadius="8dp"
+    app:cardElevation="4dp"
+    app:cardPreventCornerOverlap="false"
+    app:cardUseCompatPadding="true">
+
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:background="@drawable/selector_b2b_list_item_bg">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
+            android:orientation="vertical">
 
             <TextView
                 android:id="@+id/list_public_inquiry_company_tv"
-                android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
+                android:background="@drawable/shape_b2b_list_company"
+                android:padding="6dp"
                 android:textColor="@color/black"
                 android:textSize="16sp"
                 tools:text="深圳市英唐数码电器有限公司" />
 
-            <TextView
-                android:id="@+id/list_public_inquiry_bill_date_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textSize="14sp"
-                tools:text="2018-01-21" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/str_product_name"
-                android:textSize="14sp" />
-
-            <TextView
-                android:id="@+id/list_public_inquiry_product_name_tv"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="4dp"
-                android:layout_weight="3"
-                android:textColor="@color/black"
-                android:textSize="14sp"
-                tools:text="2018-01-21" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/str_product_model"
-                android:textSize="14sp" />
-
-            <TextView
-                android:id="@+id/list_public_inquiry_product_model_tv"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="4dp"
-                android:layout_weight="3"
-                android:textColor="@color/black"
-                android:textSize="14sp"
-                tools:text="2018-01-21" />
-        </LinearLayout>
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="0dp"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/str_product_specification"
-                android:textSize="14sp" />
-
-            <TextView
-                android:id="@+id/list_public_inquiry_product_specification_tv"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="4dp"
-                android:layout_weight="3"
-                android:textColor="@color/black"
-                android:textSize="14sp"
-                tools:text="2018-01-21" />
+                android:orientation="horizontal"
+                android:padding="8dp">
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="7"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="6dp"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            style="@style/b2b_business_item_caption"
+                            android:text="@string/str_product_name"
+                            />
+
+                        <TextView
+                            android:id="@+id/list_public_inquiry_product_name_tv"
+                            style="@style/b2b_business_item_value"
+                            tools:text="2018-01-21" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="6dp"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            style="@style/b2b_business_item_caption"
+                            android:text="@string/str_product_model" />
+
+                        <TextView
+                            android:id="@+id/list_public_inquiry_product_model_tv"
+                            style="@style/b2b_business_item_value"
+                            tools:text="2018-01-21" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="6dp"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            style="@style/b2b_business_item_caption"
+                            android:text="@string/str_product_specification" />
+
+                        <TextView
+                            android:id="@+id/list_public_inquiry_product_specification_tv"
+                            style="@style/b2b_business_item_value"
+                            tools:text="2018-01-21" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="6dp"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            style="@style/b2b_business_item_caption"
+                            android:text="@string/str_product_brand" />
+
+                        <TextView
+                            android:id="@+id/list_public_inquiry_product_brand_tv"
+                            style="@style/b2b_business_item_value"
+                            tools:text="2018-01-21" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="6dp"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            style="@style/b2b_business_item_caption"
+                            android:text="@string/str_product_amount" />
+
+                        <TextView
+                            android:id="@+id/list_public_inquiry_product_amount_tv"
+                            style="@style/b2b_business_item_value"
+                            tools:text="2018-01-21" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="6dp"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            style="@style/b2b_business_item_caption"
+                            android:text="@string/caption_inquiry_date" />
+
+                        <TextView
+                            android:id="@+id/list_public_inquiry_bill_date_tv"
+                            style="@style/b2b_business_item_value"
+                            tools:text="2018-01-21" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="6dp"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            style="@style/b2b_business_item_caption"
+                            android:text="@string/str_expiry_date" />
+
+                        <TextView
+                            android:id="@+id/list_public_inquiry_expiry_date_tv"
+                            style="@style/b2b_business_item_value"
+                            android:textColor="@color/red"
+                            android:textStyle="bold"
+                            tools:text="1323" />
+                    </LinearLayout>
+                </LinearLayout>
+
+                <View
+                    android:layout_width="200dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginBottom="6dp"
+                    android:layout_marginLeft="-100dp"
+                    android:layout_marginRight="-90dp"
+                    android:layout_marginTop="6dp"
+                    android:background="@drawable/shape_dotted_line" />
+
+                <RelativeLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="2"
+                    android:paddingBottom="6dp">
+
+                    <TextView
+                        android:id="@+id/list_public_inquiry_remaintime_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerInParent="true"
+                        android:textSize="16sp"
+                        tools:text="剩余0天" />
+
+                    <TextView
+                        android:id="@+id/list_public_inquiry_offer_quotation_btn"
+                        style="@style/b2b_business_state_btn"
+                        android:background="@drawable/shape_b2b_quote_bg"
+                        android:text="@string/str_offer_quotation"
+                        android:textColor="@color/red"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/list_public_inquiry_done_btn"
+                        style="@style/b2b_business_state_btn"
+                        android:background="@drawable/shape_b2b_end_bg"
+                        android:text="@string/str_quoted_price"
+                        android:textColor="@color/b2b_btn_end"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/list_public_inquiry_invalid_btn"
+                        style="@style/b2b_business_state_btn"
+                        android:background="@drawable/shape_b2b_end_bg"
+                        android:text="@string/str_finished"
+                        android:textColor="@color/b2b_btn_end"
+                        android:visibility="gone" />
+
+                </RelativeLayout>
+            </LinearLayout>
         </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/str_product_brand"
-                android:textSize="14sp" />
-
-            <TextView
-                android:id="@+id/list_public_inquiry_product_brand_tv"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="4dp"
-                android:layout_weight="3"
-                android:textColor="@color/black"
-                android:textSize="14sp"
-                tools:text="2018-01-21" />
-        </LinearLayout>
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/str_product_amount"
-                android:textSize="14sp" />
-
-            <TextView
-                android:id="@+id/list_public_inquiry_product_amount_tv"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="4dp"
-                android:layout_weight="3"
-                android:textColor="@color/black"
-                android:textSize="14sp"
-                tools:text="2018-01-21" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/str_expiry_date"
-                android:textSize="14sp" />
-
-            <TextView
-                android:id="@+id/list_public_inquiry_expiry_date_tv"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="4dp"
-                android:layout_weight="3"
-                android:textColor="@color/red"
-                android:textSize="14sp"
-                android:textStyle="bold"
-                tools:text="1323" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/list_public_inquiry_offer_quotation_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:background="@drawable/shape_b2b_quote_bg"
-        android:paddingBottom="4dp"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        android:paddingTop="4dp"
-        android:text="@string/str_offer_quotation"
-        android:textColor="@color/white"
-        android:visibility="gone" />
-
-    <TextView
-        android:id="@+id/list_public_inquiry_done_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:background="@drawable/shape_b2b_todo_bg"
-        android:paddingBottom="4dp"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        android:paddingTop="4dp"
-        android:text="@string/str_quoted_price"
-        android:textColor="@color/b2b_btn_todo"
-        android:visibility="gone" />
-
-    <TextView
-        android:id="@+id/list_public_inquiry_invalid_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:background="@drawable/shape_b2b_end_bg"
-        android:paddingBottom="4dp"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        android:paddingTop="4dp"
-        android:text="@string/str_finished"
-        android:textColor="@color/b2b_btn_end"
-        android:visibility="gone" />
-
-</RelativeLayout>
+    </RelativeLayout>
+</android.support.v7.widget.CardView>

app_modular/appworks/src/main/res/layout/layout_list_purchase_order.xml

@@ -1,157 +1,162 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<android.support.v7.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/selector_b2b_list_item_bg"
-    android:padding="12dp">
-
-    <LinearLayout
+    android:layout_marginLeft="4dp"
+    android:layout_marginRight="4dp"
+    android:layerType="software"
+    app:cardBackgroundColor="@color/white"
+    app:cardCornerRadius="8dp"
+    app:cardElevation="4dp"
+    app:cardPreventCornerOverlap="false"
+    app:cardUseCompatPadding="true">
+
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:layout_gravity="center"
+        android:background="@drawable/selector_b2b_list_item_bg">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
+            android:orientation="vertical">
 
             <TextView
                 android:id="@+id/list_purchase_order_company_tv"
-                android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
+                android:background="@drawable/shape_b2b_list_company"
+                android:padding="6dp"
                 android:textColor="@color/black"
                 android:textSize="16sp"
                 tools:text="深圳市英唐数码电器有限公司" />
 
-            <TextView
-                android:id="@+id/list_purchase_order_bill_date_tv"
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textSize="14sp"
-                tools:text="2018-01-21" />
+                android:orientation="horizontal"
+                android:padding="8dp">
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="7"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="6dp"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            style="@style/b2b_business_item_caption"
+                            android:text="@string/str_bill_num" />
+
+                        <TextView
+                            android:id="@+id/list_purchase_order_bill_num_tv"
+                            style="@style/b2b_business_item_value"
+                            tools:text="2018-01-21" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="6dp"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            style="@style/b2b_business_item_caption"
+                            android:text="@string/str_currency" />
+
+                        <TextView
+                            android:id="@+id/list_purchase_order_currency_tv"
+                            style="@style/b2b_business_item_value"
+                            tools:text="2018-01-21" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="6dp"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            style="@style/b2b_business_item_caption"
+                            android:text="@string/str_money" />
+
+                        <TextView
+                            android:id="@+id/list_purchase_order_money_tv"
+                            style="@style/b2b_business_item_value"
+                            android:textColor="@color/red"
+                            android:textStyle="bold"
+                            tools:text="1323" />
+                    </LinearLayout>
+
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="6dp"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            style="@style/b2b_business_item_caption"
+                            android:text="@string/caption_time" />
+
+                        <TextView
+                            android:id="@+id/list_purchase_order_bill_date_tv"
+                            style="@style/b2b_business_item_value"
+                            tools:text="2018-01-21" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="140dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginBottom="6dp"
+                    android:layout_marginLeft="-70dp"
+                    android:layout_marginRight="-60dp"
+                    android:layout_marginTop="6dp"
+                    android:background="@drawable/shape_dotted_line" />
+
+                <RelativeLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="2"
+                    android:paddingBottom="6dp">
+
+                    <TextView
+                        android:id="@+id/list_purchase_order_wait_reply_btn"
+                        style="@style/b2b_business_state_btn"
+                        android:background="@drawable/shape_b2b_todo_bg"
+                        android:text="@string/str_wait_for_reply"
+                        android:textColor="@color/b2b_btn_todo"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/list_purchase_order_have_replied_btn"
+                        style="@style/b2b_business_state_btn"
+                        android:background="@drawable/shape_b2b_end_bg"
+                        android:text="@string/str_have_replied"
+                        android:textColor="@color/b2b_btn_end"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/list_purchase_order_case_closed_btn"
+                        style="@style/b2b_business_state_btn"
+                        android:background="@drawable/shape_b2b_end_bg"
+                        android:text="@string/str_case_closed"
+                        android:textColor="@color/b2b_btn_end"
+                        android:visibility="gone" />
+                </RelativeLayout>
+            </LinearLayout>
         </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/str_bill_num"
-                android:textSize="14sp" />
-
-            <TextView
-                android:id="@+id/list_purchase_order_bill_num_tv"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="4dp"
-                android:layout_weight="3"
-                android:textColor="@color/black"
-                android:textSize="14sp"
-                tools:text="2018-01-21" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/str_currency"
-                android:textSize="14sp" />
-
-            <TextView
-                android:id="@+id/list_purchase_order_currency_tv"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="4dp"
-                android:layout_weight="3"
-                android:textColor="@color/black"
-                android:textSize="14sp"
-                tools:text="2018-01-21" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/str_money"
-                android:textSize="14sp" />
-
-            <TextView
-                android:id="@+id/list_purchase_order_money_tv"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="4dp"
-                android:layout_weight="3"
-                android:textColor="@color/red"
-                android:textSize="14sp"
-                android:textStyle="bold"
-                tools:text="1323" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/list_purchase_order_wait_reply_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:background="@drawable/shape_b2b_todo_bg"
-        android:paddingBottom="4dp"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        android:paddingTop="4dp"
-        android:text="@string/str_wait_for_reply"
-        android:textColor="@color/b2b_btn_todo"
-        android:visibility="gone" />
-
-    <TextView
-        android:id="@+id/list_purchase_order_have_replied_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:background="@drawable/shape_b2b_done_bg"
-        android:paddingBottom="4dp"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        android:paddingTop="4dp"
-        android:text="@string/str_have_replied"
-        android:textColor="@color/b2b_btn_done"
-        android:visibility="gone" />
-
-    <TextView
-        android:id="@+id/list_purchase_order_case_closed_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:background="@drawable/shape_b2b_end_bg"
-        android:paddingBottom="4dp"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        android:paddingTop="4dp"
-        android:text="@string/str_case_closed"
-        android:textColor="@color/b2b_btn_end"
-        android:visibility="gone" />
-</RelativeLayout>
+    </RelativeLayout>
+</android.support.v7.widget.CardView>

app_modular/appworks/src/main/res/values-en/strings.xml

@@ -60,21 +60,21 @@
     <string name="str_purchase_order_list">客户采购订单</string>
     <string name="str_customer_inquiry_list">客户询价单</string>
     <string name="str_public_inquiry_list">我的商机</string>
-    <string name="str_bill_num">单号：</string>
-    <string name="str_material_num">物料编号：</string>
-    <string name="str_money">金额：</string>
+    <string name="str_bill_num">单号:</string>
+    <string name="str_material_num">物料编号:</string>
+    <string name="str_money">金额:</string>
     <string name="str_wait_for_reply">待回复</string>
     <string name="str_have_replied">已回复</string>
     <string name="str_case_closed">已结案</string>
-    <string name="str_expiry_date">截止日期：</string>
-    <string name="str_quotation_adopted">报价已采纳</string>
+    <string name="str_expiry_date">截止日期:</string>
+    <string name="str_quotation_adopted">已采纳</string>
     <string name="str_expired">已过期</string>
     <string name="str_quoted_price">已报价</string>
-    <string name="str_product_name">产品名称：</string>
-    <string name="str_product_model">产品型号：</string>
-    <string name="str_product_specification">产品规格：</string>
-    <string name="str_product_amount">数量：</string>
-    <string name="str_product_brand">品牌：</string>
+    <string name="str_product_name">产品名称:</string>
+    <string name="str_product_model">产品型号:</string>
+    <string name="str_product_specification">产品规格:</string>
+    <string name="str_product_amount">数量:</string>
+    <string name="str_product_brand">品牌:</string>
     <string name="str_offer_quotation">我要报价</string>
     <string name="please_select_company">请选择以下企业登录</string>
     <string name="binded_company">已绑定企业</string>
@@ -88,7 +88,7 @@
     <string name="str_segments_amount">分段数量</string>
     <string name="str_segments_price">分段单价</string>
     <string name="str_quote_price">报价</string>
-    <string name="str_quotation_unadopted">报价未采纳</string>
+    <string name="str_quotation_unadopted">未采纳</string>
     <string name="str_invalid">已失效</string>
     <string name="str_unexpired">未过期</string>
     <string name="delivery_period_can_not_be_empty">交货周期不能为空</string>
@@ -120,8 +120,8 @@
     <string name="customer_inquiry_min_pack">最小包装</string>
     <string name="str_abandoned">已作废</string>
     <string name="title_quoted_price">已转报价</string>
-    <string name="str_material_name">物料名称：</string>
-    <string name="str_material_spec">物料规格：</string>
+    <string name="str_material_name">物料名称:</string>
+    <string name="str_material_spec">物料规格:</string>
     <string name="modify_quote_price">修改报价</string>
     <string name="str_currency">币别：</string>
     <string name="str_quote_information">报价信息</string>
@@ -179,4 +179,8 @@
     <string name="apply_hava_send">申请已发送</string>
     <string name="caption_invite_name">邀请人：</string>
     <string name="host_null_please_login_retry">站点地址获取失败，请重新登录后重试</string>
+    <string name="caption_time">时间:</string>
+    <string name="caption_inquiry_date">询价日期:</string>
+    <string name="str_remain">剩余</string>
+    <string name="str_days">天</string>
 </resources>

app_modular/appworks/src/main/res/values-zh-rCN/strings.xml

@@ -59,21 +59,21 @@
     <string name="str_purchase_order_list">客户采购订单</string>
     <string name="str_customer_inquiry_list">客户询价单</string>
     <string name="str_public_inquiry_list">我的商机</string>
-    <string name="str_bill_num">单号：</string>
-    <string name="str_material_num">物料编号：</string>
-    <string name="str_money">金额：</string>
+    <string name="str_bill_num">单号:</string>
+    <string name="str_material_num">物料编号:</string>
+    <string name="str_money">金额:</string>
     <string name="str_wait_for_reply">待回复</string>
     <string name="str_have_replied">已回复</string>
     <string name="str_case_closed">已结案</string>
-    <string name="str_expiry_date">截止日期：</string>
-    <string name="str_quotation_adopted">报价已采纳</string>
+    <string name="str_expiry_date">截止日期:</string>
+    <string name="str_quotation_adopted">已采纳</string>
     <string name="str_expired">已过期</string>
     <string name="str_quoted_price">已报价</string>
-    <string name="str_product_name">产品名称：</string>
-    <string name="str_product_model">产品型号：</string>
-    <string name="str_product_specification">产品规格：</string>
-    <string name="str_product_amount">数量：</string>
-    <string name="str_product_brand">品牌：</string>
+    <string name="str_product_name">产品名称:</string>
+    <string name="str_product_model">产品型号:</string>
+    <string name="str_product_specification">产品规格:</string>
+    <string name="str_product_amount">数量:</string>
+    <string name="str_product_brand">品牌:</string>
     <string name="str_offer_quotation">我要报价</string>
     <string name="please_select_company">请选择以下企业登录</string>
     <string name="binded_company">已绑定企业</string>
@@ -87,7 +87,7 @@
     <string name="str_segments_amount">分段数量</string>
     <string name="str_segments_price">分段单价</string>
     <string name="str_quote_price">报价</string>
-    <string name="str_quotation_unadopted">报价未采纳</string>
+    <string name="str_quotation_unadopted">未采纳</string>
     <string name="str_invalid">已失效</string>
     <string name="str_unexpired">未过期</string>
     <string name="delivery_period_can_not_be_empty">交货周期不能为空</string>
@@ -119,10 +119,10 @@
     <string name="customer_inquiry_min_pack">最小包装</string>
     <string name="str_abandoned">已作废</string>
     <string name="title_quoted_price">已转报价</string>
-    <string name="str_material_name">物料名称：</string>
-    <string name="str_material_spec">物料规格：</string>
+    <string name="str_material_name">物料名称:</string>
+    <string name="str_material_spec">物料规格:</string>
     <string name="modify_quote_price">修改报价</string>
-    <string name="str_currency">币别：</string>
+    <string name="str_currency">币别:</string>
     <string name="str_quote_information">报价信息</string>
     <string name="revolving_mobile_phone_full_screen_browsing">旋转手机可全屏浏览</string>
     <string name="number_of_segments_please_keep_increasing">分段数量请保持递增！</string>
@@ -178,4 +178,8 @@
     <string name="apply_hava_send">申请已发送</string>
     <string name="caption_invite_name">邀请人：</string>
     <string name="host_null_please_login_retry">站点地址获取失败，请重新登录后重试</string>
+    <string name="caption_time">时间:</string>
+    <string name="caption_inquiry_date">询价日期:</string>
+    <string name="str_remain">剩余</string>
+    <string name="str_days">天</string>
 </resources>

app_modular/appworks/src/main/res/values-zh-rTW/strings.xml

@@ -59,21 +59,21 @@
     <string name="str_purchase_order_list">客户采购订单</string>
     <string name="str_customer_inquiry_list">客户询价单</string>
     <string name="str_public_inquiry_list">我的商机</string>
-    <string name="str_bill_num">单号：</string>
-    <string name="str_material_num">物料编号：</string>
-    <string name="str_money">金额：</string>
+    <string name="str_bill_num">单号:</string>
+    <string name="str_material_num">物料编号:</string>
+    <string name="str_money">金额:</string>
     <string name="str_wait_for_reply">待回复</string>
     <string name="str_have_replied">已回复</string>
     <string name="str_case_closed">已结案</string>
-    <string name="str_expiry_date">截止日期：</string>
-    <string name="str_quotation_adopted">报价已采纳</string>
+    <string name="str_expiry_date">截止日期:</string>
+    <string name="str_quotation_adopted">已采纳</string>
     <string name="str_expired">已过期</string>
     <string name="str_quoted_price">已报价</string>
-    <string name="str_product_name">产品名称：</string>
-    <string name="str_product_model">产品型号：</string>
-    <string name="str_product_specification">产品规格：</string>
-    <string name="str_product_amount">数量：</string>
-    <string name="str_product_brand">品牌：</string>
+    <string name="str_product_name">产品名称:</string>
+    <string name="str_product_model">产品型号:</string>
+    <string name="str_product_specification">产品规格:</string>
+    <string name="str_product_amount">数量:</string>
+    <string name="str_product_brand">品牌:</string>
     <string name="str_offer_quotation">我要报价</string>
     <string name="please_select_company">请选择以下企业登录</string>
     <string name="binded_company">已绑定企业</string>
@@ -87,7 +87,7 @@
     <string name="str_segments_amount">分段数量</string>
     <string name="str_segments_price">分段单价</string>
     <string name="str_quote_price">报价</string>
-    <string name="str_quotation_unadopted">报价未采纳</string>
+    <string name="str_quotation_unadopted">未采纳</string>
     <string name="str_invalid">已失效</string>
     <string name="str_unexpired">未过期</string>
     <string name="delivery_period_can_not_be_empty">交货周期不能为空</string>
@@ -119,10 +119,10 @@
     <string name="customer_inquiry_min_pack">最小包装</string>
     <string name="str_abandoned">已作废</string>
     <string name="title_quoted_price">已转报价</string>
-    <string name="str_material_name">物料名称</string>
-    <string name="str_material_spec">物料规格</string>
+    <string name="str_material_name">物料名称:</string>
+    <string name="str_material_spec">物料规格:</string>
     <string name="modify_quote_price">修改报价</string>
-    <string name="str_currency">币别：</string>
+    <string name="str_currency">币别:</string>
     <string name="str_quote_information">报价信息</string>
     <string name="revolving_mobile_phone_full_screen_browsing">旋转手机可全屏浏览</string>
     <string name="number_of_segments_please_keep_increasing">分段数量请保持递增！</string>
@@ -178,4 +178,8 @@
     <string name="apply_hava_send">申请已发送</string>
     <string name="caption_invite_name">邀请人：</string>
     <string name="host_null_please_login_retry">站点地址获取失败，请重新登录后重试</string>
+    <string name="caption_time">时间:</string>
+    <string name="caption_inquiry_date">询价日期:</string>
+    <string name="str_remain">剩余</string>
+    <string name="str_days">天</string>
 </resources>

app_modular/appworks/src/main/res/values/strings.xml

@@ -92,21 +92,21 @@
     <string name="str_purchase_order_list">客户采购订单</string>
     <string name="str_customer_inquiry_list">客户询价单</string>
     <string name="str_public_inquiry_list">我的商机</string>
-    <string name="str_bill_num">单号：</string>
-    <string name="str_material_num">物料编号：</string>
-    <string name="str_money">金额：</string>
+    <string name="str_bill_num">单号:</string>
+    <string name="str_material_num">物料编号:</string>
+    <string name="str_money">金额:</string>
     <string name="str_wait_for_reply">待回复</string>
     <string name="str_have_replied">已回复</string>
     <string name="str_case_closed">已结案</string>
-    <string name="str_expiry_date">截止日期：</string>
-    <string name="str_quotation_adopted">报价已采纳</string>
+    <string name="str_expiry_date">截止日期:</string>
+    <string name="str_quotation_adopted">已采纳</string>
     <string name="str_expired">已过期</string>
     <string name="str_quoted_price">已报价</string>
-    <string name="str_product_name">产品名称：</string>
-    <string name="str_product_model">产品型号：</string>
-    <string name="str_product_specification">产品规格：</string>
-    <string name="str_product_amount">数量：</string>
-    <string name="str_product_brand">品牌：</string>
+    <string name="str_product_name">产品名称:</string>
+    <string name="str_product_model">产品型号:</string>
+    <string name="str_product_specification">产品规格:</string>
+    <string name="str_product_amount">数量:</string>
+    <string name="str_product_brand">品牌:</string>
     <string name="str_offer_quotation">我要报价</string>
     <string name="please_select_company">请选择以下企业登录</string>
     <string name="binded_company">已绑定企业</string>
@@ -120,7 +120,7 @@
     <string name="str_segments_amount">分段数量</string>
     <string name="str_segments_price">分段单价</string>
     <string name="str_quote_price">报价</string>
-    <string name="str_quotation_unadopted">报价未采纳</string>
+    <string name="str_quotation_unadopted">未采纳</string>
     <string name="str_invalid">已失效</string>
     <string name="str_unexpired">未过期</string>
     <string name="delivery_period_can_not_be_empty">交货周期不能为空</string>
@@ -152,10 +152,10 @@
     <string name="customer_inquiry_min_pack">最小包装</string>
     <string name="str_abandoned">已作废</string>
     <string name="title_quoted_price">已转报价</string>
-    <string name="str_material_name">物料名称：</string>
-    <string name="str_material_spec">物料规格：</string>
+    <string name="str_material_name">物料名称:</string>
+    <string name="str_material_spec">物料规格:</string>
     <string name="modify_quote_price">修改报价</string>
-    <string name="str_currency">币别：</string>
+    <string name="str_currency">币别:</string>
     <string name="str_quote_information">报价信息</string>
     <string name="revolving_mobile_phone_full_screen_browsing">旋转手机可全屏浏览</string>
     <string name="number_of_segments_please_keep_increasing">分段数量请保持递增！</string>
@@ -211,6 +211,10 @@
     <string name="apply_hava_send">申请已发送</string>
     <string name="caption_invite_name">邀请人：</string>
     <string name="host_null_please_login_retry">站点地址获取失败，请重新登录后重试</string>
+    <string name="caption_time">时间:</string>
+    <string name="caption_inquiry_date">询价日期:</string>
+    <string name="str_remain">剩余</string>
+    <string name="str_days">天</string>
 
 
 </resources>

app_modular/appworks/src/main/res/values/styles.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <style name="myprogressbar">
         <item name="android:indeterminateOnly">false</item>
         <item name="android:progressDrawable">@drawable/progressbar_diy
@@ -10,4 +11,33 @@
         <item name="android:minHeight">20dip</item>
         <item name="android:maxHeight">20dip</item>
     </style>
+
+    <style name="b2b_business_state_btn">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_alignParentBottom">true</item>
+        <item name="android:layout_centerHorizontal">true</item>
+        <item name="android:gravity">center</item>
+        <item name="android:paddingBottom">4dp</item>
+        <item name="android:paddingTop">4dp</item>
+        <item name="android:textSize">14sp</item>
+    </style>
+
+    <style name="b2b_business_item_caption">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_weight">2</item>
+        <item name="android:textSize">14sp</item>
+    </style>
+
+    <style name="b2b_business_item_value">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginLeft">0dp</item>
+        <item name="android:layout_weight">5</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:textColor">@color/black</item>
+        <item name="android:textSize">14sp</item>
+    </style>
 </resources>