提交分类： 修复bug；

提交内容：  B2B商务bug修复
当前版本：  测试版本6.3.1
是否冲突：  否

app_core/common/src/main/java/com/core/api/wxapi/ApiPlatform.java

@@ -20,9 +20,11 @@ public class ApiPlatform extends ApiBase implements ApiModel {
     public ApiPlatform() {
         if (BaseConfig.isDebug()) {
             mBaseUrl = "http://uas.ubtob.com/";
+//            mBaseUrl = "http://218.17.158.219:9000/b2b-test/";
             super.login = Constants.ACCOUNT_CENTER_HOST + "sso/login";
         } else {
             mBaseUrl = "http://uas.ubtob.com/";
+//            mBaseUrl = "http://218.17.158.219:9000/b2b-test/";
             super.login = Constants.ACCOUNT_CENTER_HOST + "sso/login";
         }
         //审批流

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

@@ -12,7 +12,7 @@ public class Constants {
     public static final String BASE_URL_LOGIN = "http://manage.ubtob.com/public/account";
     //账户中心地址
     public static final String ACCOUNT_CENTER_HOST = "https://sso.ubtob.com/";
-    //    public static final String ACCOUNT_CENTER_HOST = "http://10.1.51.50:3001/";
+    //            public static final String ACCOUNT_CENTER_HOST = "http://218.17.158.219:32323/";
     //    public static final String ACCOUNT_CENTER_HOST = "https://account.ubtob.com/";
     //IM正式地址
     public static final String IM_BASE_URL = "http://113.105.74.140:8092/";

app_modular/applogin/src/main/java/com/modular/login/activity/LoginActivity.java

@@ -149,6 +149,10 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
     @Override
     public void onClick(View v) {
         if (v.getId() == R.id.login_btn) {
+//            final String phoneNumber = mPhoneNumberEdit.getText().toString().trim();
+//            final String password = mPasswordEdit.getText().toString();
+//            ViewUtil.LoginTask(phoneNumber, password, mContext);
+
             login();
         } else if (v.getId() == R.id.tv_register) {
             startActivity(new Intent(mContext, RegisterSelectActivity.class));

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/BusinessDetailInfoActivity.java

@@ -24,8 +24,6 @@ import android.widget.PopupWindow;
 import android.widget.SimpleAdapter;
 import android.widget.TextView;
 
-import com.afollestad.materialdialogs.GravityEnum;
-import com.afollestad.materialdialogs.MaterialDialog;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;

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

@@ -23,7 +23,6 @@ import com.common.thread.ThreadPool;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.core.base.view.AndroidBug5497Workaround;
 import com.core.net.http.http.OAHttpHelper;
 import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
@@ -82,7 +81,6 @@ public class PurchaseDetailsActivity extends BaseNetActivity implements OnSmartH
 
     @Override
     protected void init() throws Exception {
-        AndroidBug5497Workaround.assistActivity(this);
         Intent intent = getIntent();
         initIntent(intent);
         initView();
@@ -197,6 +195,7 @@ public class PurchaseDetailsActivity extends BaseNetActivity implements OnSmartH
         }
         if (!ListUtils.isEmpty(mapList)) {
             String json = JSONUtil.map2JSON(mapList);
+            LogUtil.d("purchasejson", json);
             reply(json);
         } else {
             ToastUtil.showToast(ct, "没有可以提交的明细表单");
@@ -350,7 +349,14 @@ public class PurchaseDetailsActivity extends BaseNetActivity implements OnSmartH
             String unit = JSONUtil.getText(product, "unit");
             String amount = JSONUtil.getText(object, "amount");
             String price = JSONUtil.getText(object, "price");
-            String number = JSONUtil.getText(object, "qty");//数量
+            String latestReplyQty = JSONUtil.getText(object, "latestReplyQty");
+            String number = "";
+            if (TextUtils.isEmpty(latestReplyQty) || "0".equals(latestReplyQty)) {
+                number = JSONUtil.getText(object, "qty");//数量
+            } else {
+                number = latestReplyQty;
+            }
+
             purchase.setNumber(number);
             purchase.setAmount(amount);
             purchase.setPrice(price);

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

@@ -215,7 +215,8 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
             String host = new ApiPlatform().getBaseUrl();
             String url = "mobile/sale/inquiry/" + mId + "/info";
             int flag = CUSTOMER_INQUIRY_DETAIL;
-            if (Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO.equals(mState)) {
+            if (Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO.equals(mState)
+                    || Constants.FLAG.STATE_PUBLIC_INQUIRY_INVALID.equals(mState)) {
                 host = Constants.API_INQUIRY;
                 url = "inquiry/sale/publicInquiry/detail";
                 flag = PUBLIC_INQUIRY_DETAIL;
@@ -250,7 +251,8 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
 
             String userTel = "", userName = "", material = "", productCode = "", productName = "", productCmpcode = "", productBrand = "", productSpec = "";
             if (Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO.equals(mState)
-                    || Constants.FLAG.STATE_PUBLIC_INQUIRY_DONE.equals(mState)) {
+                    || Constants.FLAG.STATE_PUBLIC_INQUIRY_DONE.equals(mState)
+                    || Constants.FLAG.STATE_PUBLIC_INQUIRY_INVALID.equals(mState)) {
                 userTel = JSONUtil.getText(detailObject, "userTel");
                 userName = JSONUtil.getText(detailObject, "userName");
             } else if (recorderUser != null) {
@@ -337,7 +339,7 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
             }
 
             if (Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO.equals(mState)
-                    || Constants.FLAG.STATE_PUBLIC_INQUIRY_DONE.equals(mState)) {
+                    || Constants.FLAG.STATE_PUBLIC_INQUIRY_INVALID.equals(mState)) {
                 List<String> options = new ArrayList<>();
                 options.add("RMB");
                 options.add("USD");
@@ -513,7 +515,8 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
             showLoading(null);
             String url = "mobile/sale/inquiry/items/" + mId + "/reply";
             String host = new ApiPlatform().getBaseUrl();
-            if (Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO.equals(mState)) {
+            if (Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO.equals(mState)
+                    || Constants.FLAG.STATE_PUBLIC_INQUIRY_INVALID.equals(mState)) {
                 url = "inquiry/sale/mobile/quote";
                 host = Constants.API_INQUIRY;
             }

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

@@ -1,6 +1,5 @@
 package com.uas.appworks.activity;
 
-import android.Manifest;
 import android.content.Intent;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -13,14 +12,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
-import com.common.data.StringUtil;
-import com.core.app.AppConstant;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.activity.BaseMVPActivity;
 import com.core.utils.CommonUtil;
-import com.core.utils.ToastUtil;
-import com.core.widget.CustomProgressDialog;
 import com.me.network.app.base.HttpCallback;
 import com.me.network.app.base.HttpParams;
 import com.me.network.app.http.HttpRequest;
@@ -28,12 +23,10 @@ import com.me.network.app.http.Method;
 import com.uas.appworks.R;
 import com.uas.appworks.adapter.B2BDetailListAdapter;
 import com.uas.appworks.adapter.B2BQuotePriceAdapter;
-import com.uas.appworks.model.bean.B2BAttachBean;
 import com.uas.appworks.model.bean.B2BDetailListBean;
 import com.uas.appworks.model.bean.B2BQuotePriceBean;
 import com.uas.appworks.presenter.WorkPlatPresenter;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -205,7 +198,7 @@ public class PublicInquiryDetailActivity extends BaseMVPActivity<WorkPlatPresent
         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_contact), contact, "", "联系人", ""));
         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_enddate), enddate, "", "报价截止如期", ""));
+        mInquiryListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.public_inquiry_enddate), enddate, "", "报价截止日期", ""));
         if (!TextUtils.isEmpty(attachs)) {
             mInquiryListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.public_inquiry_attachs), attachs, "", "附件", ""));
         }

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

@@ -146,34 +146,44 @@ public class B2BDetailListAdapter extends RecyclerView.Adapter<RecyclerView.View
         holder.captionTextView.setText(b2BDetailListBean.getCaption() + ":");
         holder.valueTextView.setText(b2BDetailListBean.getValue());
 
-        final List<String> options = b2BDetailListBean.getOptions();
-        holder.valueTextView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                String value = b2BDetailListBean.getValue();
-                int selectIndex = 0;
-                for (int i = 0; i < options.size(); i++) {
-                    if (value != null && value.equals(options.get(i))) {
-                        selectIndex = i;
-                        break;
+        if (isEditable) {
+            final List<String> options = b2BDetailListBean.getOptions();
+            holder.valueTextView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    String value = b2BDetailListBean.getValue();
+                    int selectIndex = 0;
+                    for (int i = 0; i < options.size(); i++) {
+                        if (value != null && value.equals(options.get(i))) {
+                            selectIndex = i;
+                            break;
+                        }
                     }
-                }
 
-                new MaterialDialog.Builder(mContext)
-                        .title(R.string.please_select_currency)
-                        .items(options)
-                        .itemsCallbackSingleChoice(selectIndex, new MaterialDialog.ListCallbackSingleChoice() {
-                            @Override
-                            public boolean onSelection(MaterialDialog materialDialog, View view, int which, CharSequence charSequence) {
-                                String option = options.get(which);
+                    new MaterialDialog.Builder(mContext)
+                            .title(R.string.please_select_currency)
+                            .items(options)
+                            .itemsCallbackSingleChoice(selectIndex, new MaterialDialog.ListCallbackSingleChoice() {
+                                @Override
+                                public boolean onSelection(MaterialDialog materialDialog, View view, int which, CharSequence charSequence) {
+                                    String option = options.get(which);
 //                                holder.valueTextView.setText(option);
-                                b2BDetailListBean.setValue(option);
-                                notifyDataSetChanged();
-                                return true;
-                            }
-                        }).positiveText(mContext.getString(com.core.app.R.string.common_sure)).build().show();
-            }
-        });
+                                    b2BDetailListBean.setValue(option);
+                                    notifyDataSetChanged();
+                                    return true;
+                                }
+                            }).positiveText(mContext.getString(com.core.app.R.string.common_sure)).build().show();
+                }
+            });
+        } else {
+            holder.valueTextView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+
+                }
+            });
+        }
+
     }
 
     @Override