提交分类： 打包版本；

提交内容：  打包发布
当前版本：  正式版本6.1.6
是否冲突：  否

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Jan 25 09:56:32 CST 2018
-debugName=159
+#Thu Jan 25 17:30:57 CST 2018
+debugName=162
 versionName=617
-debugCode=159
+debugCode=162
 versionCode=156

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

@@ -124,7 +124,8 @@ public class PurchaseDetailsActivity extends BaseNetActivity implements OnSmartH
                 .showLog(true)
                 .autoProgress(true)
                 .addParams("en_uu", enUU)
-                .addParams("user_tel", phone);
+                .addParams("user_tel", phone)
+                .addParams("id", varId);
         requestHttp(builder, this);
     }
 

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

@@ -226,8 +226,8 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
                                 public void onSuccess(int flag, Object o) throws Exception {
                                     hideLoading();
                                     Intent intent = null;
-                                    String result = o.toString();
-                                    if (TextUtils.isEmpty(result)) {
+                                    String inquiryJson = o.toString();
+                                    if (TextUtils.isEmpty(inquiryJson)) {
 //                                        mSelectPosition = position;
                                         intent = new Intent();
                                         intent.setClass(mContext, CustomerInquiryDetailActivity.class);
@@ -240,7 +240,7 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
                                         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());
+                                        intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_JSON, inquiryJson);
                                         startActivity(intent);
                                     }
                                 }
@@ -490,26 +490,29 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
                 }
 
                 String invalid = JSONUtil.getText(contentObject, "invalid");
-                if ("1".equals(invalid)) {
-                    b2BBusinessListBean.setBillState(Constants.FLAG.STATE_CUSTOMER_INQUIRY_INVALID);
-                } else {
-                    String overdue = JSONUtil.getText(contentObject, "overdue");
+                String status = JSONUtil.getText(contentObject, "status");
+                String overdue = JSONUtil.getText(contentObject, "overdue");
+                String agreed = JSONUtil.getText(contentObject, "agreed");
+
+                if ("314".equals(status)) {
+                    b2BBusinessListBean.setBillState(Constants.FLAG.STATE_CUSTOMER_INQUIRY_ABANDONED);
+                } else if ("200".equals(status)) {
                     if ("1".equals(overdue)) {
                         b2BBusinessListBean.setBillState(Constants.FLAG.STATE_CUSTOMER_INQUIRY_END);
                     } else {
-                        String agreed = JSONUtil.getText(contentObject, "agreed");
-                        if ("1".equals(agreed)) {
-                            b2BBusinessListBean.setBillState(Constants.FLAG.STATE_CUSTOMER_INQUIRY_AGREED);
-                        } else if ("0".equals(agreed)) {
-                            b2BBusinessListBean.setBillState(Constants.FLAG.STATE_CUSTOMER_INQUIRY_REFUSED);
+                        b2BBusinessListBean.setBillState(Constants.FLAG.STATE_CUSTOMER_INQUIRY_TODO);
+                    }
+                } else if ("201".equals(status)) {
+                    if ("1".equals(agreed)) {
+                        if ("1".equals(invalid)) {
+                            b2BBusinessListBean.setBillState(Constants.FLAG.STATE_CUSTOMER_INQUIRY_INVALID);
                         } else {
-                            String status = JSONUtil.getText(contentObject, "status");
-                            if ("200".equals(status)) {
-                                b2BBusinessListBean.setBillState(Constants.FLAG.STATE_CUSTOMER_INQUIRY_TODO);
-                            } else if ("201".equals(status)) {
-                                b2BBusinessListBean.setBillState(Constants.FLAG.STATE_CUSTOMER_INQUIRY_DONE);
-                            }
+                            b2BBusinessListBean.setBillState(Constants.FLAG.STATE_CUSTOMER_INQUIRY_AGREED);
                         }
+                    } else if ("0".equals(agreed)) {
+                        b2BBusinessListBean.setBillState(Constants.FLAG.STATE_CUSTOMER_INQUIRY_REFUSED);
+                    } else {
+                        b2BBusinessListBean.setBillState(Constants.FLAG.STATE_CUSTOMER_INQUIRY_DONE);
                     }
                 }
 

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

@@ -63,21 +63,20 @@ public class B2BQuotePriceAdapter extends RecyclerView.Adapter<B2BQuotePriceAdap
             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);
             holder.mAmountTextView.setVisibility(View.GONE);
             holder.mPriceTextView.setVisibility(View.GONE);
 
-            holder.mDeleteImageView.setVisibility(View.VISIBLE);
             holder.mDeleteLine.setVisibility(View.VISIBLE);
 
+            if (mB2BQuotePriceBeans.size() == 1) {
+                holder.mDeleteImageView.setVisibility(View.INVISIBLE);
+            } else {
+                holder.mDeleteImageView.setVisibility(View.VISIBLE);
+            }
+
             if (holder.mAmountEditText.getTag() instanceof TextWatcher) {
                 holder.mAmountEditText.removeTextChangedListener((TextWatcher) holder.mAmountEditText.getTag());
             }

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

@@ -178,8 +178,8 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
                                             Log.d("publicinquiryquote", "success->" + o.toString());
                                             hideLoading();
                                             Intent intent = null;
-                                            String result = o.toString();
-                                            if (TextUtils.isEmpty(result)) {
+                                            String inquiryJson = o.toString();
+                                            if (TextUtils.isEmpty(inquiryJson)) {
                                                 intent = new Intent();
                                                 intent.setClass(mContext, CustomerInquiryDetailActivity.class);
                                                 intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_ID, mB2BBusinessListBeans.get(position).getId());
@@ -191,7 +191,7 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
                                                 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());
+                                                intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_JSON, inquiryJson);
                                                 startActivity(intent);
                                             }
                                         }