提交分类： 打包版本；

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

WeiChat/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="com.xzjmyk.pm.activity"
           xmlns:android="http://schemas.android.com/apk/res/android"
-          android:versionCode="147"
-          android:versionName="6.0.9">
+          android:versionCode="158"
+          android:versionName="6.1.9">
 
     <uses-sdk
         android:minSdkVersion="11"

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Feb 26 11:09:37 CST 2018
-debugName=253
-versionName=620
-debugCode=253
-versionCode=159
+#Mon Feb 26 17:52:29 CST 2018
+debugName=267
+versionName=619
+debugCode=267
+versionCode=158

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

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

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

@@ -266,23 +266,39 @@ 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, 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_customer), customer, "", "客户", "", 0, null));
+            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_customer_address), customerAddress, "", "客户地址", "", 0, null));
+            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_customer_phone), userTel, "", "联系电话", "", 0, null));
+            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_bill_num), billNum, "", "单据", "", 0, null));
+            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_material), material, "", "物料", "", 0, null));
+
+            if (!(Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO.equals(mState)
+                    || Constants.FLAG.STATE_PUBLIC_INQUIRY_DONE.equals(mState))) {
+                mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_currency), currency, "", "币别", "", 0, null));
+                mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_taxrate), taxrate, "", "税率", "", 0, null));
+            }
             if (!TextUtils.isEmpty(environment)) {
-                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_environment), environment, "", "环保要求", "", 0, null));
             }
             if (!(Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO.equals(mState)
                     || Constants.FLAG.STATE_PUBLIC_INQUIRY_DONE.equals(mState))) {
-                mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_price_type), priceType, "", "价格类型", ""));
+                mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_price_type), priceType, "", "价格类型", "", 0, null));
+            }
+
+            if (Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO.equals(mState)
+                    || Constants.FLAG.STATE_PUBLIC_INQUIRY_DONE.equals(mState)) {
+                List<String> options = new ArrayList<>();
+                options.add("RMB");
+                options.add("USD");
+                options.add("HKD");
+                options.add("JPY");
+                options.add("EUR");
+                mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_OPTION, getString(R.string.customer_inquiry_currency), currency, "", "currency", "", 0, options));
+                mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_EDIT, getString(R.string.customer_inquiry_taxrate), taxrate, "%", "taxrate", "", B2BDetailListBean.EDIT_TYPE_DECIMAL, null));
             }
-            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", ""));
+            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_EDIT, getString(R.string.customer_inquiry_leadtime), leadtime, "天", "leadtime", "", B2BDetailListBean.EDIT_TYPE_NUMBER, null));
+            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_EDIT, getString(R.string.customer_inquiry_min_order), minOrderQty, "PCS", "minOrderQty", "", B2BDetailListBean.EDIT_TYPE_NUMBER, null));
+            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_EDIT, getString(R.string.customer_inquiry_min_pack), minPackQty, "PCS", "minPackQty", "", B2BDetailListBean.EDIT_TYPE_NUMBER, null));
 
             mB2BDetailListAdapter.notifyDataSetChanged();
 
@@ -308,7 +324,9 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
                                                       String value,
                                                       String unit,
                                                       String flag,
-                                                      String type) {
+                                                      String type,
+                                                      int editType,
+                                                      List<String> options) {
         B2BDetailListBean b2BDetailListBean = new B2BDetailListBean();
 
         b2BDetailListBean.setItemType(itemType);
@@ -317,6 +335,8 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
         b2BDetailListBean.setValue(value);
         b2BDetailListBean.setType(type);
         b2BDetailListBean.setUnit(unit);
+        b2BDetailListBean.setEditType(editType);
+        b2BDetailListBean.setOptions(options);
 
         return b2BDetailListBean;
     }
@@ -351,7 +371,7 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
             List<B2BQuotePriceBean> b2BQuotePriceBeans = mB2BQuotePriceAdapter.getB2BQuotePriceBeans();
             List<B2BDetailListBean> b2BDetailListBeans = mB2BDetailListAdapter.getB2BDetailListBeans();
 
-            String leadtime = "", minPackQty = "", minOrderQty = "";
+            String leadtime = "", minPackQty = "", minOrderQty = "", currency = "", taxrate = "";
             for (B2BDetailListBean b2BDetailListBean : b2BDetailListBeans) {
                 String flag = b2BDetailListBean.getFlag();
                 if ("leadtime".equals(flag)) {
@@ -366,6 +386,12 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
                 if ("minOrderQty".equals(flag)) {
                     minOrderQty = b2BDetailListBean.getValue();
                 }
+                if ("currency".equals(flag)) {
+                    currency = b2BDetailListBean.getValue();
+                }
+                if ("taxrate".equals(flag)) {
+                    taxrate = b2BDetailListBean.getValue();
+                }
             }
             List<Reply> replies = new ArrayList<>();
             for (int j = 0; j < b2BQuotePriceBeans.size(); j++) {
@@ -410,6 +436,12 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
             params.put("leadtime", leadtime);
             params.put("minPackQty", minPackQty);
             params.put("minOrderQty", minOrderQty);
+            params.put("currency", currency);
+            try {
+                params.put("taxrate", Float.parseFloat(taxrate));
+            } catch (Exception e) {
+
+            }
 
             params.put("useruu", CommonUtil.getSharedPreferences(mContext, "b2b_uu"));
 

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

@@ -147,11 +147,13 @@ public class PublicInquiryDetailActivity extends BaseMVPActivity<WorkPlatPresent
         JSONObject inquiryObject = contentObject.getJSONObject("inquiry");
         JSONObject productObject = contentObject.getJSONObject("product");
 
-        String inquiryId = "", inquiryCompany = "", phone = "", contact = "", enddate = "", attachs = "", model = "", brand = "", spec = "", material = "", unit = "", amount = "";
+        String inquiryId = "", inquiryCompany = "", phone = "", contact = "", enddate = "", attachs = "", model = "", brand = "", spec = "", material = "", unit = "", amount = "", currency = "", taxrate = "";
 
         amount = JSONUtil.getText(contentObject, "needquantity");
         contact = JSONUtil.getText(contentObject, "userName");
         phone = JSONUtil.getText(contentObject, "userTel");
+        currency = JSONUtil.getText(contentObject, "currency");
+        taxrate = JSONUtil.getText(contentObject, "taxrate");
         if (productObject != null) {
             model = JSONUtil.getText(productObject, "cmpCode");
             brand = JSONUtil.getText(productObject, "brand");
@@ -205,7 +207,9 @@ public class PublicInquiryDetailActivity extends BaseMVPActivity<WorkPlatPresent
         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, "", "附件", ""));
+        if (!TextUtils.isEmpty(attachs)) {
+            mInquiryListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.public_inquiry_attachs), attachs, "", "附件", ""));
+        }
 
         mInquiryListAdapter.notifyDataSetChanged();
 
@@ -214,7 +218,13 @@ public class PublicInquiryDetailActivity extends BaseMVPActivity<WorkPlatPresent
         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, "", "数量", ""));
+        if (!TextUtils.isEmpty(amount)) {
+            mMaterialListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.public_inquiry_amount), amount, "", "数量", ""));
+        }
+        mMaterialListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.customer_inquiry_currency), currency, "", "币别", ""));
+        if (!TextUtils.isEmpty(taxrate)) {
+            mMaterialListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.customer_inquiry_taxrate), taxrate, "", "税率", ""));
+        }
 
         mMaterialListAdapter.notifyDataSetChanged();
 

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

@@ -3,6 +3,7 @@ package com.uas.appworks.adapter;
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
 import android.text.Editable;
+import android.text.InputType;
 import android.text.TextWatcher;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -10,6 +11,7 @@ import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.TextView;
 
+import com.afollestad.materialdialogs.MaterialDialog;
 import com.uas.appworks.R;
 import com.uas.appworks.model.bean.B2BDetailListBean;
 
@@ -60,6 +62,9 @@ public class B2BDetailListAdapter extends RecyclerView.Adapter<RecyclerView.View
             case B2BDetailListBean.TYPE_DETAIL_EDIT:
                 itemView = mLayoutInflater.inflate(R.layout.layout_list_b2b_detail_edit, parent, false);
                 return new DetailEditViewHolder(itemView);
+            case B2BDetailListBean.TYPE_DETAIL_OPTION:
+                itemView = mLayoutInflater.inflate(R.layout.layout_list_b2b_detail_option, parent, false);
+                return new DetailOptionViewHolder(itemView);
             default:
                 return null;
         }
@@ -77,6 +82,8 @@ public class B2BDetailListAdapter extends RecyclerView.Adapter<RecyclerView.View
             bindDetailWhiteTextViewHolder((DetailWhiteTextViewHolder) holder, b2BDetailListBean);
         } else if (holder instanceof DetailEditViewHolder) {
             bindDetailEditViewHolder((DetailEditViewHolder) holder, b2BDetailListBean);
+        } else if (holder instanceof DetailOptionViewHolder) {
+            bindDetailOptionViewHolder((DetailOptionViewHolder) holder, b2BDetailListBean);
         }
     }
 
@@ -95,6 +102,15 @@ public class B2BDetailListAdapter extends RecyclerView.Adapter<RecyclerView.View
 
             holder.valueEditText.setText(b2BDetailListBean.getValue());
 
+            int editType = b2BDetailListBean.getEditType();
+            if (editType == B2BDetailListBean.EDIT_TYPE_TEXT) {
+                holder.valueEditText.setInputType(InputType.TYPE_CLASS_TEXT);
+            } else if (editType == B2BDetailListBean.EDIT_TYPE_DECIMAL) {
+                holder.valueEditText.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL);
+            } else if (editType == B2BDetailListBean.EDIT_TYPE_NUMBER) {
+                holder.valueEditText.setInputType(InputType.TYPE_CLASS_NUMBER);
+            }
+
             holder.valueEditText.addTextChangedListener(new TextWatcher() {
                 @Override
                 public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
@@ -125,6 +141,40 @@ public class B2BDetailListAdapter extends RecyclerView.Adapter<RecyclerView.View
         holder.valueTextView.setText(b2BDetailListBean.getValue());
     }
 
+    private void bindDetailOptionViewHolder(final DetailOptionViewHolder holder, final B2BDetailListBean b2BDetailListBean) {
+
+        holder.captionTextView.setText(b2BDetailListBean.getCaption() + ":");
+        holder.valueTextView.setText(b2BDetailListBean.getValue());
+
+        final List<String> options = b2BDetailListBean.getOptions();
+        holder.valueTextView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                String value = b2BDetailListBean.getValue();
+                int selectIndex = 0;
+                for (int i = 0; i < options.size(); i++) {
+                    if (value != null && value.equals(options.get(i))) {
+                        selectIndex = i;
+                        break;
+                    }
+                }
+
+                new MaterialDialog.Builder(mContext)
+                        .title(R.string.please_select_currency)
+                        .items(options)
+                        .itemsCallbackSingleChoice(selectIndex, new MaterialDialog.ListCallbackSingleChoice() {
+                            @Override
+                            public boolean onSelection(MaterialDialog materialDialog, View view, int which, CharSequence charSequence) {
+                                String option = options.get(which);
+                                holder.valueTextView.setText(option);
+                                b2BDetailListBean.setValue(option);
+                                return true;
+                            }
+                        }).positiveText(mContext.getString(com.core.app.R.string.common_sure)).build().show();
+            }
+        });
+    }
+
     @Override
     public int getItemCount() {
         return mB2BDetailListBeans == null ? 0 : mB2BDetailListBeans.size();
@@ -168,4 +218,14 @@ public class B2BDetailListAdapter extends RecyclerView.Adapter<RecyclerView.View
             valueTextView = (TextView) itemView.findViewById(R.id.list_b2b_detail_edit_value_tv);
         }
     }
+
+    class DetailOptionViewHolder extends RecyclerView.ViewHolder {
+        private TextView captionTextView, valueTextView;
+
+        public DetailOptionViewHolder(View itemView) {
+            super(itemView);
+            captionTextView = (TextView) itemView.findViewById(R.id.list_b2b_detail_option_caption_tv);
+            valueTextView = (TextView) itemView.findViewById(R.id.list_b2b_detail_option_value_tv);
+        }
+    }
 }

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

@@ -1,5 +1,7 @@
 package com.uas.appworks.model.bean;
 
+import java.util.List;
+
 /**
  * @author RaoMeng
  * @describe
@@ -10,6 +12,11 @@ public class B2BDetailListBean {
     public final static int TYPE_DETAIL_TEXT = 11;
     public final static int TYPE_DETAIL_TEXT_WHITE = 12;
     public final static int TYPE_DETAIL_EDIT = 13;
+    public final static int TYPE_DETAIL_OPTION = 14;
+
+    public final static int EDIT_TYPE_DECIMAL = 21;
+    public final static int EDIT_TYPE_NUMBER = 22;
+    public final static int EDIT_TYPE_TEXT = 23;
 
     private int mItemType = TYPE_DETAIL_TEXT;
     private String mCaption;
@@ -17,6 +24,8 @@ public class B2BDetailListBean {
     private String mUnit;
     private String mFlag;
     private String mType;
+    private int mEditType = EDIT_TYPE_TEXT;
+    private List<String> mOptions;
 
     public String getCaption() {
         return mCaption;
@@ -65,4 +74,20 @@ public class B2BDetailListBean {
     public void setType(String type) {
         mType = type;
     }
+
+    public int getEditType() {
+        return mEditType;
+    }
+
+    public void setEditType(int editType) {
+        mEditType = editType;
+    }
+
+    public List<String> getOptions() {
+        return mOptions;
+    }
+
+    public void setOptions(List<String> options) {
+        mOptions = options;
+    }
 }

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

@@ -32,7 +32,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@drawable/shape_b2b_detail_edittext"
-            android:gravity="right|center_vertical"
+            android:gravity="center_vertical"
             android:hint="@string/common_input2"
             android:inputType="number"
             android:paddingLeft="10dp"
@@ -45,7 +45,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@drawable/shape_b2b_detail_edittext"
-            android:gravity="right|center_vertical"
+            android:gravity="center_vertical"
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
             android:textSize="14sp"

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

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="46dp"
+    android:background="@color/white"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:paddingBottom="6dp"
+    android:paddingLeft="12dp"
+    android:paddingTop="6dp">
+
+    <TextView
+        android:id="@+id/list_b2b_detail_option_caption_tv"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="交货周期："
+        android:textColor="@color/black"
+        tools:textSize="14sp" />
+
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="2">
+
+        <TextView
+            android:id="@+id/list_b2b_detail_option_value_tv"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/shape_b2b_detail_edittext"
+            android:gravity="center_vertical"
+            android:hint="请选择"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
+            android:textSize="14sp" />
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="10dp"
+            android:src="@drawable/icon_more_down" />
+    </RelativeLayout>
+
+    <TextView
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="6dp"
+        android:layout_weight="1"
+        android:gravity="left|center_vertical"
+        android:textSize="14sp" />
+</LinearLayout>

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

@@ -131,4 +131,5 @@
     <string name="customer_inquiry_search_hint">单据编号/客户名称/物料名称</string>
     <string name="public_inquiry_search_hint">单据编号/客户名称/物料名称</string>
     <string name="register_unsuccessed_sure_to_exit">注册未完成，确定退出？</string>
+    <string name="please_select_currency">请选择币别</string>
 </resources>

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

@@ -130,4 +130,5 @@
     <string name="customer_inquiry_search_hint">单据编号/客户名称/物料名称</string>
     <string name="public_inquiry_search_hint">单据编号/客户名称/物料名称</string>
     <string name="register_unsuccessed_sure_to_exit">注册未完成，确定退出？</string>
+    <string name="please_select_currency">请选择币别</string>
 </resources>

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

@@ -130,4 +130,5 @@
     <string name="customer_inquiry_search_hint">单据编号/客户名称/物料名称</string>
     <string name="public_inquiry_search_hint">单据编号/客户名称/物料名称</string>
     <string name="register_unsuccessed_sure_to_exit">注册未完成，确定退出？</string>
+    <string name="please_select_currency">请选择币别</string>
 </resources>

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

@@ -162,6 +162,7 @@
     <string name="customer_inquiry_search_hint">单据编号/客户名称/物料名称</string>
     <string name="public_inquiry_search_hint">单据编号/客户名称/物料名称</string>
     <string name="register_unsuccessed_sure_to_exit">注册未完成，确定退出？</string>
+    <string name="please_select_currency">请选择币别</string>
 
 
 </resources>

version.gradle

@@ -11,8 +11,8 @@ ext {
             minSdkVersion    : 14,
             targetSdkVersion : 26,
             javaVersion      : JavaVersion.VERSION_1_8,
-            versionCode      : 150,
-            versionName      : '6.1.0',
+            versionCode      : 158,
+            versionName      : '6.1.9',
     ]
 
     depsVersion = [