备份

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Sat Jan 20 14:12:48 CST 2018
-debugName=495
+#Mon Jan 22 16:12:34 CST 2018
+debugName=548
 versionName=625
-debugCode=495
+debugCode=548
 versionCode=164

app_core/common/src/main/java/com/core/app/Constants.java

@@ -494,9 +494,12 @@ public class Constants {
         String STATE_CUSTOMER_INQUIRY_REFUSED = "refused";
         String STATE_CUSTOMER_INQUIRY_INVALID = "invalid";
 
-        int RESULT_PURCHASE_ORDER = 0x11;
-        int RESULT_CUSTOMER_INQUIRY = 0x12;
-        int RESULT_PUBLIC_INQUIRY = 0x13;
+        String STATE_PUBLIC_INQUIRY_DONE = "public_done";
+        String STATE_PUBLIC_INQUIRY_TODO = "public_todo";
+
+        int RESULT_PURCHASE_ORDER = 111;
+        int RESULT_CUSTOMER_INQUIRY = 112;
+        int RESULT_PUBLIC_INQUIRY = 113;
 
     }
 

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/activity/PurchaseDetailsActivity.java

@@ -1,33 +1,19 @@
 package com.uas.appworks.OA.platform.activity;
 
-import android.app.Activity;
 import android.content.Intent;
-import android.support.v7.widget.AppCompatButton;
 import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.text.Editable;
 import android.text.TextUtils;
 import android.view.KeyEvent;
-import android.view.LayoutInflater;
 import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.EditText;
 import android.widget.LinearLayout;
-import android.widget.ListView;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baidu.cyberplayer.utils.G;
-import com.baidu.platform.comapi.map.E;
-import com.chad.library.adapter.base.BaseViewHolder;
 import com.common.LogUtil;
-import com.common.data.CalendarUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
@@ -36,11 +22,7 @@ import com.common.thread.ThreadPool;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.net.http.http.OAHttpHelper;
-import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
-import com.core.utils.time.wheel.DateTimePicker;
-import com.core.widget.listener.EditChangeListener;
-import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
 import com.modular.apputils.activity.BaseNetActivity;
 import com.modular.apputils.listener.OnSmartHttpListener;
@@ -50,7 +32,6 @@ import com.uas.appworks.OA.platform.adapter.PurchaseDetailsAdapter;
 import com.uas.appworks.OA.platform.model.Purchase;
 import com.uas.appworks.R;
 
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -101,13 +82,13 @@ public class PurchaseDetailsActivity extends BaseNetActivity implements OnSmartH
     private void setStatus() {
         String title = "";
         switch (varStatus) {
-            case Constants.FLAG.STATE_CUSTOMER_INQUIRY_END:
+            case Constants.FLAG.STATE_PURCHASE_ORDER_END:
                 title = "已结案";
                 break;
-            case Constants.FLAG.STATE_CUSTOMER_INQUIRY_DONE:
+            case Constants.FLAG.STATE_PURCHASE_ORDER_DONE:
                 title = "已回复";
                 break;
-            case Constants.FLAG.STATE_CUSTOMER_INQUIRY_TODO:
+            case Constants.FLAG.STATE_PURCHASE_ORDER_TODO:
                 title = "待回复";
                 break;
         }
@@ -319,7 +300,7 @@ public class PurchaseDetailsActivity extends BaseNetActivity implements OnSmartH
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
             if (changeStatus) {
-                setResult(0x12, new Intent().putExtra(Constants.FLAG.KEY_PURCHASE_STATUS, varStatus));
+                setResult(Constants.FLAG.RESULT_PURCHASE_ORDER, new Intent().putExtra(Constants.FLAG.KEY_PURCHASE_STATUS, varStatus));
             }
         }
         return super.onOptionsItemSelected(item);
@@ -328,7 +309,7 @@ public class PurchaseDetailsActivity extends BaseNetActivity implements OnSmartH
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_BACK && changeStatus) {
-            setResult(0x12, new Intent().putExtra(Constants.FLAG.KEY_PURCHASE_STATUS, varStatus));
+            setResult(Constants.FLAG.RESULT_PURCHASE_ORDER, new Intent().putExtra(Constants.FLAG.KEY_PURCHASE_STATUS, varStatus));
         }
         return super.onKeyDown(keyCode, event);
     }

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

@@ -24,6 +24,7 @@ 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;
@@ -50,23 +51,15 @@ import java.util.Map;
  */
 
 public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter> implements View.OnClickListener, HttpCallback {
-    private static final int OBTAIN_PURCHASE_ORDER_LIST = 0x01, OBTAIN_CUSTOMER_INQUIRY_LIST = 0x02, OBTAIN_PUBLIC_INQUIRY_LIST = 0x03;
+    private static final int OBTAIN_PURCHASE_ORDER_LIST = 0x01, OBTAIN_CUSTOMER_INQUIRY_LIST = 0x02, OBTAIN_PUBLIC_INQUIRY_LIST = 0x03, REQUEST_PURCHASE_DETAIL = 0x04, REQUEST_CUSTOMER_DETAIL = 0x05, REQUEST_PUBLIC_DETAIL = 0x06;
 
     private RefreshLayout mRefreshLayout;
     private ImageView mBackImageView;
     private DrawableCenterTextView mCompanyNameTextView;
-    private LinearLayout mPurchaseOrderIv;
-    private LinearLayout mCustomerInquiryIv;
-    private LinearLayout mPublicInquiryIv;
-    private TextView mPurchaseOrderAllTv;
-    private RecyclerView mPurchaseOrderRv;
-    private TextView mCustomerInquiryAllTv;
-    private RecyclerView mCustomerInquiryRv;
-    private TextView mPublicInquiryAllTv;
-    private RecyclerView mPublicInquiryRv;
+    private LinearLayout mPurchaseOrderIv, mCustomerInquiryIv, mPublicInquiryIv;
+    private TextView mPurchaseOrderAllTv, mCustomerInquiryAllTv, mPublicInquiryAllTv, mAccountSureTextView, mAccountCancelTextView;
+    private RecyclerView mPurchaseOrderRv, mCustomerInquiryRv, mPublicInquiryRv, mAccountRecyclerView;
     private MaterialDialog mAccountDialog;
-    private RecyclerView mAccountRecyclerView;
-    private TextView mAccountSureTextView, mAccountCancelTextView;
 
     private B2BCompanyBean mB2BCompanyBean;
     private SpanUtils mSpanUtils;
@@ -75,6 +68,7 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
     private List<B2BBusinessListBean> mPurchaseOrderBeans, mCustomerInquiryBeans, mPublicInquiryBeans;
     private B2bBusinessListAdapter mPurchaseOrderAdapter, mCustomerInquiryAdapter, mPublicInquiryAdapter;
     private boolean isPurchaseSuccess, isCustomerSuccess, isPublicSuccess;
+    private int mSelectPosition = -1;
 
     @Override
     protected int getLayout() {
@@ -118,18 +112,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)));
         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)));
         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)));
         mPublicInquiryBeans = new ArrayList<>();
         mPublicInquiryAdapter = new B2bBusinessListAdapter(mContext, mPublicInquiryBeans);
         mPublicInquiryRv.setAdapter(mPublicInquiryAdapter);
@@ -174,35 +171,86 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
         mPurchaseOrderAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter baseQuickAdapter, View view, int i) {
+                mSelectPosition = i;
                 Intent intent = new Intent();
                 intent.setClass(mContext, PurchaseDetailsActivity.class);
                 intent.putExtra(Constants.FLAG.KEY_PURCHASE_ID, mPurchaseOrderBeans.get(i).getId());
                 intent.putExtra(Constants.FLAG.KEY_PURCHASE_STATUS, mPurchaseOrderBeans.get(i).getBillState());
-                startActivity(intent);
+                startActivityForResult(intent, REQUEST_PURCHASE_DETAIL);
             }
         });
 
         mCustomerInquiryAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter baseQuickAdapter, View view, int i) {
+                mSelectPosition = i;
                 Intent intent = new Intent();
                 intent.setClass(mContext, CustomerInquiryDetailActivity.class);
                 intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_ID, mCustomerInquiryBeans.get(i).getId());
                 intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_STATE, mCustomerInquiryBeans.get(i).getBillState());
                 intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_JSON, mCustomerInquiryBeans.get(i).getJsonData());
-                startActivity(intent);
+                startActivityForResult(intent, REQUEST_CUSTOMER_DETAIL);
             }
         });
 
         mPublicInquiryAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
-            public void onItemClick(BaseQuickAdapter baseQuickAdapter, View view, int i) {
+            public void onItemClick(BaseQuickAdapter baseQuickAdapter, View view, final int position) {
                 Intent intent = new Intent();
-                intent.setClass(mContext, PublicInquiryDetailActivity.class);
-                intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_ID, mPublicInquiryBeans.get(i).getId());
-                intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_STATE, mPublicInquiryBeans.get(i).getBillState());
-                intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_JSON, mPublicInquiryBeans.get(i).getJsonData());
-                startActivity(intent);
+                String billState = mPublicInquiryBeans.get(position).getBillState();
+                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)) {
+                    showLoading(null);
+
+                    Map<String, Object> params = new HashMap<>();
+                    //        params.put("en_uu", mEnuu);
+                    params.put("en_uu", 10041559);
+                    //        params.put("user_tel", MyApplication.getInstance().mLoginUser.getTelephone());
+                    params.put("user_tel", "15671616315");
+                    params.put("id", mPublicInquiryBeans.get(position).getId());
+
+                    HttpRequest.getInstance().sendRequest("http://218.17.158.219:24000/",
+                            new HttpParams.Builder()
+                                    .url("inquiry/sale/quote")
+                                    .method(Method.GET)
+                                    .setHeaders(new HashMap<String, Object>())
+                                    .setParams(params)
+                                    .build(), new HttpCallback() {
+                                @Override
+                                public void onSuccess(int flag, Object o) throws Exception {
+                                    hideLoading();
+                                    Intent intent = null;
+                                    String result = o.toString();
+                                    if (TextUtils.isEmpty(result)) {
+//                                        mSelectPosition = position;
+                                        intent = new Intent();
+                                        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());
+                                        intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_JSON, mPublicInquiryBeans.get(position).getJsonData());
+                                        startActivityForResult(intent, REQUEST_PUBLIC_DETAIL);
+                                    } else {
+                                        intent = new Intent();
+                                        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);
+                                    }
+                                }
+
+                                @Override
+                                public void onFail(int flag, String failStr) throws Exception {
+                                    hideLoading();
+                                    toast(failStr);
+                                }
+                            });
+                }
             }
         });
     }
@@ -229,6 +277,7 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
     }
 
     private void getListData(int flag) {
+        String host = "http://192.168.253.102:8090/platform-b2b/";
         String url = "";
         switch (flag) {
             case OBTAIN_PURCHASE_ORDER_LIST:
@@ -238,7 +287,8 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
                 url = "mobile/sale/inquiry/info/search";
                 break;
             case OBTAIN_PUBLIC_INQUIRY_LIST:
-                url = "mobile/purc/inquiry/publicInquiryItem";
+                host = "http://218.17.158.219:24000/";
+                url = "inquiry/public/mobile";
                 break;
         }
         showLoading(null);
@@ -252,7 +302,7 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
         params.put("page", 1);
         params.put("size", 3);
 
-        HttpRequest.getInstance().sendRequest("http://192.168.253.102:8090/platform-b2b/",
+        HttpRequest.getInstance().sendRequest(host,
                 new HttpParams.Builder()
                         .url(url)
                         .flag(flag)
@@ -277,6 +327,32 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
         progressDialog.dismiss();
     }
 
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == REQUEST_PURCHASE_DETAIL
+                && resultCode == Constants.FLAG.RESULT_PURCHASE_ORDER && data != null) {
+            String purchaseStatus = data.getStringExtra(Constants.FLAG.KEY_PURCHASE_STATUS);
+            B2BBusinessListBean b2BBusinessListBean = mPurchaseOrderBeans.get(mSelectPosition);
+            if (b2BBusinessListBean != null) {
+                b2BBusinessListBean.setBillState(purchaseStatus);
+                mPurchaseOrderAdapter.notifyDataSetChanged();
+            }
+        } else if (requestCode == REQUEST_CUSTOMER_DETAIL
+                && resultCode == Constants.FLAG.RESULT_CUSTOMER_INQUIRY) {
+            B2BBusinessListBean b2BBusinessListBean = mCustomerInquiryBeans.get(mSelectPosition);
+            if (b2BBusinessListBean != null) {
+                b2BBusinessListBean.setBillState(Constants.FLAG.STATE_CUSTOMER_INQUIRY_DONE);
+            }
+        } else if (requestCode == REQUEST_PUBLIC_DETAIL
+                && resultCode == Constants.FLAG.RESULT_PUBLIC_INQUIRY) {
+            /*B2BBusinessListBean b2BBusinessListBean = mPublicInquiryBeans.get(mSelectPosition);
+            if (b2BBusinessListBean != null) {
+                b2BBusinessListBean.setBillState(Constants.FLAG.STATE_PUBLIC_INQUIRY_DONE);
+            }*/
+        }
+    }
+
     @Override
     public void onSuccess(int flag, Object o) {
         try {
@@ -322,6 +398,7 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
                         return;
                     }
                     mPublicInquiryBeans.clear();
+                    analisisPublicInquiry(contentArray);
                     break;
                 default:
                     break;
@@ -332,6 +409,53 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
 
     }
 
+    private void analisisPublicInquiry(JSONArray contentArray) {
+        for (int i = 0; i < contentArray.size(); i++) {
+            JSONObject contentObject = contentArray.getJSONObject(i);
+            if (contentObject != null) {
+                B2BBusinessListBean b2BBusinessListBean = new B2BBusinessListBean();
+                b2BBusinessListBean.setJsonData(contentObject.toString());
+                b2BBusinessListBean.setItemType(B2BBusinessListBean.PUBLIC_INQUIRY_LIST);
+                b2BBusinessListBean.setId(JSONUtil.getText(contentObject, "id"));
+
+                long date = contentObject.getLongValue("date");
+                if (date != 0) {
+                    b2BBusinessListBean.setBillDate(DateFormatUtil.long2Str(date, DateFormatUtil.YMD));
+                }
+                JSONObject inquiryObject = contentObject.getJSONObject("inquiry");
+                JSONObject productObject = contentObject.getJSONObject("product");
+
+                if (productObject != null) {
+                    b2BBusinessListBean.setProductName(JSONUtil.getText(productObject, "title"));
+                    b2BBusinessListBean.setProductModel(JSONUtil.getText(productObject, "code"));
+                    b2BBusinessListBean.setProductSpecification(JSONUtil.getText(productObject, "spec"));
+                    b2BBusinessListBean.setProductBrand(JSONUtil.getText(productObject, "brand"));
+                }
+                if (inquiryObject != null) {
+                    JSONObject enterpriseObject = inquiryObject.getJSONObject("enterprise");
+                    if (enterpriseObject != null) {
+                        b2BBusinessListBean.setCompanyName(JSONUtil.getText(enterpriseObject, "enName"));
+                    }
+
+                    long endDate = inquiryObject.getLongValue("endDate");
+                    if (endDate != 0) {
+                        b2BBusinessListBean.setExpiryDate(DateFormatUtil.long2Str(endDate, DateFormatUtil.YMD));
+                    }
+                }
+                String invalid = JSONUtil.getText(contentObject, "invalid");
+                String overdue = JSONUtil.getText(contentObject, "overdue");
+                String status = JSONUtil.getText(contentObject, "status");
+                if ("1".equals(invalid) || "1".equals(overdue) || "201".equals(status)) {
+                    b2BBusinessListBean.setBillState(Constants.FLAG.STATE_PUBLIC_INQUIRY_DONE);
+                } else {
+                    b2BBusinessListBean.setBillState(Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO);
+                }
+                mPublicInquiryBeans.add(b2BBusinessListBean);
+            }
+        }
+        mPublicInquiryAdapter.notifyDataSetChanged();
+    }
+
     private void analysisCustomerInquiry(JSONArray contentArray) {
         for (int i = 0; i < contentArray.size(); i++) {
             JSONObject contentObject = contentArray.getJSONObject(i);
@@ -342,19 +466,22 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
                 b2BBusinessListBean.setId(JSONUtil.getText(contentObject, "id"));
 
                 JSONObject inquiryObject = contentObject.getJSONObject("inquiry");
+                JSONObject productObject = contentObject.getJSONObject("product");
                 if (inquiryObject != null) {
                     JSONObject enterpriseObject = inquiryObject.getJSONObject("enterprise");
                     if (enterpriseObject != null) {
                         b2BBusinessListBean.setCompanyName(JSONUtil.getText(enterpriseObject, "enName"));
                     }
-                    b2BBusinessListBean.setMaterialNum(JSONUtil.getText(inquiryObject, "code"));
-                    b2BBusinessListBean.setBillNum(JSONUtil.getText(inquiryObject, "id"));
+                    b2BBusinessListBean.setBillNum(JSONUtil.getText(inquiryObject, "code"));
 
                     long endDate = inquiryObject.getLongValue("endDate");
                     if (endDate != 0) {
                         b2BBusinessListBean.setExpiryDate(DateFormatUtil.long2Str(endDate, DateFormatUtil.YMD));
                     }
                 }
+                if (productObject != null) {
+                    b2BBusinessListBean.setMaterialNum(JSONUtil.getText(productObject, "code"));
+                }
                 long date = contentObject.getLongValue("date");
                 if (date != 0) {
                     b2BBusinessListBean.setBillDate(DateFormatUtil.long2Str(date, DateFormatUtil.YMD));
@@ -398,7 +525,11 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
                 b2BBusinessListBean.setJsonData(contentObject.toString());
                 b2BBusinessListBean.setItemType(B2BBusinessListBean.PURCHASE_ORDER_LIST);
                 b2BBusinessListBean.setId(JSONUtil.getText(contentObject, "id"));
-                b2BBusinessListBean.setCompanyName(JSONUtil.getText(contentObject, "receiveName"));
+
+                JSONObject enterprise = contentObject.getJSONObject("enterprise");
+                if (enterprise != null) {
+                    b2BBusinessListBean.setCompanyName(JSONUtil.getText(enterprise, "enName"));
+                }
 
                 long date = contentObject.getLongValue("date");
                 if (date != 0) {
@@ -523,6 +654,14 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
         if (mB2BCompanyBeans == null || mB2BCompanyBeans.size() == 0) {
             toast("您的账号未绑定任何B2B账套");
         } else {
+            for (B2BCompanyBean b2BCompanyBean : mB2BCompanyBeans) {
+                String enuu = b2BCompanyBean.getEnuu();
+                if (enuu != null && enuu.equals(mB2BCompanyBean.getEnuu())) {
+                    b2BCompanyBean.setSelected(true);
+                } else {
+                    b2BCompanyBean.setSelected(false);
+                }
+            }
             mB2BAccountAdapter.notifyDataSetChanged();
             mAccountDialog.show();
         }

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

@@ -51,7 +51,7 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
     private B2BQuotePriceAdapter mB2BQuotePriceAdapter;
     private List<B2BQuotePriceBean> mB2BQuotePriceBeans;
 
-    private String mId, mState, mJson;
+    private String mId, mState = "", mJson;
     private String mEnuu;
 
     @Override
@@ -102,7 +102,7 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
                             long endDate = inquiryObject.getLongValue("endDate");
                             long currentDate = System.currentTimeMillis();
                             if ("1".equals(checked) || currentDate > endDate) {
-                                initEditable(false, View.VISIBLE);
+                                initEditable(false, View.GONE);
                             } else {
                                 initEditable(true, View.VISIBLE);
                             }
@@ -126,6 +126,10 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
                         getSupportActionBar().setTitle(R.string.str_invalid);
                         initEditable(false, View.GONE);
                         break;
+                    case Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO:
+                        getSupportActionBar().setTitle(R.string.str_wait_quoted);
+                        initEditable(true, View.VISIBLE);
+                        break;
                 }
             }
         }
@@ -153,8 +157,11 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
 
     @Override
     protected void initData() {
-        initDetailData(mJson);
+        if (mJson != null && JSONUtil.validate(mJson)) {
+            initDetailData(mJson);
+        } else {
 
+        }
     }
 
     private void initDetailData(String detail) {
@@ -168,14 +175,16 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
             if (inquiryObject == null) {
                 inquiryObject = JSON.parseObject("");
             }
+            JSONObject enterpriseObject = inquiryObject.getJSONObject("enterprise");
             JSONObject recorderUser = inquiryObject.getJSONObject("recorderUser");
 
+            String customer = JSONUtil.getText(enterpriseObject, "enName");//客户
+            String customerAddress = JSONUtil.getText(enterpriseObject, "enAddress");//客户地址
+
             String userTel = "";
             if (recorderUser != null) {
                 userTel = JSONUtil.getText(recorderUser, "userTel");//客户联系电话
             }
-            String recorder = JSONUtil.getText(inquiryObject, "recorder");//客户
-            String ship = JSONUtil.getText(inquiryObject, "ship");//客户地址
             String billNum = JSONUtil.getText(inquiryObject, "code");//单据
 
             String material = "";
@@ -196,19 +205,19 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
             String minOrderQty = JSONUtil.getText(detailObject, "minOrderQty");//最小起订
             String minPackQty = JSONUtil.getText(detailObject, "minPackQty");//最小包装
 
-            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, "客户", recorder, "", "客户", ""));
-            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, "客户地址", ship, "", "客户地址", ""));
-            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, "联系电话", userTel, "", "联系电话", ""));
-            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, "单据", billNum, "", "单据", ""));
-            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, "物料", material, "", "物料", ""));
-            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, "币别", currency, "", "币别", ""));
-            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, "税率", taxrate, "", "税率", ""));
-            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, "环保要求", environment, "", "环保要求", ""));
-            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, "价格类型", priceType, "", "价格类型", ""));
+            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_customer), customer, "", "客户", ""));
+            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_customer_address), customerAddress, "", "客户地址", ""));
+            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_customer_phone), userTel, "", "联系电话", ""));
+            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_bill_num), billNum, "", "单据", ""));
+            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_material), material, "", "物料", ""));
+            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_currency), currency, "", "币别", ""));
+            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_taxrate), taxrate, "", "税率", ""));
+            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_environment), environment, "", "环保要求", ""));
+            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_price_type), priceType, "", "价格类型", ""));
 
-            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_EDIT, "交货周期", leadtime, "天", "leadtime", ""));
-            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_EDIT, "最小起订", minOrderQty, "PCS", "minOrderQty", ""));
-            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_EDIT, "最小包装", minPackQty, "PCS", "minPackQty", ""));
+            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_EDIT, getString(R.string.customer_inquiry_leadtime), leadtime, "天", "leadtime", ""));
+            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_EDIT, getString(R.string.customer_inquiry_min_order), minOrderQty, "PCS", "minOrderQty", ""));
+            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_EDIT, getString(R.string.customer_inquiry_min_pack), minPackQty, "PCS", "minPackQty", ""));
 
             mB2BDetailListAdapter.notifyDataSetChanged();
 
@@ -222,8 +231,10 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
 
                     mB2BQuotePriceBeans.add(createB2BQuotePriceBean(id, amount, price));
                 }
-                mB2BQuotePriceAdapter.notifyDataSetChanged();
+            } else {
+                mB2BQuotePriceBeans.add(createB2BQuotePriceBean(0, "", ""));
             }
+            mB2BQuotePriceAdapter.notifyDataSetChanged();
         }
     }
 
@@ -320,10 +331,19 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
             params.put("minPackQty", minPackQty);
             params.put("minOrderQty", minOrderQty);
 
+            params.put("useruu", "1000002503");
+
+
             showLoading(null);
-            HttpRequest.getInstance().sendRequest("http://192.168.253.102:8090/platform-b2b/"
+            String url = "mobile/sale/inquiry/items/" + mId + "/reply";
+            String host = "http://192.168.253.102:8090/platform-b2b/";
+            if (Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO.equals(mState)) {
+                url = "inquiry/sale/mobile/quote";
+                host = "http://218.17.158.219:24000/";
+            }
+            HttpRequest.getInstance().sendRequest(host
                     , new HttpParams.Builder()
-                            .url("mobile/sale/inquiry/items/" + mId + "/reply")
+                            .url(url)
                             .method(Method.POST)
                             .flag(CUSTOMER_INQUIRY_REPLY)
                             .setHeaders(new HashMap<String, Object>())
@@ -336,6 +356,15 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
         String result = o.toString();
         LogUtil.prinlnLongMsg("customerdetailsuccess", result);
         if (flag == CUSTOMER_INQUIRY_REPLY) {
+            getSupportActionBar().setTitle(R.string.str_quoted_price);
+            toast(getString(R.string.quote_success));
+            if (Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO.equals(mState)) {
+                setResult(Constants.FLAG.RESULT_PUBLIC_INQUIRY);
+                initEditable(false, View.GONE);
+            } else {
+                setResult(Constants.FLAG.RESULT_CUSTOMER_INQUIRY);
+            }
+
             Map<String, Object> params = new HashMap<>();
 //        params.put("en_uu", mEnuu);
             params.put("en_uu", 10041559);
@@ -343,9 +372,15 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
             params.put("user_tel", "15671616315");
             params.put("itemId", mId);
 
-            HttpRequest.getInstance().sendRequest("http://192.168.253.102:8090/platform-b2b/"
+            String url = "mobile/sale/inquiry/" + mId + "/info";
+            String host = "http://192.168.253.102:8090/platform-b2b/";
+            if (Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO.equals(mState)) {
+                url = "inquiry/sale/inquiry/detail";
+                host = "http://218.17.158.219:24000/";
+            }
+            HttpRequest.getInstance().sendRequest(host
                     , new HttpParams.Builder()
-                            .url("mobile/sale/inquiry/" + mId + "/info")
+                            .url(url)
                             .method(Method.GET)
                             .flag(CUSTOMER_INQUIRY_DETAIL)
                             .setHeaders(new HashMap<String, Object>())
@@ -353,15 +388,16 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
         } else if (flag == CUSTOMER_INQUIRY_DETAIL) {
             hideLoading();
 
-            getSupportActionBar().setTitle(R.string.str_quoted_price);
-            if (result != null && JSONUtil.validate(result)) {
+            if (Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO.equals(mState)) {
+
+            } else if (result != null && JSONUtil.validate(result)) {
                 JSONObject contentObject = JSON.parseObject(result);
                 JSONObject inquiryObject = contentObject.getJSONObject("inquiry");
                 String checked = JSONUtil.getText(inquiryObject, "checked");
                 long endDate = inquiryObject.getLongValue("endDate");
                 long currentDate = System.currentTimeMillis();
                 if ("1".equals(checked) || currentDate > endDate) {
-                    initEditable(false, View.VISIBLE);
+                    initEditable(false, View.GONE);
                 } else {
                     initEditable(true, View.VISIBLE);
                 }
@@ -370,7 +406,11 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
             }
             initDetailData(result);
 
-            setResult(Constants.FLAG.RESULT_CUSTOMER_INQUIRY);
+            if (Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO.equals(mState)) {
+                setResult(Constants.FLAG.RESULT_PUBLIC_INQUIRY);
+            } else {
+                setResult(Constants.FLAG.RESULT_CUSTOMER_INQUIRY);
+            }
         }
     }
 

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

@@ -1,16 +1,31 @@
 package com.uas.appworks.activity;
 
+import android.content.Intent;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.common.LogUtil;
+import com.common.data.DateFormatUtil;
+import com.common.data.JSONUtil;
+import com.core.app.Constants;
 import com.core.base.activity.BaseMVPActivity;
+import com.core.utils.CommonUtil;
+import com.me.network.app.base.HttpCallback;
+import com.me.network.app.base.HttpParams;
+import com.me.network.app.http.HttpRequest;
+import com.me.network.app.http.Method;
 import com.uas.appworks.R;
 import com.uas.appworks.adapter.B2BDetailListAdapter;
 import com.uas.appworks.model.bean.B2BDetailListBean;
 import com.uas.appworks.presenter.WorkPlatPresenter;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author RaoMeng
@@ -18,12 +33,16 @@ import java.util.List;
  * @date 2018/1/16 15:31
  */
 
-public class PublicInquiryDetailActivity extends BaseMVPActivity<WorkPlatPresenter> {
+public class PublicInquiryDetailActivity extends BaseMVPActivity<WorkPlatPresenter> implements HttpCallback {
+    private final int PUBLIC_INQUIRY_DETAIL = 0x16;
 
     private RecyclerView mInquiryRecyclerView, mMaterialRecyclerView;
     private List<B2BDetailListBean> mInquiryListBeans, mMaterialListBeans;
     private B2BDetailListAdapter mInquiryListAdapter, mMaterialListAdapter;
 
+    private String mId, mState, mJson;
+    private String mEnuu;
+
     @Override
     protected int getLayout() {
         return R.layout.activity_public_inquiry_detail;
@@ -31,6 +50,8 @@ public class PublicInquiryDetailActivity extends BaseMVPActivity<WorkPlatPresent
 
     @Override
     protected void initView() {
+        mEnuu = CommonUtil.getSharedPreferences(mContext, Constants.CACHE.B2B_BUSINESS_ENUU);
+
         mInquiryRecyclerView = $(R.id.public_inquiry_detail_inquiry_information_rv);
         mMaterialRecyclerView = $(R.id.public_inquiry_detail_material_information_rv);
 
@@ -46,6 +67,13 @@ public class PublicInquiryDetailActivity extends BaseMVPActivity<WorkPlatPresent
         mMaterialListBeans = new ArrayList<>();
         mMaterialListAdapter = new B2BDetailListAdapter(mContext, mMaterialListBeans);
         mMaterialRecyclerView.setAdapter(mMaterialListAdapter);
+
+        Intent intent = getIntent();
+        if (intent != null) {
+            mId = intent.getStringExtra(Constants.FLAG.EXTRA_B2B_LIST_ID);
+            mState = intent.getStringExtra(Constants.FLAG.EXTRA_B2B_LIST_STATE);
+            mJson = intent.getStringExtra(Constants.FLAG.EXTRA_B2B_LIST_JSON);
+        }
     }
 
     @Override
@@ -60,23 +88,78 @@ public class PublicInquiryDetailActivity extends BaseMVPActivity<WorkPlatPresent
 
     @Override
     protected void initData() {
-        mInquiryListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, "询价编号", "", "", "询价编号", ""));
-        mInquiryListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, "询价企业", "", "", "询价企业", ""));
-        mInquiryListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, "联系电话", "", "", "联系电话", ""));
-        mInquiryListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, "联系人", "", "", "联系人", ""));
-        mInquiryListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, "报价截止如期", "", "", "报价截止如期", ""));
-        mInquiryListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, "附件", "", "", "附件", ""));
-
-        mInquiryListAdapter.notifyItemRangeInserted(0, mInquiryListBeans.size());
-
-        mMaterialListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, "原厂型号", "", "", "原厂型号", ""));
-        mMaterialListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, "品牌", "", "", "品牌", ""));
-        mMaterialListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, "物料规格", "", "", "物料规格", ""));
-        mMaterialListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, "物料名称", "", "", "物料名称", ""));
-        mMaterialListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, "单位", "", "", "单位", ""));
-        mMaterialListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, "数量", "", "", "数量", ""));
-
-        mMaterialListAdapter.notifyItemRangeInserted(0, mMaterialListBeans.size());
+        if (mJson != null && JSONUtil.validate(mJson)) {
+            initDetailData(mJson);
+        } else {
+            showLoading(null);
+
+            Map<String, Object> params = new HashMap<>();
+//        params.put("en_uu", mEnuu);
+            params.put("en_uu", 10041559);
+//        params.put("user_tel", MyApplication.getInstance().mLoginUser.getTelephone());
+            params.put("user_tel", "15671616315");
+            params.put("id", mId);
+
+            HttpRequest.getInstance().sendRequest("http://218.17.158.219:24000/",
+                    new HttpParams.Builder()
+                            .url("inquiry/sale/publicInquiry/detail")
+                            .flag(PUBLIC_INQUIRY_DETAIL)
+                            .method(Method.GET)
+                            .setHeaders(new HashMap<String, Object>())
+                            .setParams(params)
+                            .build(), this);
+        }
+    }
+
+    private void initDetailData(String detail) {
+        JSONObject contentObject = JSON.parseObject(detail);
+        JSONObject inquiryObject = contentObject.getJSONObject("inquiry");
+        JSONObject productObject = contentObject.getJSONObject("product");
+
+        String inquiryId = "", inquiryCompany = "", phone = "", contact = "", enddate = "", attachs = "", model = "", brand = "", spec = "", material = "", unit = "", amount = "";
+
+        amount = JSONUtil.getText(contentObject, "needquantity");
+        if (productObject != null) {
+            model = JSONUtil.getText(productObject, "cmpCode");
+            brand = JSONUtil.getText(productObject, "brand");
+            spec = JSONUtil.getText(productObject, "spec");
+            material = JSONUtil.getText(productObject, "title");
+            unit = JSONUtil.getText(productObject, "unit");
+        }
+        if (inquiryObject != null) {
+            //附件
+            JSONArray attachsArray = inquiryObject.getJSONArray("attachs");
+
+            inquiryId = JSONUtil.getText(inquiryObject, "code");
+            long endDate = inquiryObject.getLongValue("endDate");
+            if (endDate != 0) {
+                enddate = DateFormatUtil.long2Str(endDate, DateFormatUtil.YMD);
+            }
+
+            JSONObject enterpriseObject = inquiryObject.getJSONObject("enterprise");
+            if (enterpriseObject != null) {
+                inquiryCompany = JSONUtil.getText(enterpriseObject, "enName");
+            }
+
+        }
+
+        mInquiryListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.public_inquiry_id), inquiryId, "", "询价编号", ""));
+        mInquiryListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.public_inquiry_company), inquiryCompany, "", "询价企业", ""));
+        mInquiryListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.public_inquiry_phone), phone, "", "联系电话", ""));
+        mInquiryListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.public_inquiry_contact), contact, "", "联系人", ""));
+        mInquiryListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.public_inquiry_enddate), enddate, "", "报价截止如期", ""));
+        mInquiryListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.public_inquiry_attachs), attachs, "", "附件", ""));
+
+        mInquiryListAdapter.notifyDataSetChanged();
+
+        mMaterialListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.public_inquiry_model), model, "", "原厂型号", ""));
+        mMaterialListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.public_inquiry_brand), brand, "", "品牌", ""));
+        mMaterialListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.public_inquiry_spec), spec, "", "物料规格", ""));
+        mMaterialListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.public_inquiry_material), material, "", "物料名称", ""));
+        mMaterialListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.public_inquiry_unit), unit, "", "单位", ""));
+        mMaterialListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.public_inquiry_amount), amount, "", "数量", ""));
+
+        mMaterialListAdapter.notifyDataSetChanged();
     }
 
     private B2BDetailListBean createB2BDetailListBean(int itemType,
@@ -99,12 +182,39 @@ public class PublicInquiryDetailActivity extends BaseMVPActivity<WorkPlatPresent
 
     @Override
     public void showLoading(String loadStr) {
-
+        progressDialog.show();
     }
 
     @Override
     public void hideLoading() {
+        progressDialog.dismiss();
+    }
 
+    @Override
+    public void onSuccess(int flag, Object o) throws Exception {
+        hideLoading();
+        String result = o.toString();
+        LogUtil.prinlnLongMsg("publicdetailsuccess", result);
+        if (flag == PUBLIC_INQUIRY_DETAIL) {
+            if (JSONUtil.validate(result)) {
+                JSONObject resultObject = JSON.parseObject(result);
+                JSONObject inquiryItem = resultObject.getJSONObject("inquiryItem");
+                if (inquiryItem != null) {
+                    initDetailData(inquiryItem.toString());
+                } else {
+                    initDetailData("");
+                    toast("数据获取为空");
+                }
+            }
+        }
     }
 
+    @Override
+    public void onFail(int flag, String failStr) throws Exception {
+        hideLoading();
+        LogUtil.prinlnLongMsg("publicdetailfail", failStr);
+        if (flag == PUBLIC_INQUIRY_DETAIL) {
+            toast(failStr);
+        }
+    }
 }

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

@@ -34,7 +34,7 @@ public class PublicInquiryListActivity extends BaseMVPActivity<WorkPlatPresenter
     private List<String> mTitleStrings;
     private SearchActionView mSearchActionView;
 
-    private B2BBusinessListFragment mAllFragment, mTodoFragment;
+    private B2BBusinessListFragment mAllFragment, mDoneFragment;
 
     @Override
     protected int getLayout() {
@@ -54,18 +54,19 @@ public class PublicInquiryListActivity extends BaseMVPActivity<WorkPlatPresenter
         mViewPager = (ViewPager) findViewById(R.id.tab_viewpager_vp);
 
         mAllFragment = new B2BBusinessListFragment();
-        mTodoFragment = new B2BBusinessListFragment();
+        mDoneFragment = new B2BBusinessListFragment();
 
         mAllFragment.setListType(B2BBusinessListBean.PUBLIC_INQUIRY_LIST);
-        mTodoFragment.setListType(B2BBusinessListBean.PUBLIC_INQUIRY_LIST);
+        mDoneFragment.setListType(B2BBusinessListBean.PUBLIC_INQUIRY_LIST);
+        mDoneFragment.setListState("done");
 
         mFragments = new ArrayList<>();
         mFragments.add(mAllFragment);
-        mFragments.add(mTodoFragment);
+        mFragments.add(mDoneFragment);
 
         mTitleStrings = new ArrayList<>();
         mTitleStrings.add(getString(R.string.all));
-        mTitleStrings.add(getString(R.string.str_wait_quoted));
+        mTitleStrings.add(getString(R.string.str_quoted_price));
         mTabViewpagerAdapter = new TabViewpagerAdapter(this, mFragments, mTitleStrings, getSupportFragmentManager());
 
         mViewPager.setOffscreenPageLimit(mFragments.size() - 1);
@@ -90,7 +91,7 @@ public class PublicInquiryListActivity extends BaseMVPActivity<WorkPlatPresenter
                 if (CommonUtil.isNetWorkConnected(mContext)) {
                     String text = mSearchActionView.getText();
                     mAllFragment.getListData(1, text);
-                    mTodoFragment.getListData(1, text);
+                    mDoneFragment.getListData(1, text);
                 } else {
                     toast(R.string.networks_out);
                 }
@@ -103,7 +104,7 @@ public class PublicInquiryListActivity extends BaseMVPActivity<WorkPlatPresenter
                 if (CommonUtil.isNetWorkConnected(mContext)) {
                     String text = mSearchActionView.getText();
                     mAllFragment.getListData(1, text);
-                    mTodoFragment.getListData(1, text);
+                    mDoneFragment.getListData(1, text);
                 } else {
                     toast(R.string.networks_out);
                 }

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

@@ -59,6 +59,16 @@ public class B2BQuotePriceAdapter extends RecyclerView.Adapter<B2BQuotePriceAdap
         final B2BQuotePriceBean b2BQuotePriceBean = mB2BQuotePriceBeans.get(position);
         holder.mNumTextView.setText((position + 1) + "");
 
+        if (b2BQuotePriceBean == null) {
+            return;
+        }
+
+        if (mB2BQuotePriceBeans.size() == 1) {
+            holder.mDeleteImageView.setVisibility(View.INVISIBLE);
+        } else {
+            holder.mDeleteImageView.setVisibility(View.VISIBLE);
+        }
+
         if (isEditable) {
             holder.mAmountEditText.setVisibility(View.VISIBLE);
             holder.mPriceEditText.setVisibility(View.VISIBLE);
@@ -71,8 +81,10 @@ public class B2BQuotePriceAdapter extends RecyclerView.Adapter<B2BQuotePriceAdap
                 @Override
                 public void onClick(View view) {
                     holder.mDeleteImageView.setEnabled(false);
-                    mB2BQuotePriceBeans.remove(position);
-                    notifyDataSetChanged();
+                    if (mB2BQuotePriceBeans.size() > 0) {
+                        mB2BQuotePriceBeans.remove(position);
+                        notifyDataSetChanged();
+                    }
                     holder.mDeleteImageView.setEnabled(true);
                 }
             });

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

@@ -52,6 +52,28 @@ 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());
 
+        String billState = b2BBusinessListBean.getBillState();
+        if (billState != null) {
+            switch (billState) {
+                case Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO:
+                    setPublicBtn(holder, true, false);
+                    break;
+                case Constants.FLAG.STATE_PUBLIC_INQUIRY_DONE:
+                    setPublicBtn(holder, false, true);
+                    break;
+                default:
+                    setPublicBtn(holder, false, false);
+                    break;
+            }
+        } else {
+            setPublicBtn(holder, false, false);
+        }
+
+    }
+
+    private void setPublicBtn(BaseViewHolder holder, boolean b1, boolean b2) {
+        holder.setVisible(R.id.list_public_inquiry_offer_quotation_btn, b1);
+        holder.setVisible(R.id.list_public_inquiry_done_btn, b2);
     }
 
     private void bindCustomerInquiry(BaseViewHolder holder, B2BBusinessListBean b2BBusinessListBean) {

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

@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
@@ -48,6 +49,8 @@ import java.util.Map;
 
 public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter> implements HttpCallback {
     private static final int OBTAIN_B2B_LIST = 0x11;
+    private static final int INQUIRY_SALE_QUOTE = 0x12;
+    private static final int REQUEST_PURCHASE_DETAIL = 0x13, REQUEST_CUSTOMER_DETAIL = 0x14, REQUEST_PUBLIC_DETAIL = 0x15;
 
     private RecyclerView mRecyclerView;
     private B2bBusinessListAdapter mB2BBusinessListAdapter;
@@ -56,6 +59,18 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
     private int mListType = B2BBusinessListBean.PURCHASE_ORDER_LIST;
     private int mPageIndex = 1, mPageSize = 20;
     private String mListUrl, mListState = "", mEnuu, mKeyWord = "";
+    private int mSelectPosition = -1;
+
+    @Override
+    protected WorkPlatPresenter initPresenter() {
+        return null;
+    }
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_b2b_list;
+    }
+
 
     public int getListType() {
         return mListType;
@@ -88,16 +103,6 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
         mListState = listState;
     }
 
-    @Override
-    protected WorkPlatPresenter initPresenter() {
-        return null;
-    }
-
-    @Override
-    protected int getLayout() {
-        return R.layout.fragment_b2b_list;
-    }
-
     @Override
     protected void initViews() {
         mEnuu = CommonUtil.getSharedPreferences(mContext, Constants.CACHE.B2B_BUSINESS_ENUU);
@@ -120,34 +125,84 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
     protected void initEvents() {
         mB2BBusinessListAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
-            public void onItemClick(BaseQuickAdapter baseQuickAdapter, View view, int i) {
-                List<B2BBusinessListBean> data = mB2BBusinessListAdapter.getData();
+            public void onItemClick(BaseQuickAdapter baseQuickAdapter, View view, final int position) {
+                mSelectPosition = position;
+                final List<B2BBusinessListBean> data = mB2BBusinessListAdapter.getData();
                 Intent intent = null;
-                switch (data.get(i).getItemType()) {
+                switch (data.get(position).getItemType()) {
                     case B2BBusinessListBean.PURCHASE_ORDER_LIST:
                         intent = new Intent();
                         intent.setClass(mContext, PurchaseDetailsActivity.class);
-                        intent.putExtra(Constants.FLAG.KEY_PURCHASE_ID, mB2BBusinessListBeans.get(i).getId());
-                        intent.putExtra(Constants.FLAG.KEY_PURCHASE_STATUS, mB2BBusinessListBeans.get(i).getBillState());
+                        intent.putExtra(Constants.FLAG.KEY_PURCHASE_ID, mB2BBusinessListBeans.get(position).getId());
+                        intent.putExtra(Constants.FLAG.KEY_PURCHASE_STATUS, mB2BBusinessListBeans.get(position).getBillState());
+                        startActivityForResult(intent, REQUEST_PURCHASE_DETAIL);
                         break;
                     case B2BBusinessListBean.CUSTOMER_INQUIRY_LIST:
                         intent = new Intent();
                         intent.setClass(mContext, CustomerInquiryDetailActivity.class);
-                        intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_ID, mB2BBusinessListBeans.get(i).getId());
-                        intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_STATE, mB2BBusinessListBeans.get(i).getBillState());
-                        intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_JSON, mB2BBusinessListBeans.get(i).getJsonData());
+                        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());
+                        startActivityForResult(intent, REQUEST_CUSTOMER_DETAIL);
                         break;
                     case B2BBusinessListBean.PUBLIC_INQUIRY_LIST:
                         intent = new Intent();
-                        intent.setClass(mContext, PublicInquiryDetailActivity.class);
-                        intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_ID, mB2BBusinessListBeans.get(i).getId());
-                        intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_STATE, mB2BBusinessListBeans.get(i).getBillState());
-                        intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_JSON, mB2BBusinessListBeans.get(i).getJsonData());
+                        String billState = data.get(position).getBillState();
+                        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)) {
+                            showLoading(null);
+
+                            Map<String, Object> params = new HashMap<>();
+                            //        params.put("en_uu", mEnuu);
+                            params.put("en_uu", 10041559);
+                            //        params.put("user_tel", MyApplication.getInstance().mLoginUser.getTelephone());
+                            params.put("user_tel", "15671616315");
+                            params.put("id", data.get(position).getId());
+
+                            HttpRequest.getInstance().sendRequest("http://218.17.158.219:24000/",
+                                    new HttpParams.Builder()
+                                            .url("inquiry/sale/quote")
+                                            .flag(INQUIRY_SALE_QUOTE)
+                                            .method(Method.GET)
+                                            .setHeaders(new HashMap<String, Object>())
+                                            .setParams(params)
+                                            .build(), new HttpCallback() {
+                                        @Override
+                                        public void onSuccess(int flag, Object o) throws Exception {
+                                            Log.d("publicinquiryquote", "success->" + o.toString());
+                                            hideLoading();
+                                            Intent intent = null;
+                                            String result = o.toString();
+                                            if (TextUtils.isEmpty(result)) {
+                                                intent = new Intent();
+                                                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());
+                                                intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_JSON, mB2BBusinessListBeans.get(position).getJsonData());
+                                                startActivityForResult(intent, REQUEST_PUBLIC_DETAIL);
+                                            } else {
+                                                intent = new Intent();
+                                                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);
+                                            }
+                                        }
+
+                                        @Override
+                                        public void onFail(int flag, String failStr) throws Exception {
+                                            hideLoading();
+                                            toast(failStr);
+                                        }
+                                    });
+                        }
                         break;
-
-                }
-                if (intent != null) {
-                    startActivity(intent);
                 }
             }
         });
@@ -156,6 +211,7 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
             @Override
             public void onRefresh(RefreshLayout refreshLayout) {
                 if (CommonUtil.isNetWorkConnected(mContext)) {
+                    mRefreshLayout.resetNoMoreData();
                     mPageIndex = 1;
                     getListData(mPageIndex, mKeyWord);
                 } else {
@@ -208,7 +264,7 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
 
         String host = "http://192.168.253.102:8090/platform-b2b/";
         if (mListType == B2BBusinessListBean.PUBLIC_INQUIRY_LIST) {
-            host = "http://192.168.253.192:8080/";
+            host = "http://218.17.158.219:24000/";
         }
         HttpRequest.getInstance().sendRequest(host,
                 new HttpParams.Builder()
@@ -238,10 +294,44 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
         ((BaseMVPActivity) getActivity()).progressDialog.dismiss();
     }
 
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        B2BBusinessListBean b2BBusinessListBean = mB2BBusinessListBeans.get(mSelectPosition);
+        if (b2BBusinessListBean != null) {
+            if (requestCode == REQUEST_PURCHASE_DETAIL
+                    && resultCode == Constants.FLAG.RESULT_PURCHASE_ORDER && data != null) {
+                String purchaseStatus = data.getStringExtra(Constants.FLAG.KEY_PURCHASE_STATUS);
+                if (!TextUtils.isEmpty(mListState) && Constants.FLAG.STATE_PURCHASE_ORDER_TODO.equals(mListState)) {
+                    if (!Constants.FLAG.STATE_PURCHASE_ORDER_TODO.equals(purchaseStatus)) {
+                        mB2BBusinessListBeans.remove(mSelectPosition);
+                    }
+                } else {
+                    b2BBusinessListBean.setBillState(purchaseStatus);
+                }
+            } else if (requestCode == REQUEST_CUSTOMER_DETAIL
+                    && resultCode == Constants.FLAG.RESULT_CUSTOMER_INQUIRY) {
+                if (!TextUtils.isEmpty(mListState) && Constants.FLAG.STATE_CUSTOMER_INQUIRY_TODO.equals(mListState)) {
+                    mB2BBusinessListBeans.remove(mSelectPosition);
+                } else {
+                    b2BBusinessListBean.setBillState(Constants.FLAG.STATE_CUSTOMER_INQUIRY_DONE);
+                }
+            } else if (requestCode == REQUEST_PUBLIC_DETAIL
+                    && resultCode == Constants.FLAG.RESULT_PUBLIC_INQUIRY) {
+//                if (TextUtils.isEmpty(mListState)) {
+//                    mB2BBusinessListBeans.remove(mSelectPosition);
+//                } else {
+//                    b2BBusinessListBean.setBillState(Constants.FLAG.STATE_PUBLIC_INQUIRY_DONE);
+//                }
+            }
+            mB2BBusinessListAdapter.notifyDataSetChanged();
+        }
+
+    }
+
     @Override
     public void onSuccess(int flag, Object o) {
         try {
-            hideLoading();
             String result = o.toString();
             LogUtil.prinlnLongMsg("b2blistlogsuccess", result);
             switch (flag) {
@@ -250,15 +340,25 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
                     JSONArray contentArray = resultObject.getJSONArray("content");
                     if (contentArray == null || contentArray.size() == 0) {
                         if (mPageIndex == 1) {
+                            hideLoading();
                             mB2BBusinessListBeans.clear();
                             mB2BBusinessListAdapter.notifyDataSetChanged();
                             mB2BBusinessListAdapter.setEmptyView(R.layout.view_empty, (ViewGroup) mRecyclerView.getParent());
+                        } else {
+                            if (mRefreshLayout != null && mRefreshLayout.isLoading()) {
+                                mRefreshLayout.finishLoadmoreWithNoMoreData();
+                            }
+                            ((BaseMVPActivity) getActivity()).progressDialog.dismiss();
                         }
                         return;
                     }
                     if (mPageIndex == 1) {
                         mB2BBusinessListBeans.clear();
                     }
+                    if (contentArray.size() < mPageSize && mPageIndex > 1 && mRefreshLayout != null && mRefreshLayout.isLoading()) {
+                        mRefreshLayout.finishLoadmoreWithNoMoreData();
+                    }
+                    hideLoading();
                     switch (mListType) {
                         case B2BBusinessListBean.PURCHASE_ORDER_LIST:
                             analysisPurchaseOrder(contentArray);
@@ -285,7 +385,7 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
             if (contentObject != null) {
                 B2BBusinessListBean b2BBusinessListBean = new B2BBusinessListBean();
                 b2BBusinessListBean.setJsonData(contentObject.toString());
-                b2BBusinessListBean.setItemType(B2BBusinessListBean.CUSTOMER_INQUIRY_LIST);
+                b2BBusinessListBean.setItemType(B2BBusinessListBean.PUBLIC_INQUIRY_LIST);
                 b2BBusinessListBean.setId(JSONUtil.getText(contentObject, "id"));
 
                 long date = contentObject.getLongValue("date");
@@ -313,21 +413,17 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
                     }
                 }
                 String invalid = JSONUtil.getText(contentObject, "invalid");
-                if ("1".equals(invalid)) {
-                    b2BBusinessListBean.setBillState(Constants.FLAG.STATE_CUSTOMER_INQUIRY_INVALID);
+                String overdue = JSONUtil.getText(contentObject, "overdue");
+                String status = JSONUtil.getText(contentObject, "status");
+                if ("1".equals(invalid) || "1".equals(overdue) || "201".equals(status)) {
+                    b2BBusinessListBean.setBillState(Constants.FLAG.STATE_PUBLIC_INQUIRY_DONE);
                 } else {
-                    String overdue = JSONUtil.getText(contentObject, "overdue");
-                    if ("1".equals(overdue)) {
-                        b2BBusinessListBean.setBillState(Constants.FLAG.STATE_CUSTOMER_INQUIRY_END);
-                    } else {
-                        b2BBusinessListBean.setBillState(Constants.FLAG.STATE_CUSTOMER_INQUIRY_TODO);
-                    }
-
-                    mB2BBusinessListBeans.add(b2BBusinessListBean);
+                    b2BBusinessListBean.setBillState(Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO);
                 }
+                mB2BBusinessListBeans.add(b2BBusinessListBean);
             }
-            mB2BBusinessListAdapter.notifyDataSetChanged();
         }
+        mB2BBusinessListAdapter.notifyDataSetChanged();
     }
 
     private void analysisCustomerInquiry(JSONArray contentArray) {
@@ -340,19 +436,22 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
                 b2BBusinessListBean.setId(JSONUtil.getText(contentObject, "id"));
 
                 JSONObject inquiryObject = contentObject.getJSONObject("inquiry");
+                JSONObject productObject = contentObject.getJSONObject("product");
                 if (inquiryObject != null) {
                     JSONObject enterpriseObject = inquiryObject.getJSONObject("enterprise");
                     if (enterpriseObject != null) {
                         b2BBusinessListBean.setCompanyName(JSONUtil.getText(enterpriseObject, "enName"));
                     }
-                    b2BBusinessListBean.setMaterialNum(JSONUtil.getText(inquiryObject, "code"));
-                    b2BBusinessListBean.setBillNum(JSONUtil.getText(inquiryObject, "id"));
+                    b2BBusinessListBean.setBillNum(JSONUtil.getText(inquiryObject, "code"));
 
                     long endDate = inquiryObject.getLongValue("endDate");
                     if (endDate != 0) {
                         b2BBusinessListBean.setExpiryDate(DateFormatUtil.long2Str(endDate, DateFormatUtil.YMD));
                     }
                 }
+                if (productObject != null) {
+                    b2BBusinessListBean.setMaterialNum(JSONUtil.getText(productObject, "code"));
+                }
                 long date = contentObject.getLongValue("date");
                 if (date != 0) {
                     b2BBusinessListBean.setBillDate(DateFormatUtil.long2Str(date, DateFormatUtil.YMD));
@@ -395,7 +494,11 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
                 b2BBusinessListBean.setJsonData(contentObject.toString());
                 b2BBusinessListBean.setItemType(B2BBusinessListBean.PURCHASE_ORDER_LIST);
                 b2BBusinessListBean.setId(JSONUtil.getText(contentObject, "id"));
-                b2BBusinessListBean.setCompanyName(JSONUtil.getText(contentObject, "receiveName"));
+
+                JSONObject enterprise = contentObject.getJSONObject("enterprise");
+                if (enterprise != null) {
+                    b2BBusinessListBean.setCompanyName(JSONUtil.getText(enterprise, "enName"));
+                }
 
                 long date = contentObject.getLongValue("date");
                 if (date != 0) {
@@ -438,10 +541,12 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
     public void onFail(int flag, String failStr) {
         try {
             hideLoading();
-            if (mPageIndex > 1) {
+            if (flag == OBTAIN_B2B_LIST && mPageIndex > 1) {
                 mPageIndex--;
             }
-            toast(failStr);
+            if (!CommonUtil.isRepeatClick(2000)) {
+                toast(failStr);
+            }
         } catch (Exception e) {
 
         }

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

@@ -23,8 +23,10 @@
         android:layout_marginRight="40dp"
         android:drawableLeft="@drawable/ic_b2b_current_company"
         android:drawablePadding="6dp"
+        android:ellipsize="end"
         android:gravity="center_vertical"
         android:padding="6dp"
+        android:singleLine="true"
         android:textColor="@color/white"
         android:textSize="16sp"
         tools:text="深圳市优软科技有限公司" />

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

@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:text="客户:"
         android:textColor="@color/hintColor"
-        android:textSize="@dimen/text_main" />
+        android:textSize="@dimen/text_hine" />
 
     <android.support.v7.widget.AppCompatTextView
         android:id="@+id/customerTv"
@@ -21,7 +21,7 @@
         android:layout_toRightOf="@id/customerTag"
         android:text="客户:"
         android:textColor="@color/text_main"
-        android:textSize="@dimen/text_main" />
+        android:textSize="@dimen/text_hine" />
 
     <android.support.v7.widget.AppCompatTextView
         android:id="@+id/addressTag"
@@ -31,7 +31,7 @@
         android:layout_below="@id/customerTag"
         android:text="收货地址:"
         android:textColor="@color/hintColor"
-        android:textSize="@dimen/text_main" />
+        android:textSize="@dimen/text_hine" />
 
     <android.support.v7.widget.AppCompatTextView
         android:id="@+id/addressTv"
@@ -43,7 +43,7 @@
         android:layout_toRightOf="@id/customerTag"
         android:text="客户:"
         android:textColor="@color/text_main"
-        android:textSize="@dimen/text_main" />
+        android:textSize="@dimen/text_hine" />
 
     <android.support.v7.widget.AppCompatTextView
         android:id="@+id/codeTag"
@@ -53,7 +53,7 @@
         android:layout_below="@id/addressTag"
         android:text="订单号:"
         android:textColor="@color/hintColor"
-        android:textSize="@dimen/text_main" />
+        android:textSize="@dimen/text_hine" />
 
     <android.support.v7.widget.AppCompatTextView
         android:id="@+id/codeTv"
@@ -63,7 +63,7 @@
         android:layout_toRightOf="@id/customerTag"
         android:text="客户:"
         android:textColor="@color/text_main"
-        android:textSize="@dimen/text_main" />
+        android:textSize="@dimen/text_hine" />
 
     <android.support.v7.widget.AppCompatTextView
         android:id="@+id/timeTag"
@@ -73,7 +73,7 @@
         android:layout_below="@id/codeTag"
         android:text="单据时间:"
         android:textColor="@color/hintColor"
-        android:textSize="@dimen/text_main" />
+        android:textSize="@dimen/text_hine" />
 
     <android.support.v7.widget.AppCompatTextView
         android:id="@+id/timeTv"
@@ -83,7 +83,7 @@
         android:layout_toRightOf="@id/customerTag"
         android:text="客户:"
         android:textColor="@color/text_main"
-        android:textSize="@dimen/text_main" />
+        android:textSize="@dimen/text_hine" />
 
     <android.support.v7.widget.AppCompatTextView
         android:id="@+id/remarksTag"
@@ -93,7 +93,7 @@
         android:layout_below="@id/timeTag"
         android:text="备注:"
         android:textColor="@color/hintColor"
-        android:textSize="@dimen/text_main" />
+        android:textSize="@dimen/text_hine" />
 
     <android.support.v7.widget.AppCompatTextView
         android:id="@+id/remarksTv"
@@ -103,7 +103,7 @@
         android:layout_toRightOf="@id/customerTag"
         android:text="客户:"
         android:textColor="@color/text_main"
-        android:textSize="@dimen/text_main" />
+        android:textSize="@dimen/text_hine" />
 
     <android.support.v7.widget.AppCompatTextView
         android:id="@+id/totalTag"
@@ -113,7 +113,7 @@
         android:layout_below="@id/remarksTag"
         android:text="总额:"
         android:textColor="@color/hintColor"
-        android:textSize="@dimen/text_main" />
+        android:textSize="@dimen/text_hine" />
 
     <android.support.v7.widget.AppCompatTextView
         android:id="@+id/totalTv"
@@ -123,5 +123,5 @@
         android:layout_toRightOf="@id/customerTag"
         android:text="客户:"
         android:textColor="@color/text_main"
-        android:textSize="@dimen/text_main" />
+        android:textSize="@dimen/text_hine" />
 </RelativeLayout>

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

@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:text="编号:"
         android:textColor="@color/hintColor"
-        android:textSize="@dimen/text_main" />
+        android:textSize="@dimen/text_hine" />
 
     <android.support.v7.widget.AppCompatTextView
         android:id="@+id/timeTv"
@@ -20,7 +20,7 @@
         android:layout_alignTop="@id/timeTag"
         android:layout_toRightOf="@id/timeTag"
         android:textColor="@color/text_main"
-        android:textSize="@dimen/text_main" />
+        android:textSize="@dimen/text_hine" />
 
 
     <android.support.v7.widget.AppCompatTextView
@@ -31,7 +31,7 @@
         android:layout_marginTop="@dimen/padding"
         android:text="产品:"
         android:textColor="@color/hintColor"
-        android:textSize="@dimen/text_main" />
+        android:textSize="@dimen/text_hine" />
 
     <android.support.v7.widget.AppCompatTextView
         android:id="@+id/remarksTv"
@@ -41,7 +41,7 @@
         android:layout_toRightOf="@id/timeTag"
         android:text="客户:"
         android:textColor="@color/text_main"
-        android:textSize="@dimen/text_main" />
+        android:textSize="@dimen/text_hine" />
 
     <android.support.v7.widget.AppCompatTextView
         android:id="@+id/totalTag"
@@ -51,7 +51,7 @@
         android:layout_marginTop="@dimen/padding"
         android:text="规格型号:"
         android:textColor="@color/hintColor"
-        android:textSize="@dimen/text_main" />
+        android:textSize="@dimen/text_hine" />
 
     <android.support.v7.widget.AppCompatTextView
         android:id="@+id/totalTv"
@@ -61,7 +61,7 @@
         android:layout_toRightOf="@id/timeTag"
         android:text="客户:"
         android:textColor="@color/text_main"
-        android:textSize="@dimen/text_main" />
+        android:textSize="@dimen/text_hine" />
 
     <android.support.v7.widget.AppCompatTextView
         android:id="@+id/dateTag"
@@ -71,11 +71,11 @@
         android:layout_marginTop="@dimen/padding"
         android:text="交货日期:"
         android:textColor="@color/hintColor"
-        android:textSize="@dimen/text_main" />
+        android:textSize="@dimen/text_hine" />
 
     <android.support.v7.widget.AppCompatTextView
         android:id="@+id/dateEd"
-        android:layout_width="100dp"
+        android:layout_width="140dp"
         android:layout_height="25dp"
         android:layout_alignTop="@id/dateTag"
         android:layout_toRightOf="@id/timeTag"
@@ -83,7 +83,7 @@
         android:gravity="center_vertical"
         android:text="客户:"
         android:textColor="@color/text_main"
-        android:textSize="@dimen/text_main" />
+        android:textSize="@dimen/text_hine" />
 
     <android.support.v7.widget.AppCompatTextView
         android:id="@+id/numberTag"
@@ -93,11 +93,11 @@
         android:layout_marginTop="@dimen/padding"
         android:text="数量:"
         android:textColor="@color/hintColor"
-        android:textSize="@dimen/text_main" />
+        android:textSize="@dimen/text_hine" />
 
     <android.support.v7.widget.AppCompatEditText
         android:id="@+id/numberEd"
-        android:layout_width="100dp"
+        android:layout_width="140dp"
         android:layout_height="25dp"
         android:layout_alignTop="@id/numberTag"
         android:layout_toRightOf="@id/timeTag"
@@ -120,7 +120,7 @@
         android:inputType="number"
         android:text="PCS"
         android:textColor="@color/text_main"
-        android:textSize="@dimen/text_main" />
+        android:textSize="@dimen/text_hine" />
 
     <android.support.v7.widget.AppCompatTextView
         android:id="@+id/remarksInputTag"
@@ -130,11 +130,11 @@
         android:layout_marginTop="@dimen/padding"
         android:text="备注:"
         android:textColor="@color/hintColor"
-        android:textSize="@dimen/text_main" />
+        android:textSize="@dimen/text_hine" />
 
     <android.support.v7.widget.AppCompatEditText
         android:id="@+id/remarksInputEd"
-        android:layout_width="100dp"
+        android:layout_width="140dp"
         android:layout_height="wrap_content"
         android:minHeight="25dp"
         android:layout_alignTop="@id/remarksInputTag"
@@ -143,7 +143,6 @@
         android:gravity="center_vertical"
         android:text="客户:"
         android:textColor="@color/text_main"
-        android:textSize="@dimen/text_main" />
-
+        android:textSize="@dimen/text_hine" />
 
 </RelativeLayout>

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

@@ -15,8 +15,8 @@
         android:layout_height="match_parent"
         android:layout_marginLeft="8dp"
         android:layout_weight="1"
-        android:text="@string/str_product_name"
-        android:textSize="14sp" />
+        android:textSize="14sp"
+        android:text="@string/str_product_name"/>
 
     <TextView
         android:id="@+id/list_b2b_detail_text_value_tv"

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

@@ -204,20 +204,22 @@
         android:paddingRight="8dp"
         android:paddingTop="4dp"
         android:text="@string/str_offer_quotation"
-        android:textColor="@color/white" />
+        android:textColor="@color/white"
+        android:visibility="gone" />
 
     <TextView
-        android:id="@+id/list_public_inquiry_expired_btn"
+        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_end_bg"
+        android:background="@drawable/shape_b2b_todo_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:text="@string/str_quoted_price"
+        android:textColor="@color/b2b_btn_todo"
+        android:visibility="gone" />
 
 </RelativeLayout>

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

@@ -93,4 +93,29 @@
     <string name="str_unexpired">未过期</string>
     <string name="delivery_period_can_not_be_empty">交货周期不能为空</string>
     <string name="unfilled_items_in_subsection_quotation">分段报价存在未填项</string>
+    <string name="quote_success">报价成功</string>
+    <string name="public_inquiry_id">询价编号</string>
+    <string name="public_inquiry_company">询价企业</string>
+    <string name="public_inquiry_phone">联系电话</string>
+    <string name="public_inquiry_contact">联系人</string>
+    <string name="public_inquiry_enddate">报价截止日期</string>
+    <string name="public_inquiry_attachs">附件</string>
+    <string name="public_inquiry_model">原厂型号</string>
+    <string name="public_inquiry_brand">品牌</string>
+    <string name="public_inquiry_spec">物料规格</string>
+    <string name="public_inquiry_material">物料名称</string>
+    <string name="public_inquiry_unit">单位</string>
+    <string name="public_inquiry_amount">数量</string>
+    <string name="customer_inquiry_customer">客户</string>
+    <string name="customer_inquiry_customer_address">客户地址</string>
+    <string name="customer_inquiry_customer_phone">联系电话</string>
+    <string name="customer_inquiry_bill_num">单据</string>
+    <string name="customer_inquiry_material">物料</string>
+    <string name="customer_inquiry_currency">币别</string>
+    <string name="customer_inquiry_taxrate">税率</string>
+    <string name="customer_inquiry_environment">环保要求</string>
+    <string name="customer_inquiry_price_type">价格类型</string>
+    <string name="customer_inquiry_leadtime">交货周期</string>
+    <string name="customer_inquiry_min_order">最小起订</string>
+    <string name="customer_inquiry_min_pack">最小包装</string>
 </resources>

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

@@ -92,4 +92,29 @@
     <string name="str_unexpired">未过期</string>
     <string name="delivery_period_can_not_be_empty">交货周期不能为空</string>
     <string name="unfilled_items_in_subsection_quotation">分段报价存在未填项</string>
+    <string name="quote_success">报价成功</string>
+    <string name="public_inquiry_id">询价编号</string>
+    <string name="public_inquiry_company">询价企业</string>
+    <string name="public_inquiry_phone">联系电话</string>
+    <string name="public_inquiry_contact">联系人</string>
+    <string name="public_inquiry_enddate">报价截止日期</string>
+    <string name="public_inquiry_attachs">附件</string>
+    <string name="public_inquiry_model">原厂型号</string>
+    <string name="public_inquiry_brand">品牌</string>
+    <string name="public_inquiry_spec">物料规格</string>
+    <string name="public_inquiry_material">物料名称</string>
+    <string name="public_inquiry_unit">单位</string>
+    <string name="public_inquiry_amount">数量</string>
+    <string name="customer_inquiry_customer">客户</string>
+    <string name="customer_inquiry_customer_address">客户地址</string>
+    <string name="customer_inquiry_customer_phone">联系电话</string>
+    <string name="customer_inquiry_bill_num">单据</string>
+    <string name="customer_inquiry_material">物料</string>
+    <string name="customer_inquiry_currency">币别</string>
+    <string name="customer_inquiry_taxrate">税率</string>
+    <string name="customer_inquiry_environment">环保要求</string>
+    <string name="customer_inquiry_price_type">价格类型</string>
+    <string name="customer_inquiry_leadtime">交货周期</string>
+    <string name="customer_inquiry_min_order">最小起订</string>
+    <string name="customer_inquiry_min_pack">最小包装</string>
 </resources>

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

@@ -92,4 +92,29 @@
     <string name="str_unexpired">未过期</string>
     <string name="delivery_period_can_not_be_empty">交货周期不能为空</string>
     <string name="unfilled_items_in_subsection_quotation">分段报价存在未填项</string>
+    <string name="quote_success">报价成功</string>
+    <string name="public_inquiry_id">询价编号</string>
+    <string name="public_inquiry_company">询价企业</string>
+    <string name="public_inquiry_phone">联系电话</string>
+    <string name="public_inquiry_contact">联系人</string>
+    <string name="public_inquiry_enddate">报价截止日期</string>
+    <string name="public_inquiry_attachs">附件</string>
+    <string name="public_inquiry_model">原厂型号</string>
+    <string name="public_inquiry_brand">品牌</string>
+    <string name="public_inquiry_spec">物料规格</string>
+    <string name="public_inquiry_material">物料名称</string>
+    <string name="public_inquiry_unit">单位</string>
+    <string name="public_inquiry_amount">数量</string>
+    <string name="customer_inquiry_customer">客户</string>
+    <string name="customer_inquiry_customer_address">客户地址</string>
+    <string name="customer_inquiry_customer_phone">联系电话</string>
+    <string name="customer_inquiry_bill_num">单据</string>
+    <string name="customer_inquiry_material">物料</string>
+    <string name="customer_inquiry_currency">币别</string>
+    <string name="customer_inquiry_taxrate">税率</string>
+    <string name="customer_inquiry_environment">环保要求</string>
+    <string name="customer_inquiry_price_type">价格类型</string>
+    <string name="customer_inquiry_leadtime">交货周期</string>
+    <string name="customer_inquiry_min_order">最小起订</string>
+    <string name="customer_inquiry_min_pack">最小包装</string>
 </resources>

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

@@ -124,6 +124,31 @@
     <string name="str_unexpired">未过期</string>
     <string name="delivery_period_can_not_be_empty">交货周期不能为空</string>
     <string name="unfilled_items_in_subsection_quotation">分段报价存在未填项</string>
+    <string name="quote_success">报价成功</string>
+    <string name="public_inquiry_id">询价编号</string>
+    <string name="public_inquiry_company">询价企业</string>
+    <string name="public_inquiry_phone">联系电话</string>
+    <string name="public_inquiry_contact">联系人</string>
+    <string name="public_inquiry_enddate">报价截止日期</string>
+    <string name="public_inquiry_attachs">附件</string>
+    <string name="public_inquiry_model">原厂型号</string>
+    <string name="public_inquiry_brand">品牌</string>
+    <string name="public_inquiry_spec">物料规格</string>
+    <string name="public_inquiry_material">物料名称</string>
+    <string name="public_inquiry_unit">单位</string>
+    <string name="public_inquiry_amount">数量</string>
+    <string name="customer_inquiry_customer">客户</string>
+    <string name="customer_inquiry_customer_address">客户地址</string>
+    <string name="customer_inquiry_customer_phone">联系电话</string>
+    <string name="customer_inquiry_bill_num">单据</string>
+    <string name="customer_inquiry_material">物料</string>
+    <string name="customer_inquiry_currency">币别</string>
+    <string name="customer_inquiry_taxrate">税率</string>
+    <string name="customer_inquiry_environment">环保要求</string>
+    <string name="customer_inquiry_price_type">价格类型</string>
+    <string name="customer_inquiry_leadtime">交货周期</string>
+    <string name="customer_inquiry_min_order">最小起订</string>
+    <string name="customer_inquiry_min_pack">最小包装</string>
 
 
 </resources>

version.gradle

@@ -47,7 +47,7 @@ ext {
             BaseRecyclerViewAdapterHelperVersion: '2.9.30',
             addSubUtilsVersion                  : '1.5.0',
             bannerVersion                       : '1.4.10',
-            smartRefreshLayoutVersion           : '1.0.3',
+            smartRefreshLayoutVersion           : '1.0.4',
             rxJava2Version                      : '2.0.7',
             rxAndroid2Version                   : '2.0.1'
     ]