提交内容 修改b2b显示bug

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Jan 22 15:40:16 CST 2018
-debugName=498
+#Mon Jan 22 16:12:34 CST 2018
+debugName=548
 versionName=625
-debugCode=498
+debugCode=548
 versionCode=164

app_core/common/src/main/java/com/common/data/JSONUtil.java

@@ -15,292 +15,293 @@ import java.util.Map;
 
 public class JSONUtil {
 
-	public static <T> String map2JSON(Map<String, T> map) {
-		if (map == null) return "";
-		StringBuilder builder = new StringBuilder("{\n");
-		for (Map.Entry<String, T> e : map.entrySet()) {
-			builder.append("\"" + e.getKey() + "\":");
-			if (e.getValue() instanceof String || e.getValue() instanceof CharSequence) {
-				builder.append("\"" + e.getValue() + "\",\n");
-			} else {
-				builder.append(e.getValue() + ",\n");
-			}
-		}
-		builder.deleteCharAt(builder.length() - 1);
-		builder.deleteCharAt(builder.length() - 1);
-		builder.append("\n}");
-		return builder.toString();
-	}
-
-	public static <T> String map2JSON(List<Map<String, T>> maps) {
-		if (maps == null || maps.size() <= 0) return "";
-		StringBuilder builder = new StringBuilder("[\n");
-		for (Map<String, T> m : maps) {
-			builder.append("{\n");
-			for (Map.Entry<String, T> e : m.entrySet()) {
-				builder.append("\"" + e.getKey() + "\":");
-				if (e.getValue() instanceof String || e.getValue() instanceof CharSequence) {
-					builder.append("\"" + StringUtil.toHttpString((String) e.getValue()) + "\",\n");
-				} else {
-					builder.append(e.getValue() + ",\n");
-				}
-			}
-			StringUtil.removieLast(builder);
-			StringUtil.removieLast(builder);
-			builder.append("\n},\n");
-		}
-		StringUtil.removieLast(builder);
-		StringUtil.removieLast(builder);
-		builder.append("\n]");
-		return builder.toString();
-	}
-
-	public static String param2Url(String url, Map<String, Object> param) {
-		if (StringUtil.isEmpty(url))
-			return "";
-		StringBuilder urlBuilder = new StringBuilder(url);
-		if (param == null || param.isEmpty()) {
-			return urlBuilder.toString();
-		}
-		if (!url.contains("?"))
-			urlBuilder.append("?");
-		else urlBuilder.append("&");
-		for (Map.Entry<String, Object> e : param.entrySet()) {
-			if (e.getValue() == null || StringUtil.isEmpty(e.getKey()))
-				continue;
-			String value = null;
-			try {
-				value = URLEncoder.encode(e.getValue().toString(), "UTF-8");
-			} catch (UnsupportedEncodingException e1) {
-				value = e.getValue().toString();
-			}
-			urlBuilder.append(String.format("%s=%s", e.getKey(), value));
-			urlBuilder.append("&");
-		}
-		if (urlBuilder.length() > 1)
-			urlBuilder.deleteCharAt(urlBuilder.length() - 1);
-		return urlBuilder.toString();
-	}
-
-	public static JSONObject getJSONObject(String message, String... keys) {
-		try {
-			return getJSONObject(JSON.parseObject(message), keys);
-		} catch (Exception e) {
-			return new JSONObject();
-		}
-	}
-
-	public static JSONArray getJSONArray(String message, String... keys) {
-		try {
-			return getJSONArray(JSON.parseObject(message), keys);
-		} catch (Exception e) {
-			return new JSONArray();
-		}
-	}
-
-	public static boolean getBoolean(String message, String... keys) {
-		try {
-			return getBoolean(JSON.parseObject(message), keys);
-		} catch (Exception e) {
-			return false;
-		}
-	}
-
-	public static String getText(String message, String... keys) {
-		try {
-			return getText(JSON.parseObject(message), keys);
-		} catch (Exception e) {
-			return "";
-		}
-	}
-
-	public static int getInt(String message, String... keys) {
-		try {
-			return getInt(JSON.parseObject(message), keys);
-		} catch (Exception e) {
-			return 0;
-		}
-	}
-
-	public static long getLong(String message, String... keys) {
-		try {
-			return getLong(JSON.parseObject(message), keys);
-		} catch (Exception e) {
-			return 0;
-		}
-	}
-
-	public static double getDouble(String message, String... keys) {
-		try {
-			return getDouble(JSON.parseObject(message), keys);
-		} catch (Exception e) {
-			return 0;
-		}
-	}
-
-	public static float getFloat(String message, String... keys) {
-		try {
-			return getFloat(JSON.parseObject(message), keys);
-		} catch (Exception e) {
-			return 0;
-		}
-	}
-
-	private static boolean satisfyGet(JSONObject object, String... keys) {
-		return !(object == null || keys == null || keys.length <= 0);
-	}
-
-	public static JSONObject getJSONObject(JSONObject object, String... keys) {
-		if (satisfyGet(object, keys)) {
-			try {
-				for (String key : keys) {
-					if (key != null && object.containsKey(key) && object.get(key) != null && object.get(key) instanceof JSONObject) {
-						return object.getJSONObject(key);
-					}
-				}
-			} catch (Exception e) {
-				return new JSONObject();
-			}
-		}
-		return new JSONObject();
-	}
-
-	public static JSONArray getJSONArray(JSONObject object, String... keys) {
-		try {
-			if (object == null || keys == null || keys.length <= 0) return new JSONArray();
-			for (String key : keys) {
-				if (object.containsKey(key) && object.get(key) instanceof JSONArray) {
-					return object.getJSONArray(key);
-				}
-			}
-		} catch (Exception e) {
-			return new JSONArray();
-		}
-		return new JSONArray();
-	}
-
-	public static boolean getBoolean(JSONObject object, String... keys) {
-		try {
-			String bool = getDataForJson(object, keys);
-			return Boolean.valueOf(bool);
-		} catch (Exception e) {
-			return false;
-		}
-
-	}
-
-	public static String getText(JSONObject object, String... keys) {
-		try {
-			String t = getDataForJson(object, keys);
-			if (StringUtil.isEmpty(t) || StringUtil.hasOneEqual(t, "(null)", "null")) {
-				return "";
-			} else
-				return t;
-		} catch (Exception e) {
-			return "";
-		}
-	}
-
-	public static int getInt(JSONObject object, String... keys) {
-		try {
-			String i = getDataForJson(object, keys);
-			return Integer.valueOf(i);
-		} catch (Exception e) {
-			return 0;
-		}
-	}
-
-	public static long getLong(JSONObject object, String... keys) {
-		try {
-			String i = getDataForJson(object, keys);
-			return Long.valueOf(i);
-		} catch (Exception e) {
-			return 0;
-		}
-	}
-
-	public static double getDouble(JSONObject object, String... keys) {
-		try {
-			String d = getDataForJson(object, keys);
-			return Double.valueOf(d);
-		} catch (Exception e) {
-			return 0;
-
-		}
-	}
-
-	public static float getFloat(JSONObject object, String... keys) {
-		try {
-			String f = getDataForJson(object, keys);
-			return Float.valueOf(f);
-		} catch (Exception e) {
-			return 0;
-		}
-	}
-
-	private static String getDataForJson(JSONObject object, String... keys) {
-		if (object == null || keys == null || keys.length <= 0) return null;
-		Object o = null;
-		for (String key : keys) {
-			o = object.get(key);
-			if (o != null)
-				return o.toString();
-		}
-		return null;
-	}
-
-
-	/*获取接口时间格式，由于独立版和erp版本返回的时间格式不一样 long 和 String */
-	public static long getTime(JSONObject jsonObject, String... keys) {
-		if (jsonObject == null || keys == null || keys.length <= 0) return 0;
-		for (String k : keys) {
-			try {
-				if (jsonObject.containsKey(k)) {
-					Object o = jsonObject.get(k);
-					if (o instanceof String) {
-						return DateFormatUtil.str2Long((String) o, DateFormatUtil.YMD_HMS);
-					} else if (o instanceof Long) {
-						return (long) o;
-					}
-				}
-			} catch (Exception e) {
-
-			}
-		}
-		return 0;
-	}
-
-	/*验证一个字符串是否是合法的JSON串*/
-	public static boolean validate(String message) {
-		if (StringUtil.isEmpty(message)) return false;
-		try {
-			JSON.parse(message);
-			return true;
-		} catch (Exception e) {
-			return false;
-		}
-	}
-
-	/*验证一个字符串是否是合法的JSON串*/
-	public static boolean validateJSONObject(String message) {
-		if (StringUtil.isEmpty(message)) return false;
-		try {
-			JSON.parseObject(message);
-			return true;
-		} catch (Exception e) {
-			return false;
-		}
-	}
-
-	/*验证一个字符串是否是合法的JSON串*/
-	public static boolean validateJSONArray(String message) {
-		if (StringUtil.isEmpty(message)) return false;
-		try {
-			JSON.parseArray(message);
-			return true;
-		} catch (Exception e) {
-			return false;
-		}
-	}
+    public static <T> String map2JSON(Map<String, T> map) {
+        if (map == null) return "";
+        StringBuilder builder = new StringBuilder("{\n");
+        for (Map.Entry<String, T> e : map.entrySet()) {
+            builder.append("\"" + e.getKey() + "\":");
+            if (e.getValue() instanceof String || e.getValue() instanceof CharSequence) {
+                builder.append("\"" + e.getValue() + "\",\n");
+            } else {
+                builder.append(e.getValue() + ",\n");
+            }
+        }
+        builder.deleteCharAt(builder.length() - 1);
+        builder.deleteCharAt(builder.length() - 1);
+        builder.append("\n}");
+        return builder.toString();
+    }
+
+    public static <T> String map2JSON(List<Map<String, T>> maps) {
+        if (maps == null || maps.size() <= 0) return "";
+        StringBuilder builder = new StringBuilder("[\n");
+        for (Map<String, T> m : maps) {
+            builder.append("{\n");
+            for (Map.Entry<String, T> e : m.entrySet()) {
+                builder.append("\"" + e.getKey() + "\":");
+                if (e.getValue() instanceof String || e.getValue() instanceof CharSequence) {
+                    builder.append("\"" + StringUtil.toHttpString((String) e.getValue()) + "\",\n");
+                } else {
+                    builder.append(e.getValue() + ",\n");
+                }
+            }
+            StringUtil.removieLast(builder);
+            StringUtil.removieLast(builder);
+            builder.append("\n},\n");
+        }
+        StringUtil.removieLast(builder);
+        StringUtil.removieLast(builder);
+        builder.append("\n]");
+        return builder.toString();
+    }
+
+    public static String param2Url(String url, Map<String, Object> param) {
+        if (StringUtil.isEmpty(url))
+            return "";
+        StringBuilder urlBuilder = new StringBuilder(url);
+        if (param == null || param.isEmpty()) {
+            return urlBuilder.toString();
+        }
+        if (!url.contains("?"))
+            urlBuilder.append("?");
+        else urlBuilder.append("&");
+        for (Map.Entry<String, Object> e : param.entrySet()) {
+            if (e.getValue() == null || StringUtil.isEmpty(e.getKey()))
+                continue;
+            String value = null;
+            try {
+                value = URLEncoder.encode(e.getValue().toString(), "UTF-8");
+            } catch (UnsupportedEncodingException e1) {
+                value = e.getValue().toString();
+            }
+            urlBuilder.append(String.format("%s=%s", e.getKey(), value));
+            urlBuilder.append("&");
+        }
+        if (urlBuilder.length() > 1)
+            urlBuilder.deleteCharAt(urlBuilder.length() - 1);
+        return urlBuilder.toString();
+    }
+
+    public static JSONObject getJSONObject(String message, String... keys) {
+        try {
+            return getJSONObject(JSON.parseObject(message), keys);
+        } catch (Exception e) {
+            return new JSONObject();
+        }
+    }
+
+    public static JSONArray getJSONArray(String message, String... keys) {
+        try {
+            return getJSONArray(JSON.parseObject(message), keys);
+        } catch (Exception e) {
+            return new JSONArray();
+        }
+    }
+
+    public static boolean getBoolean(String message, String... keys) {
+        try {
+            return getBoolean(JSON.parseObject(message), keys);
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    public static String getText(String message, String... keys) {
+        try {
+            return getText(JSON.parseObject(message), keys);
+        } catch (Exception e) {
+            return "";
+        }
+    }
+
+    public static int getInt(String message, String... keys) {
+        try {
+            return getInt(JSON.parseObject(message), keys);
+        } catch (Exception e) {
+            return 0;
+        }
+    }
+
+    public static long getLong(String message, String... keys) {
+        try {
+            return getLong(JSON.parseObject(message), keys);
+        } catch (Exception e) {
+            return 0;
+        }
+    }
+
+    public static double getDouble(String message, String... keys) {
+        try {
+            return getDouble(JSON.parseObject(message), keys);
+        } catch (Exception e) {
+            return 0;
+        }
+    }
+
+    public static float getFloat(String message, String... keys) {
+        try {
+            return getFloat(JSON.parseObject(message), keys);
+        } catch (Exception e) {
+            return 0;
+        }
+    }
+
+    private static boolean satisfyGet(JSONObject object, String... keys) {
+        return !(object == null || keys == null || keys.length <= 0);
+    }
+
+    public static JSONObject getJSONObject(JSONObject object, String... keys) {
+        if (satisfyGet(object, keys)) {
+            try {
+                for (String key : keys) {
+                    if (key != null && object.containsKey(key) && object.get(key) != null && object.get(key) instanceof JSONObject) {
+                        return object.getJSONObject(key);
+                    }
+                }
+            } catch (Exception e) {
+                return new JSONObject();
+            }
+        }
+        return new JSONObject();
+    }
+
+    public static JSONArray getJSONArray(JSONObject object, String... keys) {
+        try {
+            if (object == null || keys == null || keys.length <= 0) return new JSONArray();
+            for (String key : keys) {
+                if (object.containsKey(key) && object.get(key) instanceof JSONArray) {
+                    return object.getJSONArray(key);
+                }
+            }
+        } catch (Exception e) {
+            return new JSONArray();
+        }
+        return new JSONArray();
+    }
+
+    public static boolean getBoolean(JSONObject object, String... keys) {
+        try {
+            String bool = getDataForJson(object, keys);
+            return Boolean.valueOf(bool);
+        } catch (Exception e) {
+            return false;
+        }
+
+    }
+
+    public static String getText(JSONObject object, String... keys) {
+        try {
+            String t = getDataForJson(object, keys);
+            if (StringUtil.isEmpty(t) || StringUtil.hasOneEqual(t, "(null)", "null")) {
+                return "";
+            } else
+                return t;
+        } catch (Exception e) {
+            return "";
+        }
+    }
+
+    public static int getInt(JSONObject object, String... keys) {
+        try {
+            String i = getDataForJson(object, keys);
+            return Integer.valueOf(i);
+        } catch (Exception e) {
+            return 0;
+        }
+    }
+
+    public static long getLong(JSONObject object, String... keys) {
+        try {
+            String i = getDataForJson(object, keys);
+            return Long.valueOf(i);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
+    public static double getDouble(JSONObject object, String... keys) {
+        try {
+            String d = getDataForJson(object, keys);
+            return Double.valueOf(d);
+        } catch (Exception e) {
+            return 0;
+
+        }
+    }
+
+    public static float getFloat(JSONObject object, String... keys) {
+        try {
+            String f = getDataForJson(object, keys);
+            return Float.valueOf(f);
+        } catch (Exception e) {
+            return 0;
+        }
+    }
+
+    private static String getDataForJson(JSONObject object, String... keys) {
+        if (object == null || keys == null || keys.length <= 0) return null;
+        Object o = null;
+        for (String key : keys) {
+            o = object.get(key);
+            if (o != null)
+                return o.toString();
+        }
+        return null;
+    }
+
+
+    /*获取接口时间格式，由于独立版和erp版本返回的时间格式不一样 long 和 String */
+    public static long getTime(JSONObject jsonObject, String... keys) {
+        if (jsonObject == null || keys == null || keys.length <= 0) return 0;
+        for (String k : keys) {
+            try {
+                if (jsonObject.containsKey(k)) {
+                    Object o = jsonObject.get(k);
+                    if (o instanceof String) {
+                        return DateFormatUtil.str2Long((String) o, DateFormatUtil.YMD_HMS);
+                    } else if (o instanceof Long) {
+                        return (long) o;
+                    }
+                }
+            } catch (Exception e) {
+
+            }
+        }
+        return 0;
+    }
+
+    /*验证一个字符串是否是合法的JSON串*/
+    public static boolean validate(String message) {
+        if (StringUtil.isEmpty(message)) return false;
+        try {
+            JSON.parse(message);
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    /*验证一个字符串是否是合法的JSON串*/
+    public static boolean validateJSONObject(String message) {
+        if (StringUtil.isEmpty(message)) return false;
+        try {
+            JSON.parseObject(message);
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    /*验证一个字符串是否是合法的JSON串*/
+    public static boolean validateJSONArray(String message) {
+        if (StringUtil.isEmpty(message)) return false;
+        try {
+            JSON.parseArray(message);
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
 
 }

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

@@ -198,4 +198,12 @@ public class ActionBackActivity extends StackActivity {
         super.finish();
         overridePendingTransition(R.anim.anim_activity_back_in, R.anim.anim_activity_back_out);
     }
+
+    protected void finish(boolean anim) {
+        if (anim) {
+            finish();
+        } else {
+            super.finish();
+        }
+    }
 }

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

@@ -494,6 +494,13 @@ public class Constants {
         String STATE_CUSTOMER_INQUIRY_REFUSED = "refused";
         String STATE_CUSTOMER_INQUIRY_INVALID = "invalid";
 
+        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;
+
     }
 
     public interface CACHE {

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

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

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

@@ -1,12 +1,9 @@
 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.MenuItem;
@@ -16,6 +13,7 @@ import android.widget.Toast;
 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.common.data.ListUtils;
@@ -34,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;
@@ -85,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;
         }
@@ -299,7 +296,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);
@@ -308,7 +305,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/B2BBusinessLoginActivity.java

@@ -69,6 +69,7 @@ public class B2BBusinessLoginActivity extends BaseMVPActivity {
                 intent.setClass(mContext, B2BBusinessMainActivity.class);
                 intent.putExtra(Constants.FLAG.B2B_COMPANY_BEAN, b2BCompanyBean);
                 startActivity(intent);
+                B2BBusinessLoginActivity.this.finish(false);
             }
         });
     }

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,16 +466,26 @@ 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.setExpiryDate(DateFormatUtil.long2Str((JSONUtil.getLong(inquiryObject, "endDate") / 1000), "yyyy-MM-dd"));
+                    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));
                 }
-                b2BBusinessListBean.setBillDate(DateFormatUtil.long2Str((JSONUtil.getLong(contentObject, "date") / 1000), "yyyy-MM-dd"));
 
                 String invalid = JSONUtil.getText(contentObject, "invalid");
                 if ("1".equals(invalid)) {
@@ -391,8 +525,16 @@ 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"));
-                b2BBusinessListBean.setBillDate(DateFormatUtil.long2Str((JSONUtil.getLong(contentObject, "date") / 1000), "yyyy-MM-dd"));
+
+                JSONObject enterprise = contentObject.getJSONObject("enterprise");
+                if (enterprise != null) {
+                    b2BBusinessListBean.setCompanyName(JSONUtil.getText(enterprise, "enName"));
+                }
+
+                long date = contentObject.getLongValue("date");
+                if (date != 0) {
+                    b2BBusinessListBean.setBillDate(DateFormatUtil.long2Str(date, DateFormatUtil.YMD));
+                }
                 b2BBusinessListBean.setBillNum(JSONUtil.getText(contentObject, "code"));
                 b2BBusinessListBean.setMaterialNum("ddd");
                 JSONArray orderItems = contentObject.getJSONArray("orderItems");
@@ -512,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

@@ -1,11 +1,9 @@
 package com.uas.appworks.activity;
 
 import android.content.Intent;
-import android.os.SystemClock;
 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.widget.Button;
 import android.widget.ImageView;
@@ -13,12 +11,16 @@ import android.widget.ImageView;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.annotation.JSONField;
 import com.common.LogUtil;
 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.adapter.B2BQuotePriceAdapter;
@@ -27,7 +29,9 @@ import com.uas.appworks.model.bean.B2BQuotePriceBean;
 import com.uas.appworks.presenter.WorkPlatPresenter;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author RaoMeng
@@ -36,6 +40,8 @@ import java.util.List;
  */
 
 public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPresenter> implements View.OnClickListener, HttpCallback {
+    private final int CUSTOMER_INQUIRY_REPLY = 0x14;
+    private final int CUSTOMER_INQUIRY_DETAIL = 0x15;
 
     private RecyclerView mDataRecyclerView, mQuoteRecyclerView;
     private ImageView mAddImageView;
@@ -45,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
@@ -93,10 +99,10 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
                             JSONObject detailObject = JSON.parseObject(mJson);
                             JSONObject inquiryObject = detailObject.getJSONObject("inquiry");
                             String checked = JSONUtil.getText(inquiryObject, "checked");
-                            long endDate = JSONUtil.getLong(inquiryObject, "endDate");
-                            long currentDate = SystemClock.currentThreadTimeMillis() * 1000;
+                            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);
                             }
@@ -120,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;
                 }
             }
         }
@@ -148,21 +158,44 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
     @Override
     protected void initData() {
         if (mJson != null && JSONUtil.validate(mJson)) {
-            JSONObject detailObject = JSON.parseObject(mJson);
+            initDetailData(mJson);
+        } else {
+
+        }
+    }
+
+    private void initDetailData(String detail) {
+        if (detail != null && JSONUtil.validate(detail)) {
+            mB2BDetailListBeans.clear();
+            mB2BQuotePriceBeans.clear();
+
+            JSONObject detailObject = JSON.parseObject(detail);
             JSONObject inquiryObject = detailObject.getJSONObject("inquiry");
             JSONObject productObject = detailObject.getJSONObject("product");
+            if (inquiryObject == null) {
+                inquiryObject = JSON.parseObject("");
+            }
+            JSONObject enterpriseObject = inquiryObject.getJSONObject("enterprise");
             JSONObject recorderUser = inquiryObject.getJSONObject("recorderUser");
 
-            String userTel = JSONUtil.getText(recorderUser, "userTel");//客户联系电话
-            String recorder = JSONUtil.getText(inquiryObject, "recorder");//客户
-            String ship = JSONUtil.getText(inquiryObject, "ship");//客户地址
+            String customer = JSONUtil.getText(enterpriseObject, "enName");//客户
+            String customerAddress = JSONUtil.getText(enterpriseObject, "enAddress");//客户地址
+
+            String userTel = "";
+            if (recorderUser != null) {
+                userTel = JSONUtil.getText(recorderUser, "userTel");//客户联系电话
+            }
             String billNum = JSONUtil.getText(inquiryObject, "code");//单据
 
-            String title = JSONUtil.getText(productObject, "title");
-            String spec = JSONUtil.getText(productObject, "spec");
-            String code = JSONUtil.getText(productObject, "code");
-            String material = title + (TextUtils.isEmpty(spec) ? "" : ("," + spec)
-                    + (TextUtils.isEmpty(code) ? "" : ("," + code)));//物料
+            String material = "";
+            if (productObject != null) {
+                String title = JSONUtil.getText(productObject, "title");
+                String spec = JSONUtil.getText(productObject, "spec");
+                String code = JSONUtil.getText(productObject, "code");
+                material = title + (TextUtils.isEmpty(spec) ? "" : ("," + spec)
+                        + (TextUtils.isEmpty(code) ? "" : ("," + code)));//物料
+            }
+
             String currency = JSONUtil.getText(detailObject, "currency");//币别
             String taxrate = JSONUtil.getText(detailObject, "taxrate");//税率
             String environment = JSONUtil.getText(inquiryObject, "environment");//环保要求
@@ -172,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, "天", "交货周期", ""));
-            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_EDIT, "最小起订", minOrderQty, "PCS", "最小起订", ""));
-            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_EDIT, "最小包装", minPackQty, "PCS", "最小包装", ""));
+            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();
 
@@ -198,10 +231,11 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
 
                     mB2BQuotePriceBeans.add(createB2BQuotePriceBean(id, amount, price));
                 }
-                mB2BQuotePriceAdapter.notifyDataSetChanged();
+            } else {
+                mB2BQuotePriceBeans.add(createB2BQuotePriceBean(0, "", ""));
             }
+            mB2BQuotePriceAdapter.notifyDataSetChanged();
         }
-
     }
 
     private B2BDetailListBean createB2BDetailListBean(int itemType,
@@ -250,22 +284,169 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
             mB2BQuotePriceAdapter.notifyDataSetChanged();
         } else if (i == R.id.customer_inquiry_detail_quote_btn) {
             List<B2BQuotePriceBean> b2BQuotePriceBeans = mB2BQuotePriceAdapter.getB2BQuotePriceBeans();
-            for (int j = 0; j < b2BQuotePriceBeans.size(); j++) {
-                String s = b2BQuotePriceBeans.get(j).toString();
-                Log.d("b2BQuotePriceBean", s);
+            List<B2BDetailListBean> b2BDetailListBeans = mB2BDetailListAdapter.getB2BDetailListBeans();
+
+            String leadtime = "", minPackQty = "", minOrderQty = "";
+            for (B2BDetailListBean b2BDetailListBean : b2BDetailListBeans) {
+                String flag = b2BDetailListBean.getFlag();
+                if ("leadtime".equals(flag)) {
+                    leadtime = b2BDetailListBean.getValue();
+                    if (TextUtils.isEmpty(leadtime)) {
+                        toast(getString(R.string.delivery_period_can_not_be_empty));
+                    }
+                }
+                if ("minPackQty".equals(flag)) {
+                    minPackQty = b2BDetailListBean.getValue();
+                }
+                if ("minOrderQty".equals(flag)) {
+                    minOrderQty = b2BDetailListBean.getValue();
+                }
+            }
+            List<Reply> replies = new ArrayList<>();
+            for (B2BQuotePriceBean b2BQuotePriceBean : b2BQuotePriceBeans) {
+                Reply reply = new Reply();
+                String amount = b2BQuotePriceBean.getAmount();
+                String price = b2BQuotePriceBean.getPrice();
+
+                if (TextUtils.isEmpty(amount) || TextUtils.isEmpty(price)) {
+                    toast(getString(R.string.unfilled_items_in_subsection_quotation));
+                    return;
+                }
+                reply.setLapQty(amount);
+                reply.setPrice(price);
+
+                replies.add(reply);
+            }
+
+            String repliesJson = JSON.toJSONString(replies);
+
+            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("inquiryItemId", mId);
+            params.put("replies", repliesJson);
+            params.put("leadtime", leadtime);
+            params.put("minPackQty", minPackQty);
+            params.put("minOrderQty", minOrderQty);
+
+            params.put("useruu", "1000002503");
+
+
+            showLoading(null);
+            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(url)
+                            .method(Method.POST)
+                            .flag(CUSTOMER_INQUIRY_REPLY)
+                            .setHeaders(new HashMap<String, Object>())
+                            .setParams(params).build(), this);
         }
     }
 
     @Override
     public void onSuccess(int flag, Object o) {
-        hideLoading();
-        LogUtil.prinlnLongMsg("customerdetailsuccess", o.toString());
+        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);
+//        params.put("user_tel", MyApplication.getInstance().mLoginUser.getTelephone());
+            params.put("user_tel", "15671616315");
+            params.put("itemId", mId);
+
+            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(url)
+                            .method(Method.GET)
+                            .flag(CUSTOMER_INQUIRY_DETAIL)
+                            .setHeaders(new HashMap<String, Object>())
+                            .setParams(params).build(), this);
+        } else if (flag == CUSTOMER_INQUIRY_DETAIL) {
+            hideLoading();
+
+            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.GONE);
+                } else {
+                    initEditable(true, View.VISIBLE);
+                }
+            } else {
+                initEditable(false, View.GONE);
+            }
+            initDetailData(result);
+
+            if (Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO.equals(mState)) {
+                setResult(Constants.FLAG.RESULT_PUBLIC_INQUIRY);
+            } else {
+                setResult(Constants.FLAG.RESULT_CUSTOMER_INQUIRY);
+            }
+        }
     }
 
     @Override
     public void onFail(int flag, String failStr) {
         hideLoading();
         LogUtil.prinlnLongMsg("customerdetailfail", failStr);
+        toast(failStr);
+    }
+
+    class Reply {
+
+        /**
+         * lapQty : 10
+         * price : 8.88
+         */
+
+        @JSONField(name = "lapQty")
+        private String lapQty;
+        @JSONField(name = "price")
+        private String price;
+
+        public String getLapQty() {
+            return lapQty;
+        }
+
+        public void setLapQty(String lapQty) {
+            this.lapQty = lapQty;
+        }
+
+        public String getPrice() {
+            return price;
+        }
+
+        public void setPrice(String price) {
+            this.price = price;
+        }
     }
 }

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

@@ -12,7 +12,6 @@ import com.uas.appworks.adapter.TabViewpagerAdapter;
 import com.uas.appworks.fragment.B2BBusinessListFragment;
 import com.uas.appworks.model.bean.B2BBusinessListBean;
 import com.uas.appworks.presenter.WorkPlatPresenter;
-import com.uas.appworks.view.WorkPlatView;
 import com.viewpagerindicator.TabPageIndicator;
 import com.viewpagerindicator.UnderlinePageIndicator;
 
@@ -25,7 +24,7 @@ import java.util.List;
  * @date 2018/1/15 10:09
  */
 
-public class PublicInquiryListActivity extends BaseMVPActivity<WorkPlatPresenter> implements WorkPlatView {
+public class PublicInquiryListActivity extends BaseMVPActivity<WorkPlatPresenter> {
 
     private TabPageIndicator mTabPageIndicator;
     private UnderlinePageIndicator mUnderlinePageIndicator;
@@ -35,7 +34,7 @@ public class PublicInquiryListActivity extends BaseMVPActivity<WorkPlatPresenter
     private List<String> mTitleStrings;
     private SearchActionView mSearchActionView;
 
-    private B2BBusinessListFragment mAllFragment, mWaitQuotedFragment, mQuotedPriceFragment, mExpiredFragment;
+    private B2BBusinessListFragment mAllFragment, mDoneFragment;
 
     @Override
     protected int getLayout() {
@@ -55,26 +54,19 @@ public class PublicInquiryListActivity extends BaseMVPActivity<WorkPlatPresenter
         mViewPager = (ViewPager) findViewById(R.id.tab_viewpager_vp);
 
         mAllFragment = new B2BBusinessListFragment();
-        mWaitQuotedFragment = new B2BBusinessListFragment();
-        mQuotedPriceFragment = new B2BBusinessListFragment();
-        mExpiredFragment = new B2BBusinessListFragment();
+        mDoneFragment = new B2BBusinessListFragment();
 
         mAllFragment.setListType(B2BBusinessListBean.PUBLIC_INQUIRY_LIST);
-        mWaitQuotedFragment.setListType(B2BBusinessListBean.PUBLIC_INQUIRY_LIST);
-        mQuotedPriceFragment.setListType(B2BBusinessListBean.PUBLIC_INQUIRY_LIST);
-        mExpiredFragment.setListType(B2BBusinessListBean.PUBLIC_INQUIRY_LIST);
+        mDoneFragment.setListType(B2BBusinessListBean.PUBLIC_INQUIRY_LIST);
+        mDoneFragment.setListState("done");
 
         mFragments = new ArrayList<>();
         mFragments.add(mAllFragment);
-        mFragments.add(mWaitQuotedFragment);
-        mFragments.add(mQuotedPriceFragment);
-        mFragments.add(mExpiredFragment);
+        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));
-        mTitleStrings.add(getString(R.string.str_expired));
         mTabViewpagerAdapter = new TabViewpagerAdapter(this, mFragments, mTitleStrings, getSupportFragmentManager());
 
         mViewPager.setOffscreenPageLimit(mFragments.size() - 1);
@@ -87,7 +79,7 @@ public class PublicInquiryListActivity extends BaseMVPActivity<WorkPlatPresenter
 
     @Override
     protected WorkPlatPresenter initPresenter() {
-        return new WorkPlatPresenter();
+        return null;
     }
 
     @Override
@@ -99,9 +91,7 @@ public class PublicInquiryListActivity extends BaseMVPActivity<WorkPlatPresenter
                 if (CommonUtil.isNetWorkConnected(mContext)) {
                     String text = mSearchActionView.getText();
                     mAllFragment.getListData(1, text);
-                    mWaitQuotedFragment.getListData(1, text);
-                    mQuotedPriceFragment.getListData(1, text);
-                    mExpiredFragment.getListData(1, text);
+                    mDoneFragment.getListData(1, text);
                 } else {
                     toast(R.string.networks_out);
                 }
@@ -114,9 +104,7 @@ public class PublicInquiryListActivity extends BaseMVPActivity<WorkPlatPresenter
                 if (CommonUtil.isNetWorkConnected(mContext)) {
                     String text = mSearchActionView.getText();
                     mAllFragment.getListData(1, text);
-                    mWaitQuotedFragment.getListData(1, text);
-                    mQuotedPriceFragment.getListData(1, text);
-                    mExpiredFragment.getListData(1, text);
+                    mDoneFragment.getListData(1, text);
                 } else {
                     toast(R.string.networks_out);
                 }
@@ -138,14 +126,4 @@ public class PublicInquiryListActivity extends BaseMVPActivity<WorkPlatPresenter
     public void hideLoading() {
 
     }
-
-    @Override
-    public void requestSuccess(int what, Object object) {
-
-    }
-
-    @Override
-    public void requestError(int what, String errorMsg) {
-
-    }
 }

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

@@ -34,6 +34,10 @@ public class B2BDetailListAdapter extends RecyclerView.Adapter<RecyclerView.View
         mLayoutInflater = LayoutInflater.from(mContext);
     }
 
+    public List<B2BDetailListBean> getB2BDetailListBeans() {
+        return mB2BDetailListBeans;
+    }
+
     public boolean isEditable() {
         return isEditable;
     }

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

@@ -1,8 +1,6 @@
 package com.uas.appworks.adapter;
 
 import android.content.Context;
-import android.view.View;
-import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
@@ -54,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) {
@@ -106,7 +126,6 @@ public class B2bBusinessListAdapter extends BaseMultiItemQuickAdapter<B2BBusines
         holder.setText(R.id.list_purchase_order_company_tv, b2BBusinessListBean.getCompanyName());
         holder.setText(R.id.list_purchase_order_bill_date_tv, b2BBusinessListBean.getBillDate());
         holder.setText(R.id.list_purchase_order_bill_num_tv, b2BBusinessListBean.getBillNum());
-        holder.setText(R.id.list_purchase_order_material_num_tv, b2BBusinessListBean.getMaterialNum());
         holder.setText(R.id.list_purchase_order_money_tv, "¥" + b2BBusinessListBean.getMoney());
 
         String billState = b2BBusinessListBean.getBillState();
@@ -137,81 +156,4 @@ public class B2bBusinessListAdapter extends BaseMultiItemQuickAdapter<B2BBusines
         holder.setVisible(R.id.list_purchase_order_wait_reply_btn, b3);
     }
 
-    class CustomerInquiryViewHolder extends BaseViewHolder {
-        TextView companyTextView;
-        TextView billDateTextView;
-        TextView billNumTextView;
-        TextView materialNumTextView;
-        TextView expiryDateTextView;
-        TextView quotationAdoptedBtn;
-        TextView expiredBtn;
-        TextView quotedPriceBtn;
-
-        public CustomerInquiryViewHolder(View itemView) {
-            super(itemView);
-
-            companyTextView = (TextView) itemView.findViewById(R.id.list_customer_inquiry_company_tv);
-            billDateTextView = (TextView) itemView.findViewById(R.id.list_customer_inquiry_bill_date_tv);
-            billNumTextView = (TextView) itemView.findViewById(R.id.list_customer_inquiry_bill_num_tv);
-            materialNumTextView = (TextView) itemView.findViewById(R.id.list_customer_inquiry_material_num_tv);
-            expiryDateTextView = (TextView) itemView.findViewById(R.id.list_customer_inquiry_expiry_date_tv);
-            quotationAdoptedBtn = (TextView) itemView.findViewById(R.id.list_customer_inquiry_quotation_adopted_btn);
-            expiredBtn = (TextView) itemView.findViewById(R.id.list_customer_inquiry_expired_btn);
-            quotedPriceBtn = (TextView) itemView.findViewById(R.id.list_customer_inquiry_quoted_price_btn);
-        }
-    }
-
-    class PublicInquiryViewHolder extends BaseViewHolder {
-        TextView companyTextView;
-        TextView billDateTextView;
-        TextView productNameTextView;
-        TextView productModelTextView;
-        TextView productSpecificationTextView;
-        TextView productAmountTextView;
-        TextView productBrandTextView;
-        TextView expiryDateTextView;
-        TextView offerQuotationBtn;
-        TextView expiredBtn;
-        TextView quotedPriceBtn;
-
-        public PublicInquiryViewHolder(View itemView) {
-            super(itemView);
-
-            companyTextView = (TextView) itemView.findViewById(R.id.list_public_inquiry_company_tv);
-            billDateTextView = (TextView) itemView.findViewById(R.id.list_public_inquiry_bill_date_tv);
-            productNameTextView = (TextView) itemView.findViewById(R.id.list_public_inquiry_product_name_tv);
-            productModelTextView = (TextView) itemView.findViewById(R.id.list_public_inquiry_product_model_tv);
-            productSpecificationTextView = (TextView) itemView.findViewById(R.id.list_public_inquiry_product_specification_tv);
-            productAmountTextView = (TextView) itemView.findViewById(R.id.list_public_inquiry_product_amount_tv);
-            productBrandTextView = (TextView) itemView.findViewById(R.id.list_public_inquiry_product_brand_tv);
-            expiryDateTextView = (TextView) itemView.findViewById(R.id.list_public_inquiry_expiry_date_tv);
-            offerQuotationBtn = (TextView) itemView.findViewById(R.id.list_public_inquiry_offer_quotation_btn);
-            expiredBtn = (TextView) itemView.findViewById(R.id.list_public_inquiry_expired_btn);
-            quotedPriceBtn = (TextView) itemView.findViewById(R.id.list_public_inquiry_quoted_price_btn);
-        }
-    }
-
-    class PurchaseOrderViewHolder extends BaseViewHolder {
-        TextView companyTextView;
-        TextView billDateTextView;
-        TextView billNumTextView;
-        TextView materialNumTextView;
-        TextView moneyTextView;
-        TextView WaitReplyBtn;
-        TextView RepliedBtn;
-        TextView caseClosedBtn;
-
-        public PurchaseOrderViewHolder(View itemView) {
-            super(itemView);
-
-            companyTextView = (TextView) itemView.findViewById(R.id.list_purchase_order_company_tv);
-            billDateTextView = (TextView) itemView.findViewById(R.id.list_purchase_order_bill_date_tv);
-            billNumTextView = (TextView) itemView.findViewById(R.id.list_purchase_order_bill_num_tv);
-            materialNumTextView = (TextView) itemView.findViewById(R.id.list_purchase_order_material_num_tv);
-            moneyTextView = (TextView) itemView.findViewById(R.id.list_purchase_order_money_tv);
-            WaitReplyBtn = (TextView) itemView.findViewById(R.id.list_purchase_order_wait_reply_btn);
-            RepliedBtn = (TextView) itemView.findViewById(R.id.list_purchase_order_have_replied_btn);
-            caseClosedBtn = (TextView) itemView.findViewById(R.id.list_purchase_order_case_closed_btn);
-        }
-    }
 }

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;
@@ -72,7 +87,7 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
                 mListUrl = "mobile/sale/inquiry/info/search";
                 break;
             case B2BBusinessListBean.PUBLIC_INQUIRY_LIST:
-                mListUrl = "mobile/purc/inquiry/publicInquiryItem";
+                mListUrl = "inquiry/public/mobile";
                 break;
             default:
                 mListUrl = "mobile/sale/orders/info/search";
@@ -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 {
@@ -206,7 +262,11 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
             params.put("keyword", mKeyWord);
         }
 
-        HttpRequest.getInstance().sendRequest("http://192.168.253.102:8090/platform-b2b/",
+        String host = "http://192.168.253.102:8090/platform-b2b/";
+        if (mListType == B2BBusinessListBean.PUBLIC_INQUIRY_LIST) {
+            host = "http://218.17.158.219:24000/";
+        }
+        HttpRequest.getInstance().sendRequest(host,
                 new HttpParams.Builder()
                         .url(mListUrl)
                         .flag(OBTAIN_B2B_LIST)
@@ -234,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) {
@@ -246,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);
@@ -263,6 +367,7 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
                             analysisCustomerInquiry(contentArray);
                             break;
                         case B2BBusinessListBean.PUBLIC_INQUIRY_LIST:
+                            analisisPublicInquiry(contentArray);
                             break;
                     }
                     break;
@@ -274,6 +379,53 @@ public class B2BBusinessListFragment extends BaseMVPFragment<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);
+                }
+                mB2BBusinessListBeans.add(b2BBusinessListBean);
+            }
+        }
+        mB2BBusinessListAdapter.notifyDataSetChanged();
+    }
+
     private void analysisCustomerInquiry(JSONArray contentArray) {
         for (int i = 0; i < contentArray.size(); i++) {
             JSONObject contentObject = contentArray.getJSONObject(i);
@@ -284,16 +436,26 @@ 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.setExpiryDate(DateFormatUtil.long2Str((JSONUtil.getLong(inquiryObject, "endDate") / 1000), "yyyy-MM-dd"));
+                    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));
                 }
-                b2BBusinessListBean.setBillDate(DateFormatUtil.long2Str((JSONUtil.getLong(contentObject, "date") / 1000), "yyyy-MM-dd"));
                 String invalid = JSONUtil.getText(contentObject, "invalid");
                 if ("1".equals(invalid)) {
                     b2BBusinessListBean.setBillState(Constants.FLAG.STATE_CUSTOMER_INQUIRY_INVALID);
@@ -332,10 +494,18 @@ 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"));
-                b2BBusinessListBean.setBillDate(DateFormatUtil.long2Str((JSONUtil.getLong(contentObject, "date") / 1000), "yyyy-MM-dd"));
+
+                JSONObject enterprise = contentObject.getJSONObject("enterprise");
+                if (enterprise != null) {
+                    b2BBusinessListBean.setCompanyName(JSONUtil.getText(enterprise, "enName"));
+                }
+
+                long date = contentObject.getLongValue("date");
+                if (date != 0) {
+                    b2BBusinessListBean.setBillDate(DateFormatUtil.long2Str(date, DateFormatUtil.YMD));
+                }
                 b2BBusinessListBean.setBillNum(JSONUtil.getText(contentObject, "code"));
-                b2BBusinessListBean.setMaterialNum("ddd");
+
                 JSONArray orderItems = contentObject.getJSONArray("orderItems");
                 if (orderItems == null || orderItems.size() == 0) {
                     b2BBusinessListBean.setMoney("0");
@@ -371,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/java/com/uas/appworks/fragment/B2BBusinessListFragment2.java

@@ -1,65 +0,0 @@
-package com.uas.appworks.fragment;
-
-import android.support.v7.widget.RecyclerView;
-
-import com.core.base.fragment.BaseMVPFragment;
-import com.uas.appworks.R;
-import com.uas.appworks.presenter.WorkPlatPresenter;
-import com.uas.appworks.view.WorkPlatView;
-
-/**
- * @author RaoMeng
- * @describe B2B商务列表fragment
- * @date 2018/1/15 11:11
- */
-
-public class B2BBusinessListFragment2 extends BaseMVPFragment<WorkPlatPresenter> implements WorkPlatView {
-
-    private RecyclerView mRecyclerView;
-
-    @Override
-    protected WorkPlatPresenter initPresenter() {
-        return new WorkPlatPresenter();
-    }
-
-    @Override
-    protected int getLayout() {
-        return R.layout.fragment_b2b_list;
-    }
-
-    @Override
-    protected void initViews() {
-        mRecyclerView = $(R.id.b2b_list_rv);
-    }
-
-    @Override
-    protected void initEvents() {
-
-    }
-
-    @Override
-    protected void initDatas() {
-
-    }
-
-    @Override
-    public void showLoading(String loadStr) {
-        progressDialog.show();
-    }
-
-    @Override
-    public void hideLoading() {
-        progressDialog.dismiss();
-    }
-
-    @Override
-    public void requestSuccess(int what, Object object) {
-
-    }
-
-    @Override
-    public void requestError(int what, String errorMsg) {
-
-    }
-
-}

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

@@ -1,65 +0,0 @@
-package com.uas.appworks.fragment;
-
-import android.support.v7.widget.RecyclerView;
-
-import com.core.base.fragment.BaseMVPFragment;
-import com.uas.appworks.R;
-import com.uas.appworks.presenter.WorkPlatPresenter;
-import com.uas.appworks.view.WorkPlatView;
-
-/**
- * @author RaoMeng
- * @describe B2B商务列表fragment
- * @date 2018/1/15 11:11
- */
-
-public class B2BBusinessListFragment3 extends BaseMVPFragment<WorkPlatPresenter> implements WorkPlatView {
-
-    private RecyclerView mRecyclerView;
-
-    @Override
-    protected WorkPlatPresenter initPresenter() {
-        return new WorkPlatPresenter();
-    }
-
-    @Override
-    protected int getLayout() {
-        return R.layout.fragment_b2b_list;
-    }
-
-    @Override
-    protected void initViews() {
-        mRecyclerView = $(R.id.b2b_list_rv);
-    }
-
-    @Override
-    protected void initEvents() {
-
-    }
-
-    @Override
-    protected void initDatas() {
-
-    }
-
-    @Override
-    public void showLoading(String loadStr) {
-        progressDialog.show();
-    }
-
-    @Override
-    public void hideLoading() {
-        progressDialog.dismiss();
-    }
-
-    @Override
-    public void requestSuccess(int what, Object object) {
-
-    }
-
-    @Override
-    public void requestError(int what, String errorMsg) {
-
-    }
-
-}

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

@@ -1,66 +0,0 @@
-package com.uas.appworks.fragment;
-
-import android.support.v7.widget.RecyclerView;
-
-import com.core.base.fragment.BaseMVPFragment;
-import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.uas.appworks.R;
-import com.uas.appworks.presenter.WorkPlatPresenter;
-import com.uas.appworks.view.WorkPlatView;
-
-/**
- * @author RaoMeng
- * @describe B2B商务列表fragment
- * @date 2018/1/15 11:11
- */
-
-public class B2BBusinessListFragment4 extends BaseMVPFragment<WorkPlatPresenter> implements WorkPlatView {
-
-    private RecyclerView mRecyclerView;
-
-    @Override
-    protected WorkPlatPresenter initPresenter() {
-        return new WorkPlatPresenter();
-    }
-
-    @Override
-    protected int getLayout() {
-        return R.layout.fragment_b2b_list;
-    }
-
-    @Override
-    protected void initViews() {
-        mRecyclerView = $(R.id.b2b_list_rv);
-    }
-
-    @Override
-    protected void initEvents() {
-
-    }
-
-    @Override
-    protected void initDatas() {
-
-    }
-
-    @Override
-    public void showLoading(String loadStr) {
-            progressDialog.show();
-    }
-
-    @Override
-    public void hideLoading() {
-        progressDialog.dismiss();
-    }
-
-    @Override
-    public void requestSuccess(int what, Object object) {
-
-    }
-
-    @Override
-    public void requestError(int what, String errorMsg) {
-
-    }
-
-}

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

@@ -1,66 +0,0 @@
-package com.uas.appworks.fragment;
-
-import android.support.v7.widget.RecyclerView;
-
-import com.core.base.fragment.BaseMVPFragment;
-import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.uas.appworks.R;
-import com.uas.appworks.presenter.WorkPlatPresenter;
-import com.uas.appworks.view.WorkPlatView;
-
-/**
- * @author RaoMeng
- * @describe B2B商务列表fragment
- * @date 2018/1/15 11:11
- */
-
-public class B2BBusinessListFragment5 extends BaseMVPFragment<WorkPlatPresenter> implements WorkPlatView {
-
-    private RecyclerView mRecyclerView;
-
-    @Override
-    protected WorkPlatPresenter initPresenter() {
-        return new WorkPlatPresenter();
-    }
-
-    @Override
-    protected int getLayout() {
-        return R.layout.fragment_b2b_list;
-    }
-
-    @Override
-    protected void initViews() {
-        mRecyclerView = $(R.id.b2b_list_rv);
-    }
-
-    @Override
-    protected void initEvents() {
-
-    }
-
-    @Override
-    protected void initDatas() {
-
-    }
-
-    @Override
-    public void showLoading(String loadStr) {
-        progressDialog.show();
-    }
-
-    @Override
-    public void hideLoading() {
-        progressDialog.dismiss();
-    }
-
-    @Override
-    public void requestSuccess(int what, Object object) {
-
-    }
-
-    @Override
-    public void requestError(int what, String errorMsg) {
-
-    }
-
-}

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

@@ -1,768 +0,0 @@
-package com.uas.appworks.model.bean;
-
-import java.util.List;
-
-/**
- * @author RaoMeng
- * @describe
- * @date 2018/1/18 18:13
- */
-
-public class B2BInquiryDetailBean {
-
-    /**
-     * attaches : []
-     * backStatus : 203
-     * currency : RMB
-     * custLap : 0
-     * date : 1515635975721
-     * decideStatus : 311
-     * enterprise : {"businesscode":"56749203","enAddress":"深圳市南山区英唐大厦6楼","enName":"深圳市胜芳电子有限公司","uu":10041559}
-     * erpstatus : 1
-     * fromDate : 1515635975890
-     * id : 1923777
-     * inquiry : {"attachs":[],"code":"XJ180111722","date":1515635975721,"enUU":10041166,"endDate":1517328000000,"enterprise":{"businesscode":"123451234567890","enAddress":"深圳市南山区","enName":"深圳市优软科技有限公司","uu":10041166},"id":941272,"inquirytype":"询价","invoice":0,"kind":"publicInquiry","overdue":0,"priceType":"采购","recorder":"何建清","recorderUU":1000003217,"remark":"测试询价","ship":"云南省临沧市沧源佤族自治县给个回话AA15678765456","sourceApp":"B2B","sourceId":6041}
-     * invalid : 0
-     * kind : publicInquiry
-     * leadtime : 12
-     * needquantity : 11
-     * number : 0
-     * overdue : 0
-     * product : {"cmpCode":"ICTEST1127123","code":"3-USTM-S207-T6-0S-2","enUU":10041166,"erpDate":1515225150272,"id":30373,"isPubsale":1,"isPurchase":1,"isShow":1,"kind":"IC","matchresults":[],"pcmpcode":"ICTEST1127123","sourceApp":"ERP","sourceId":100006450,"spec":"ICTEST1127123","title":"IC","unit":"PCS","userUU":200040149}
-     * productId : 30373
-     * replies : [{"id":2026498,"lapQty":0,"price":12}]
-     * replySendStatus : 202
-     * replyable : true
-     * sendStatus : 202
-     * status : 201
-     * taxrate : 17
-     * toDate : 1516204800000
-     * vendUU : 10041559
-     * vendUserUU : 1000003217
-     */
-
-    private int backStatus;
-    private String currency;
-    private int custLap;
-    private long date;
-    private int decideStatus;
-    private EnterpriseBean enterprise;
-    private int erpstatus;
-    private long fromDate;
-    private int id;
-    private InquiryBean inquiry;
-    private int invalid;
-    private String kind;
-    private int leadtime;
-    private int needquantity;
-    private int number;
-    private int overdue;
-    private ProductBean product;
-    private int productId;
-    private int replySendStatus;
-    private boolean replyable;
-    private int sendStatus;
-    private int status;
-    private int taxrate;
-    private long toDate;
-    private int vendUU;
-    private int vendUserUU;
-    private List<RepliesBean> replies;
-
-    public int getBackStatus() {
-        return backStatus;
-    }
-
-    public void setBackStatus(int backStatus) {
-        this.backStatus = backStatus;
-    }
-
-    public String getCurrency() {
-        return currency;
-    }
-
-    public void setCurrency(String currency) {
-        this.currency = currency;
-    }
-
-    public int getCustLap() {
-        return custLap;
-    }
-
-    public void setCustLap(int custLap) {
-        this.custLap = custLap;
-    }
-
-    public long getDate() {
-        return date;
-    }
-
-    public void setDate(long date) {
-        this.date = date;
-    }
-
-    public int getDecideStatus() {
-        return decideStatus;
-    }
-
-    public void setDecideStatus(int decideStatus) {
-        this.decideStatus = decideStatus;
-    }
-
-    public EnterpriseBean getEnterprise() {
-        return enterprise;
-    }
-
-    public void setEnterprise(EnterpriseBean enterprise) {
-        this.enterprise = enterprise;
-    }
-
-    public int getErpstatus() {
-        return erpstatus;
-    }
-
-    public void setErpstatus(int erpstatus) {
-        this.erpstatus = erpstatus;
-    }
-
-    public long getFromDate() {
-        return fromDate;
-    }
-
-    public void setFromDate(long fromDate) {
-        this.fromDate = fromDate;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public InquiryBean getInquiry() {
-        return inquiry;
-    }
-
-    public void setInquiry(InquiryBean inquiry) {
-        this.inquiry = inquiry;
-    }
-
-    public int getInvalid() {
-        return invalid;
-    }
-
-    public void setInvalid(int invalid) {
-        this.invalid = invalid;
-    }
-
-    public String getKind() {
-        return kind;
-    }
-
-    public void setKind(String kind) {
-        this.kind = kind;
-    }
-
-    public int getLeadtime() {
-        return leadtime;
-    }
-
-    public void setLeadtime(int leadtime) {
-        this.leadtime = leadtime;
-    }
-
-    public int getNeedquantity() {
-        return needquantity;
-    }
-
-    public void setNeedquantity(int needquantity) {
-        this.needquantity = needquantity;
-    }
-
-    public int getNumber() {
-        return number;
-    }
-
-    public void setNumber(int number) {
-        this.number = number;
-    }
-
-    public int getOverdue() {
-        return overdue;
-    }
-
-    public void setOverdue(int overdue) {
-        this.overdue = overdue;
-    }
-
-    public ProductBean getProduct() {
-        return product;
-    }
-
-    public void setProduct(ProductBean product) {
-        this.product = product;
-    }
-
-    public int getProductId() {
-        return productId;
-    }
-
-    public void setProductId(int productId) {
-        this.productId = productId;
-    }
-
-    public int getReplySendStatus() {
-        return replySendStatus;
-    }
-
-    public void setReplySendStatus(int replySendStatus) {
-        this.replySendStatus = replySendStatus;
-    }
-
-    public boolean isReplyable() {
-        return replyable;
-    }
-
-    public void setReplyable(boolean replyable) {
-        this.replyable = replyable;
-    }
-
-    public int getSendStatus() {
-        return sendStatus;
-    }
-
-    public void setSendStatus(int sendStatus) {
-        this.sendStatus = sendStatus;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    public void setStatus(int status) {
-        this.status = status;
-    }
-
-    public int getTaxrate() {
-        return taxrate;
-    }
-
-    public void setTaxrate(int taxrate) {
-        this.taxrate = taxrate;
-    }
-
-    public long getToDate() {
-        return toDate;
-    }
-
-    public void setToDate(long toDate) {
-        this.toDate = toDate;
-    }
-
-    public int getVendUU() {
-        return vendUU;
-    }
-
-    public void setVendUU(int vendUU) {
-        this.vendUU = vendUU;
-    }
-
-    public int getVendUserUU() {
-        return vendUserUU;
-    }
-
-    public void setVendUserUU(int vendUserUU) {
-        this.vendUserUU = vendUserUU;
-    }
-
-    public List<RepliesBean> getReplies() {
-        return replies;
-    }
-
-    public void setReplies(List<RepliesBean> replies) {
-        this.replies = replies;
-    }
-
-    public static class EnterpriseBean {
-        /**
-         * businesscode : 56749203
-         * enAddress : 深圳市南山区英唐大厦6楼
-         * enName : 深圳市胜芳电子有限公司
-         * uu : 10041559
-         */
-
-        private String businesscode;
-        private String enAddress;
-        private String enName;
-        private int uu;
-
-        public String getBusinesscode() {
-            return businesscode;
-        }
-
-        public void setBusinesscode(String businesscode) {
-            this.businesscode = businesscode;
-        }
-
-        public String getEnAddress() {
-            return enAddress;
-        }
-
-        public void setEnAddress(String enAddress) {
-            this.enAddress = enAddress;
-        }
-
-        public String getEnName() {
-            return enName;
-        }
-
-        public void setEnName(String enName) {
-            this.enName = enName;
-        }
-
-        public int getUu() {
-            return uu;
-        }
-
-        public void setUu(int uu) {
-            this.uu = uu;
-        }
-    }
-
-    public static class InquiryBean {
-        /**
-         * attachs : []
-         * code : XJ180111722
-         * date : 1515635975721
-         * enUU : 10041166
-         * endDate : 1517328000000
-         * enterprise : {"businesscode":"123451234567890","enAddress":"深圳市南山区","enName":"深圳市优软科技有限公司","uu":10041166}
-         * id : 941272
-         * inquirytype : 询价
-         * invoice : 0
-         * kind : publicInquiry
-         * overdue : 0
-         * priceType : 采购
-         * recorder : 何建清
-         * recorderUU : 1000003217
-         * remark : 测试询价
-         * ship : 云南省临沧市沧源佤族自治县给个回话AA15678765456
-         * sourceApp : B2B
-         * sourceId : 6041
-         */
-
-        private String code;
-        private long date;
-        private int enUU;
-        private long endDate;
-        private EnterpriseBean enterprise;
-        private int id;
-        private String inquirytype;
-        private int invoice;
-        private String kind;
-        private int overdue;
-        private String priceType;
-        private String recorder;
-        private int recorderUU;
-        private String remark;
-        private String ship;
-        private String sourceApp;
-        private int sourceId;
-
-        public String getCode() {
-            return code;
-        }
-
-        public void setCode(String code) {
-            this.code = code;
-        }
-
-        public long getDate() {
-            return date;
-        }
-
-        public void setDate(long date) {
-            this.date = date;
-        }
-
-        public int getEnUU() {
-            return enUU;
-        }
-
-        public void setEnUU(int enUU) {
-            this.enUU = enUU;
-        }
-
-        public long getEndDate() {
-            return endDate;
-        }
-
-        public void setEndDate(long endDate) {
-            this.endDate = endDate;
-        }
-
-        public EnterpriseBean getEnterprise() {
-            return enterprise;
-        }
-
-        public void setEnterprise(EnterpriseBean enterprise) {
-            this.enterprise = enterprise;
-        }
-
-        public int getId() {
-            return id;
-        }
-
-        public void setId(int id) {
-            this.id = id;
-        }
-
-        public String getInquirytype() {
-            return inquirytype;
-        }
-
-        public void setInquirytype(String inquirytype) {
-            this.inquirytype = inquirytype;
-        }
-
-        public int getInvoice() {
-            return invoice;
-        }
-
-        public void setInvoice(int invoice) {
-            this.invoice = invoice;
-        }
-
-        public String getKind() {
-            return kind;
-        }
-
-        public void setKind(String kind) {
-            this.kind = kind;
-        }
-
-        public int getOverdue() {
-            return overdue;
-        }
-
-        public void setOverdue(int overdue) {
-            this.overdue = overdue;
-        }
-
-        public String getPriceType() {
-            return priceType;
-        }
-
-        public void setPriceType(String priceType) {
-            this.priceType = priceType;
-        }
-
-        public String getRecorder() {
-            return recorder;
-        }
-
-        public void setRecorder(String recorder) {
-            this.recorder = recorder;
-        }
-
-        public int getRecorderUU() {
-            return recorderUU;
-        }
-
-        public void setRecorderUU(int recorderUU) {
-            this.recorderUU = recorderUU;
-        }
-
-        public String getRemark() {
-            return remark;
-        }
-
-        public void setRemark(String remark) {
-            this.remark = remark;
-        }
-
-        public String getShip() {
-            return ship;
-        }
-
-        public void setShip(String ship) {
-            this.ship = ship;
-        }
-
-        public String getSourceApp() {
-            return sourceApp;
-        }
-
-        public void setSourceApp(String sourceApp) {
-            this.sourceApp = sourceApp;
-        }
-
-        public int getSourceId() {
-            return sourceId;
-        }
-
-        public void setSourceId(int sourceId) {
-            this.sourceId = sourceId;
-        }
-
-        public static class EnterpriseBean {
-            /**
-             * businesscode : 123451234567890
-             * enAddress : 深圳市南山区
-             * enName : 深圳市优软科技有限公司
-             * uu : 10041166
-             */
-
-            private String businesscode;
-            private String enAddress;
-            private String enName;
-            private int uu;
-
-            public String getBusinesscode() {
-                return businesscode;
-            }
-
-            public void setBusinesscode(String businesscode) {
-                this.businesscode = businesscode;
-            }
-
-            public String getEnAddress() {
-                return enAddress;
-            }
-
-            public void setEnAddress(String enAddress) {
-                this.enAddress = enAddress;
-            }
-
-            public String getEnName() {
-                return enName;
-            }
-
-            public void setEnName(String enName) {
-                this.enName = enName;
-            }
-
-            public int getUu() {
-                return uu;
-            }
-
-            public void setUu(int uu) {
-                this.uu = uu;
-            }
-        }
-    }
-
-    public static class ProductBean {
-        /**
-         * cmpCode : ICTEST1127123
-         * code : 3-USTM-S207-T6-0S-2
-         * enUU : 10041166
-         * erpDate : 1515225150272
-         * id : 30373
-         * isPubsale : 1
-         * isPurchase : 1
-         * isShow : 1
-         * kind : IC
-         * matchresults : []
-         * pcmpcode : ICTEST1127123
-         * sourceApp : ERP
-         * sourceId : 100006450
-         * spec : ICTEST1127123
-         * title : IC
-         * unit : PCS
-         * userUU : 200040149
-         */
-
-        private String cmpCode;
-        private String code;
-        private int enUU;
-        private long erpDate;
-        private int id;
-        private int isPubsale;
-        private int isPurchase;
-        private int isShow;
-        private String kind;
-        private String pcmpcode;
-        private String sourceApp;
-        private int sourceId;
-        private String spec;
-        private String title;
-        private String unit;
-        private int userUU;
-        private List<?> matchresults;
-
-        public String getCmpCode() {
-            return cmpCode;
-        }
-
-        public void setCmpCode(String cmpCode) {
-            this.cmpCode = cmpCode;
-        }
-
-        public String getCode() {
-            return code;
-        }
-
-        public void setCode(String code) {
-            this.code = code;
-        }
-
-        public int getEnUU() {
-            return enUU;
-        }
-
-        public void setEnUU(int enUU) {
-            this.enUU = enUU;
-        }
-
-        public long getErpDate() {
-            return erpDate;
-        }
-
-        public void setErpDate(long erpDate) {
-            this.erpDate = erpDate;
-        }
-
-        public int getId() {
-            return id;
-        }
-
-        public void setId(int id) {
-            this.id = id;
-        }
-
-        public int getIsPubsale() {
-            return isPubsale;
-        }
-
-        public void setIsPubsale(int isPubsale) {
-            this.isPubsale = isPubsale;
-        }
-
-        public int getIsPurchase() {
-            return isPurchase;
-        }
-
-        public void setIsPurchase(int isPurchase) {
-            this.isPurchase = isPurchase;
-        }
-
-        public int getIsShow() {
-            return isShow;
-        }
-
-        public void setIsShow(int isShow) {
-            this.isShow = isShow;
-        }
-
-        public String getKind() {
-            return kind;
-        }
-
-        public void setKind(String kind) {
-            this.kind = kind;
-        }
-
-        public String getPcmpcode() {
-            return pcmpcode;
-        }
-
-        public void setPcmpcode(String pcmpcode) {
-            this.pcmpcode = pcmpcode;
-        }
-
-        public String getSourceApp() {
-            return sourceApp;
-        }
-
-        public void setSourceApp(String sourceApp) {
-            this.sourceApp = sourceApp;
-        }
-
-        public int getSourceId() {
-            return sourceId;
-        }
-
-        public void setSourceId(int sourceId) {
-            this.sourceId = sourceId;
-        }
-
-        public String getSpec() {
-            return spec;
-        }
-
-        public void setSpec(String spec) {
-            this.spec = spec;
-        }
-
-        public String getTitle() {
-            return title;
-        }
-
-        public void setTitle(String title) {
-            this.title = title;
-        }
-
-        public String getUnit() {
-            return unit;
-        }
-
-        public void setUnit(String unit) {
-            this.unit = unit;
-        }
-
-        public int getUserUU() {
-            return userUU;
-        }
-
-        public void setUserUU(int userUU) {
-            this.userUU = userUU;
-        }
-
-        public List<?> getMatchresults() {
-            return matchresults;
-        }
-
-        public void setMatchresults(List<?> matchresults) {
-            this.matchresults = matchresults;
-        }
-    }
-
-    public static class RepliesBean {
-        /**
-         * id : 2026498
-         * lapQty : 0
-         * price : 12
-         */
-
-        private int id;
-        private int lapQty;
-        private int price;
-
-        public int getId() {
-            return id;
-        }
-
-        public void setId(int id) {
-            this.id = id;
-        }
-
-        public int getLapQty() {
-            return lapQty;
-        }
-
-        public void setLapQty(int lapQty) {
-            this.lapQty = lapQty;
-        }
-
-        public int getPrice() {
-            return price;
-        }
-
-        public void setPrice(int price) {
-            this.price = price;
-        }
-    }
-}

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

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

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

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

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

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

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

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

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_customer_inquiry.xml

@@ -120,13 +120,13 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
-        android:background="@drawable/selector_cancel_bg"
+        android:background="@drawable/shape_b2b_done_bg"
         android:paddingBottom="4dp"
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
         android:paddingTop="4dp"
         android:text="@string/str_quotation_adopted"
-        android:textColor="@color/selector_cancel_text_color"
+        android:textColor="@color/b2b_btn_done"
         android:visibility="gone" />
 
     <TextView
@@ -135,13 +135,13 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
-        android:background="@drawable/selector_cancel_bg"
+        android:background="@drawable/shape_b2b_end_bg"
         android:paddingBottom="4dp"
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
         android:paddingTop="4dp"
         android:text="@string/str_expired"
-        android:textColor="@color/selector_cancel_text_color"
+        android:textColor="@color/b2b_btn_end"
         android:visibility="gone" />
 
     <TextView
@@ -150,13 +150,13 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
-        android:background="@drawable/selector_cancel_bg"
+        android:background="@drawable/shape_b2b_todo_bg"
         android:paddingBottom="4dp"
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
         android:paddingTop="4dp"
         android:text="@string/str_quoted_price"
-        android:textColor="@color/selector_cancel_text_color"
+        android:textColor="@color/b2b_btn_todo"
         android:visibility="gone" />
 
     <TextView
@@ -165,13 +165,13 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
-        android:background="@drawable/selector_cancel_bg"
+        android:background="@drawable/shape_b2b_todo_bg"
         android:paddingBottom="4dp"
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
         android:paddingTop="4dp"
         android:text="@string/str_wait_quoted"
-        android:textColor="@color/selector_cancel_text_color"
+        android:textColor="@color/b2b_btn_todo"
         android:visibility="gone" />
 
     <TextView
@@ -180,13 +180,13 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
-        android:background="@drawable/selector_cancel_bg"
+        android:background="@drawable/shape_b2b_end_bg"
         android:paddingBottom="4dp"
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
         android:paddingTop="4dp"
         android:text="@string/str_quotation_unadopted"
-        android:textColor="@color/selector_cancel_text_color"
+        android:textColor="@color/b2b_btn_end"
         android:visibility="gone" />
 
     <TextView
@@ -195,13 +195,13 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
-        android:background="@drawable/selector_cancel_bg"
+        android:background="@drawable/shape_b2b_end_bg"
         android:paddingBottom="4dp"
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
         android:paddingTop="4dp"
         android:text="@string/str_invalid"
-        android:textColor="@color/selector_cancel_text_color"
+        android:textColor="@color/b2b_btn_end"
         android:visibility="gone" />
 
 </RelativeLayout>

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

@@ -198,40 +198,28 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
-        android:background="@drawable/selector_cancel_bg"
+        android:background="@drawable/shape_b2b_quote_bg"
         android:paddingBottom="4dp"
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
         android:paddingTop="4dp"
         android:text="@string/str_offer_quotation"
-        android:textColor="@color/selector_cancel_text_color" />
+        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/selector_cancel_bg"
-        android:paddingBottom="4dp"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        android:paddingTop="4dp"
-        android:text="@string/str_expired"
-        android:textColor="@color/selector_cancel_text_color" />
-
-    <TextView
-        android:id="@+id/list_public_inquiry_quoted_price_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:background="@drawable/selector_cancel_bg"
+        android:background="@drawable/shape_b2b_todo_bg"
         android:paddingBottom="4dp"
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
         android:paddingTop="4dp"
         android:text="@string/str_quoted_price"
-        android:textColor="@color/selector_cancel_text_color" />
+        android:textColor="@color/b2b_btn_todo"
+        android:visibility="gone" />
 
 </RelativeLayout>

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

@@ -5,8 +5,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="12dp"
-    android:background="@drawable/selector_b2b_list_item_bg">
+    android:background="@drawable/selector_b2b_list_item_bg"
+    android:padding="12dp">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -47,8 +47,8 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:textSize="14sp"
-                android:text="@string/str_bill_num" />
+                android:text="@string/str_bill_num"
+                android:textSize="14sp" />
 
             <TextView
                 android:id="@+id/list_purchase_order_bill_num_tv"
@@ -72,33 +72,8 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:textSize="14sp"
-                android:text="@string/str_material_num" />
-
-            <TextView
-                android:id="@+id/list_purchase_order_material_num_tv"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="4dp"
-                android:layout_weight="3"
-                android:textColor="@color/black"
-                android:textSize="14sp"
-                tools:text="2018-01-21" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:textSize="14sp"
-                android:text="@string/str_money" />
+                android:text="@string/str_money"
+                android:textSize="14sp" />
 
             <TextView
                 android:id="@+id/list_purchase_order_money_tv"
@@ -119,14 +94,14 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
-        android:background="@drawable/selector_cancel_bg"
-        android:paddingTop="4dp"
+        android:background="@drawable/shape_b2b_todo_bg"
         android:paddingBottom="4dp"
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
+        android:paddingTop="4dp"
         android:text="@string/str_wait_for_reply"
-        android:visibility="gone"
-        android:textColor="@color/selector_cancel_text_color" />
+        android:textColor="@color/b2b_btn_todo"
+        android:visibility="gone" />
 
     <TextView
         android:id="@+id/list_purchase_order_have_replied_btn"
@@ -134,14 +109,14 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
-        android:background="@drawable/selector_cancel_bg"
-        android:paddingTop="4dp"
+        android:background="@drawable/shape_b2b_done_bg"
         android:paddingBottom="4dp"
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
+        android:paddingTop="4dp"
         android:text="@string/str_have_replied"
-        android:visibility="gone"
-        android:textColor="@color/selector_cancel_text_color" />
+        android:textColor="@color/b2b_btn_done"
+        android:visibility="gone" />
 
     <TextView
         android:id="@+id/list_purchase_order_case_closed_btn"
@@ -149,12 +124,12 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
-        android:background="@drawable/selector_cancel_bg"
-        android:paddingTop="4dp"
+        android:background="@drawable/shape_b2b_end_bg"
         android:paddingBottom="4dp"
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
+        android:paddingTop="4dp"
         android:text="@string/str_case_closed"
-        android:visibility="gone"
-        android:textColor="@color/selector_cancel_text_color" />
+        android:textColor="@color/b2b_btn_end"
+        android:visibility="gone" />
 </RelativeLayout>

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

@@ -90,4 +90,32 @@
     <string name="str_quote_price">报价</string>
     <string name="str_quotation_unadopted">报价未采纳</string>
     <string name="str_invalid">已失效</string>
+    <string name="str_unexpired">未过期</string>
+    <string name="delivery_period_can_not_be_empty">交货周期不能为空</string>
+    <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

@@ -89,4 +89,32 @@
     <string name="str_quote_price">报价</string>
     <string name="str_quotation_unadopted">报价未采纳</string>
     <string name="str_invalid">已失效</string>
+    <string name="str_unexpired">未过期</string>
+    <string name="delivery_period_can_not_be_empty">交货周期不能为空</string>
+    <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

@@ -89,4 +89,32 @@
     <string name="str_quote_price">报价</string>
     <string name="str_quotation_unadopted">报价未采纳</string>
     <string name="str_invalid">已失效</string>
+    <string name="str_unexpired">未过期</string>
+    <string name="delivery_period_can_not_be_empty">交货周期不能为空</string>
+    <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

@@ -121,6 +121,34 @@
     <string name="str_quote_price">报价</string>
     <string name="str_quotation_unadopted">报价未采纳</string>
     <string name="str_invalid">已失效</string>
+    <string name="str_unexpired">未过期</string>
+    <string name="delivery_period_can_not_be_empty">交货周期不能为空</string>
+    <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'
     ]