提交分类： bug修复；

提交内容：  1、根据需求调整，将公共询价单的价格类型字段去掉，并根据接口返回的结果控制环保要求字段的显示与否
       2、解决公共询价单在详情页报价成功后退出页面时闪退的bug
       3、解决公共询价单在报价成功返回列表页面后，再次点击该条目进入详情页时，数据显示错误的bug
当前版本：  正式版本6.1.7
是否冲突：  否

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Feb 09 11:40:58 CST 2018
-debugName=247
+#Fri Feb 09 17:39:30 CST 2018
+debugName=259
 versionName=620
-debugCode=247
+debugCode=259
 versionCode=159

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

@@ -14,7 +14,7 @@ public class Constants {
     public static final String IM_BASE_URL_TEST = "http://113.105.74.135:8092/";
     //询价服务正式地址
     public static final String API_INQUIRY = "https://api-inquiry.usoftmall.com/";
-//    public static final String API_INQUIRY = "http://192.168.253.192:8080/";
+//    public static final String API_INQUIRY = "http://192.168.253.102:24001/";
 
     public static String IM_BASE_URL() {
         String url = "";

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

@@ -91,8 +91,10 @@ public class SearchActionView extends FrameLayout {
         mBackImageView.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View view) {
-                ((Activity) getContext()).finish();
-                ((Activity) getContext()).overridePendingTransition(R.anim.anim_activity_back_in, R.anim.anim_activity_back_out);
+                if (getContext() != null) {
+                    ((Activity) getContext()).finish();
+                    ((Activity) getContext()).overridePendingTransition(R.anim.anim_activity_back_in, R.anim.anim_activity_back_out);
+                }
             }
         });
 

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

@@ -101,7 +101,10 @@ public class HttpRequest {
                         JSONObject resultObject = JSON.parseObject(result);
                         failMsg = resultObject.getString("exceptionInfo");
                         if (TextUtils.isEmpty(failMsg) || "(null)".equals(failMsg) || "null".equals(failMsg)) {
-                            failMsg = result;
+                            failMsg = resultObject.getString("message");
+                            if (TextUtils.isEmpty(failMsg) || "(null)".equals(failMsg) || "null".equals(failMsg)) {
+                                failMsg = result;
+                            }
                         }
                     } catch (Exception e) {
                         Log.e("exceptionInfo", result);

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

@@ -305,13 +305,17 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
             B2BBusinessListBean b2BBusinessListBean = mCustomerInquiryBeans.get(mSelectPosition);
             if (b2BBusinessListBean != null) {
                 b2BBusinessListBean.setBillState(Constants.FLAG.STATE_CUSTOMER_INQUIRY_DONE);
+                b2BBusinessListBean.setJsonData(null);
             }
             mCustomerInquiryAdapter.notifyDataSetChanged();
         } else if (requestCode == REQUEST_PUBLIC_DETAIL
-                && resultCode == Constants.FLAG.RESULT_PUBLIC_INQUIRY) {
+                && resultCode == Constants.FLAG.RESULT_PUBLIC_INQUIRY && data != null) {
+            String newId = data.getStringExtra(Constants.FLAG.EXTRA_B2B_LIST_ID);
             B2BBusinessListBean b2BBusinessListBean = mPublicInquiryBeans.get(mSelectPosition);
             if (b2BBusinessListBean != null) {
                 b2BBusinessListBean.setBillState(Constants.FLAG.STATE_PUBLIC_INQUIRY_DONE);
+                b2BBusinessListBean.setId(newId);
+                b2BBusinessListBean.setJsonData(null);
             }
             mPublicInquiryAdapter.notifyDataSetChanged();
         }

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

@@ -421,12 +421,14 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
             toast(getString(R.string.quote_success));
             String publicId = "";
             if (Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO.equals(mState)) {
-                setResult(Constants.FLAG.RESULT_PUBLIC_INQUIRY);
                 initEditable(false, View.GONE);
                 if (JSONUtil.validate(result)) {
                     JSONObject publicObject = JSON.parseObject(result);
                     publicId = JSONUtil.getText(publicObject, "content");
                 }
+                Intent intent = getIntent();
+                intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_ID, publicId);
+                setResult(Constants.FLAG.RESULT_PUBLIC_INQUIRY, intent);
             } else {
                 setResult(Constants.FLAG.RESULT_CUSTOMER_INQUIRY);
             }

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

@@ -320,10 +320,14 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
                     mB2BBusinessListBeans.remove(mSelectPosition);
                 } else {
                     b2BBusinessListBean.setBillState(Constants.FLAG.STATE_CUSTOMER_INQUIRY_DONE);
+                    b2BBusinessListBean.setJsonData(null);
                 }
             } else if (requestCode == REQUEST_PUBLIC_DETAIL
-                    && resultCode == Constants.FLAG.RESULT_PUBLIC_INQUIRY) {
-                    b2BBusinessListBean.setBillState(Constants.FLAG.STATE_PUBLIC_INQUIRY_DONE);
+                    && resultCode == Constants.FLAG.RESULT_PUBLIC_INQUIRY && data != null) {
+                String newId = data.getStringExtra(Constants.FLAG.EXTRA_B2B_LIST_ID);
+                b2BBusinessListBean.setBillState(Constants.FLAG.STATE_PUBLIC_INQUIRY_DONE);
+                b2BBusinessListBean.setId(newId);
+                b2BBusinessListBean.setJsonData(null);
             }
             mB2BBusinessListAdapter.notifyDataSetChanged();
         }