Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

WeiChat/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'com.getkeepsafe.dexcount'
 android {
     signingConfigs {
         config {
-            storeFile file('D:/config/applicationsignname[20150409]')
+            storeFile file('E:/CompanyProject/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

WeiChat/src/main/java/com/xzjmyk/pm/activity/ApplySubscribeActivity.java

@@ -165,7 +165,7 @@ public class ApplySubscribeActivity extends BaseActivity {
                             + "\",\n" +
                             "\"date_\":\"" + DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd")
                             + "\",\n" +
-                            "\"status_\":\"" +""
+                            "\"status_\":\"" +"在录入"
                             + "\",\n" +
                             "\"statuscode_\":\"" +"ENTERING"
                             + "\",\n" +

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessAddActivity.java

@@ -292,6 +292,7 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
     private String getEditText(FormEditText et) {
         String temp = "";
         temp = et.getText().toString().trim();
+        temp = CommonUtil.removeStringMark(temp);
         return temp;
     }
 
@@ -327,14 +328,14 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
         LogUtil.e("commonbcid", mBcId + "");
         String formStore =
                 "{\n" +
-                        "\"bc_id\":" + mBcId + ",\n" +
-                        "\"bc_code\":\"" + et_business_no.getText().toString() + "\",\n" +   //商机名称
-                        "\"bc_status\":\"" + "在录入" + "\",\n" +
-                        "\"bc_domancode\":\"" + enterCode + "\",\n" +
-                        "\"bc_statuscode\":\"" + "ENTERING" + "\",\n" +
-                        "\"bc_description\":\"" + name + "\",\n" +   //商机名称
-                        "\"bc_from\":\"" + from + "\",\n" +          //商机来源
-                        "\"bc_nichehouse\":\"" + bc_nichehouse + "\",\n" +      //商机库
+                        "\"bc_id\":" + mBcId + "," +
+                        "\"bc_code\":\"" + et_business_no.getText().toString() + "\"," +   //商机名称
+                        "\"bc_status\":\"" + "在录入" + "\"," +
+                        "\"bc_domancode\":\"" + enterCode + "\"," +
+                        "\"bc_statuscode\":\"" + "ENTERING" + "\"," +
+                        "\"bc_description\":\"" + name + "\"," +   //商机名称
+                        "\"bc_from\":\"" + from + "\"," +          //商机来源
+                        "\"bc_nichehouse\":\"" + bc_nichehouse + "\"," +      //商机库
                         "\"bc_currentprocess\":\"" + bc_currentprocess + "\",\n" +   //当前阶段
                         "\"bc_recorddate\":\"" + DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss") + "\",\n" +   //创建时间
                         "\"bc_recorder\":\"" + bc_recorder + "\",\n" +   //创建人

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/ClientActivity.java

@@ -696,8 +696,8 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                         } else {
                             if (receivables.getJSONArray(0).getString(2).equals(CommonUtil.getSharedPreferences(ct, "erp_username"))) {
                                 CommonUtil.textAarrySpanForStyle(tv_rank_income_left,
-                                        "第" + receivables.getJSONArray(0).getString(1) + "名"
-                                        , new String[]{receivables.getJSONArray(0).getString(1)},
+                                        "第" + receivables.getJSONArray(0).get(3).toString() + "名"
+                                        , new String[]{receivables.getJSONArray(0).get(3).toString()},
                                         ct.getResources().getColor(R.color.red));
 
                                 CommonUtil.textAarrySpanForStyle(tv_rank_income_right, receivables.getJSONArray(0).get(0) + "万元"
@@ -763,9 +763,9 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                         tv_em_a.setText(target.getString("CUSTOMERCOUNT"));
                         float[] ydata = {0, 0, 0, 0, 0, 0, 0};
                         ydata[0] = target.getIntValue("RANK");
-                        ydata[1] = target.getFloatValue("FIRSTBFCOUNT/10000");
+                        ydata[1] = target.getFloatValue("FIRSTBFCOUNT");
                         ydata[2] = target.getIntValue("TOPCOUNT");
-                        ydata[3] = target.getFloatValue("ACTUALPROFIT/10000");
+                        ydata[3] = target.getFloatValue("ACTUALPROFIT");
                         setData(7, ydata);
                     } else {
                         float[] ydata = {0, 0, 0, 0, 0, 0, 0};
@@ -780,8 +780,8 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                                 ll_data_three.setVisibility(View.GONE);
                                 tv_em_a.setText(root.getJSONArray("subs").getJSONObject(0).getString("CUSTOMERCOUNT"));
 
-                                tv_em_plana.setText(root.getJSONArray("subs").getJSONObject(0).getFloatValue("FIRSTBFCOUNT/10000")
-                                        + "/" + root.getJSONArray("subs").getJSONObject(0).getFloatValue("ACTUALPROFIT/10000"));
+                                tv_em_plana.setText(root.getJSONArray("subs").getJSONObject(0).getFloatValue("FIRSTBFCOUNT")
+                                        + "/" + root.getJSONArray("subs").getJSONObject(0).getFloatValue("ACTUALPROFIT"));
                                 tv_em_salea.setText(root.getJSONArray("subs").getJSONObject(0).getIntValue("RANK")
                                         + "/" + root.getJSONArray("subs").getJSONObject(0).getIntValue("TOPCOUNT"));
                                 break;
@@ -792,13 +792,13 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                                 tv_em_a.setText(root.getJSONArray("subs").getJSONObject(0).getString("CUSTOMERCOUNT"));
                                 tv_em_b.setText(root.getJSONArray("subs").getJSONObject(1).getString("CUSTOMERCOUNT"));
 
-                                tv_em_plana.setText(root.getJSONArray("subs").getJSONObject(0).getFloatValue("FIRSTBFCOUNT/10000")
-                                        + "/" + root.getJSONArray("subs").getJSONObject(0).getFloatValue("ACTUALPROFIT/10000"));
+                                tv_em_plana.setText(root.getJSONArray("subs").getJSONObject(0).getFloatValue("FIRSTBFCOUNT")
+                                        + "/" + root.getJSONArray("subs").getJSONObject(0).getFloatValue("ACTUALPROFIT"));
                                 tv_em_salea.setText(root.getJSONArray("subs").getJSONObject(0).getIntValue("RANK")
                                         + "/" + root.getJSONArray("subs").getJSONObject(0).getIntValue("TOPCOUNT"));
 
-                                tv_em_planb.setText(root.getJSONArray("subs").getJSONObject(1).getFloatValue("FIRSTBFCOUNT/10000")
-                                        + "/" + root.getJSONArray("subs").getJSONObject(1).getFloatValue("ACTUALPROFIT/10000"));
+                                tv_em_planb.setText(root.getJSONArray("subs").getJSONObject(1).getFloatValue("FIRSTBFCOUNT")
+                                        + "/" + root.getJSONArray("subs").getJSONObject(1).getFloatValue("ACTUALPROFIT"));
                                 tv_em_saleb.setText(root.getJSONArray("subs").getJSONObject(1).getIntValue("RANK")
                                         + "/" + root.getJSONArray("subs").getJSONObject(1).getIntValue("TOPCOUNT"));
 
@@ -812,18 +812,18 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                                 tv_em_c.setText(root.getJSONArray("subs").getJSONObject(2).getString("CUSTOMERCOUNT"));
 
 
-                                tv_em_plana.setText(root.getJSONArray("subs").getJSONObject(0).getFloatValue("FIRSTBFCOUNT/10000")
-                                        + "/" + root.getJSONArray("subs").getJSONObject(0).getFloatValue("ACTUALPROFIT/10000"));
+                                tv_em_plana.setText(root.getJSONArray("subs").getJSONObject(0).getFloatValue("FIRSTBFCOUNT")
+                                        + "/" + root.getJSONArray("subs").getJSONObject(0).getFloatValue("ACTUALPROFIT"));
                                 tv_em_salea.setText(root.getJSONArray("subs").getJSONObject(0).getIntValue("RANK")
                                         + "/" + root.getJSONArray("subs").getJSONObject(0).getIntValue("TOPCOUNT"));
 
-                                tv_em_planb.setText(root.getJSONArray("subs").getJSONObject(1).getFloatValue("FIRSTBFCOUNT/10000")
-                                        + "/" + root.getJSONArray("subs").getJSONObject(1).getFloatValue("ACTUALPROFIT/10000"));
+                                tv_em_planb.setText(root.getJSONArray("subs").getJSONObject(1).getFloatValue("FIRSTBFCOUNT")
+                                        + "/" + root.getJSONArray("subs").getJSONObject(1).getFloatValue("ACTUALPROFIT"));
                                 tv_em_saleb.setText(root.getJSONArray("subs").getJSONObject(1).getIntValue("RANK")
                                         + "/" + root.getJSONArray("subs").getJSONObject(1).getIntValue("TOPCOUNT"));
 
-                                tv_em_planc.setText(root.getJSONArray("subs").getJSONObject(2).getFloatValue("FIRSTBFCOUNT/10000")
-                                        + "/" + root.getJSONArray("subs").getJSONObject(2).getFloatValue("ACTUALPROFIT/10000"));
+                                tv_em_planc.setText(root.getJSONArray("subs").getJSONObject(2).getFloatValue("FIRSTBFCOUNT")
+                                        + "/" + root.getJSONArray("subs").getJSONObject(2).getFloatValue("ACTUALPROFIT"));
                                 tv_em_salec.setText(root.getJSONArray("subs").getJSONObject(2).getIntValue("RANK")
                                         + "/" + root.getJSONArray("subs").getJSONObject(2).getIntValue("TOPCOUNT"));
                                 break;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/CustomerAddActivity.java

@@ -201,26 +201,26 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                         " \"cu_id\":" + mCuId + ",\n" +
                         " \"cu_arcode\":" +"\"\""+ ",\n" +
                         " \"cu_arname\":" + "\"\""+ ",\n" +
-                        " \"cu_code\":\"" + et_cu_code.getText().toString() + "\",\n" +
-                        " \"cu_name\":\"" + et_cu_name.getText().toString() + "\",\n" +
-                        " \"cu_shortname\":\"" + et_cu_shortname.getText().toString() + "\",\n" +
-                        " \"cu_add1\":\"" + tv_cu_address.getText().toString() + "\",\n" +
-                        " \"cu_kind\":\"" + et_cu_kind.getText().toString() + "\",\n" +
-                        " \"cu_district\":\"" + et_cu_district.getText().toString() + "\",\n" +
+                        " \"cu_code\":\"" + CommonUtil.getNoMarkEditText(et_cu_code) + "\",\n" +
+                        " \"cu_name\":\"" + CommonUtil.getNoMarkEditText(et_cu_name) + "\",\n" +
+                        " \"cu_shortname\":\"" + CommonUtil.getNoMarkEditText(et_cu_shortname) + "\",\n" +
+                        " \"cu_add1\":\"" + CommonUtil.getNoMarkEditText(tv_cu_address) + "\",\n" +
+                        " \"cu_kind\":\"" + CommonUtil.getNoMarkEditText(et_cu_kind) + "\",\n" +
+                        " \"cu_district\":\"" + CommonUtil.getNoMarkEditText(et_cu_district) + "\",\n" +
                         " \"cu_auditstatus\":\"" +"在录入" + "\",\n" +
                         " \"cu_auditstatuscode\":\"" + "ENTERING" + "\",\n" +
                         " \"cu_sellercode\":\"" + et_cu_sellercode+ "\",\n" +
                         " \"cu_payments\":\"" +URLEncoder.encode(et_cu_payments.getText().toString()) + "\",\n" +
-                        " \"cu_sellername\":\"" + et_cu_sellername.getText().toString() + "\",\n" +
-                        " \"cu_contact\":\"" + tv_cu_contact.getText().toString() + "\",\n" +
-                        " \"cu_degree\":\"" + tv_cu_degree.getText().toString() + "\",\n" +
-                        " \"cu_mobile\":\"" + tv_cu_mobile.getText().toString() + "\",\n" +
-                        " \"cu_email\":\"" + tv_cu_email.getText().toString() + "\",\n" +
-                        " \"cu_businesscode\":\"" + tv_cu_businesscode.getText().toString() + "\",\n" +
-                        " \"cu_currency\":\"" + tv_cu_currency.getText().toString() + "\",\n" +
-                        " \"cu_taxrate\":\"" + tv_cu_taxrate.getText().toString() + "\",\n" +
-                        " \"cu_nichestep\":\"" + tv_cu_nichestep.getText().toString() + "\",\n" +
-                        " \"cu_remark\":\"" + tv_cu_remark.getText().toString() + "\"\n" +
+                        " \"cu_sellername\":\"" + CommonUtil.getNoMarkEditText(et_cu_sellername) + "\",\n" +
+                        " \"cu_contact\":\"" + CommonUtil.getNoMarkEditText(tv_cu_contact) + "\",\n" +
+                        " \"cu_degree\":\"" + CommonUtil.getNoMarkEditText(tv_cu_degree) + "\",\n" +
+                        " \"cu_mobile\":\"" + CommonUtil.getNoMarkEditText(tv_cu_mobile) + "\",\n" +
+                        " \"cu_email\":\"" + CommonUtil.getNoMarkEditText(tv_cu_email) + "\",\n" +
+                        " \"cu_businesscode\":\"" + CommonUtil.getNoMarkEditText(tv_cu_businesscode) + "\",\n" +
+                        " \"cu_currency\":\"" + CommonUtil.getNoMarkEditText(tv_cu_currency) + "\",\n" +
+                        " \"cu_taxrate\":\"" + CommonUtil.getNoMarkEditText(tv_cu_taxrate) + "\",\n" +
+                        " \"cu_nichestep\":\"" + CommonUtil.getNoMarkEditText(tv_cu_nichestep) + "\",\n" +
+                        " \"cu_remark\":\"" + CommonUtil.getNoMarkEditText(tv_cu_remark) + "\"\n" +
                         "}";
             } else {
                 return;
@@ -235,19 +235,19 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                    ) {
                 formStore = "{\n" +
                         " \"cu_id\":" + mCuId + ",\n" +
-                        " \"cu_code\":\"" + et_cu_code.getText().toString() + "\",\n" +
-                        " \"cu_name\":\"" + et_cu_name.getText().toString() + "\",\n" +
-                        " \"cu_shortname\":\"" + et_cu_shortname.getText().toString() + "\",\n" +
-                        " \"cu_add1\":\"" + tv_cu_address.getText().toString() + "\",\n" +
-                        " \"cu_kind\":\"" + et_cu_kind.getText().toString() + "\",\n" +
-                        " \"cu_district\":\"" + et_cu_district.getText().toString() + "\",\n" +
+                        " \"cu_code\":\"" + CommonUtil.getNoMarkEditText(et_cu_code) + "\",\n" +
+                        " \"cu_name\":\"" + CommonUtil.getNoMarkEditText(et_cu_name) + "\",\n" +
+                        " \"cu_shortname\":\"" + CommonUtil.getNoMarkEditText(et_cu_shortname) + "\",\n" +
+                        " \"cu_add1\":\"" + CommonUtil.getNoMarkEditText(tv_cu_address) + "\",\n" +
+                        " \"cu_kind\":\"" + CommonUtil.getNoMarkEditText(et_cu_kind) + "\",\n" +
+                        " \"cu_district\":\"" + CommonUtil.getNoMarkEditText(et_cu_district) + "\",\n" +
                         " \"cu_payments\":\"" + URLEncoder.encode(et_cu_payments.getText().toString()) + "\",\n" +
-                        " \"cu_sellername\":\"" + et_cu_sellername.getText().toString() + "\",\n" +
-                        " \"cu_contact\":\"" + tv_cu_contact.getText().toString() + "\",\n" +
-                        " \"cu_degree\":\"" + tv_cu_degree.getText().toString() + "\",\n" +
-                        " \"cu_mobile\":\"" + tv_cu_mobile.getText().toString() + "\",\n" +
-                        " \"cu_email\":\"" + tv_cu_email.getText().toString() + "\",\n" +
-                        " \"cu_remark\":\"" + tv_cu_remark.getText().toString() + "\"\n" +
+                        " \"cu_sellername\":\"" + CommonUtil.getNoMarkEditText(et_cu_sellername) + "\",\n" +
+                        " \"cu_contact\":\"" + CommonUtil.getNoMarkEditText(tv_cu_contact) + "\",\n" +
+                        " \"cu_degree\":\"" + CommonUtil.getNoMarkEditText(tv_cu_degree) + "\",\n" +
+                        " \"cu_mobile\":\"" + CommonUtil.getNoMarkEditText(tv_cu_mobile) + "\",\n" +
+                        " \"cu_email\":\"" + CommonUtil.getNoMarkEditText(tv_cu_email) + "\",\n" +
+                        " \"cu_remark\":\"" + CommonUtil.getNoMarkEditText(tv_cu_remark) + "\"\n" +
                         "}";
             } else {
                 return;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/CustomerListActivity.java

@@ -152,6 +152,7 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
         em_code = CommonUtil.getSharedPreferences(ct, "erp_username");
         sendHttpResquest(Constants.HTTP_SUCCESS_INIT, kind, page, 0, "");
         DBManager dbManager = new DBManager(ct);
+        //查询数据库失败---------------
         List<EmployeesEntity> db = dbManager.select_getEmployee(
                 new String[]{CommonUtil.getSharedPreferences(ct, "erp_master"),
                         CommonUtil.getSharedPreferences(ct, "erp_username")}
@@ -327,6 +328,7 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
                             isSelected = 0;
                             page = 1;
                             kind = 0;
+                            tv_name.setText(MyApplication.getInstance().mLoginUser.getNickName());
                             sendHttpResquest(Constants.HTTP_SUCCESS_INIT, kind, page, isSelected, "");
                             popupWindow.dismiss();
                             break;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/VisitReportAddActivity.java

@@ -65,6 +65,8 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
     private FormEditText tv_visit_steps;
     @ViewInject(R.id.tv_visit_content)
     private FormEditText tv_visit_content;
+    @ViewInject(R.id.tv_relate_business)
+    private FormEditText tv_relate_business;
     private int vp_id = -1;
     private int type = -1;
 
@@ -235,22 +237,22 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                             + tv_date_start.getText().toString() + //开始时间
                             "\",\n" +
                             "\"vr_visitplace\":\"" +
-                            tv_address_login.getText().toString() +
+                            CommonUtil.getNoMarkEditText(tv_address_login) +
                             "\",\n" +
                             "\"vr_cuname\":\"" +
-                            tv_customer_login.getText().toString() +
+                            CommonUtil.getNoMarkEditText(tv_customer_login) +
                             "\",\n" +
                             "\"vr_cucontact\":\"" +
-                            tv_linksman_login.getText().toString() +
+                            CommonUtil.getNoMarkEditText(tv_linksman_login)+
                             "\",\n" +
                             "\"vr_title\":\"" +
-                            tv_visit_theme.getText().toString() +//主题
+                            CommonUtil.getNoMarkEditText(tv_visit_theme) +//主题
                             "\",\n" +
                             "\"vr_nichestep\":\"" +
-                            tv_visit_steps.getText().toString() +
+                            CommonUtil.getNoMarkEditText(tv_visit_steps)+
                             "\",\n" +
                             "\"vr_detail\":\"" +
-                            tv_visit_content.getText().toString() +
+                            CommonUtil.getNoMarkEditText(tv_visit_content)+
                             "\",\n" +
                             "\"vr_recorddate\":\"" +
                             DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd") +
@@ -381,6 +383,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
         //cu_code客户编号
         param.put("cu_nichestep", tv_visit_steps.getText().toString());
         param.put("cu_code", vp_code);
+        param.put("bc_nichecode", tv_relate_business.getText().toString());
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(this, "sessionId"));
         com.xzjmyk.pm.activity.ui.erp.net.ViewUtil.httpSendRequest(this, url, param, mHandler, headers, 0x16, null, null, "post");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/VisitReportPlanActivity.java

@@ -215,19 +215,19 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
                     tv_date_end.getText().toString() +
                     "\",\n" +
                     "\"vp_remark\":\"" +
-                    tv_visit_theme.getText().toString() +
+                    CommonUtil.getNoMarkEditText(tv_visit_theme) +
                     "\",\n" +
                     "\"vp_custcode\":\"" +//客户编号
                     vp_code +
                     "\",\n" +
                     "\"vp_custname\":\"" +//客户名称
-                    tv_customer_login.getText().toString() +
+                    CommonUtil.getNoMarkEditText(tv_customer_login) +
                     "\",\n" +
                     "\"vp_address\":\"" +
-                    tv_address_login.getText().toString() +
+                    CommonUtil.getNoMarkEditText(tv_address_login) +
                     "\",\n" +
                     "\"vp_contact\":\"" +
-                    tv_linksman_login.getText().toString() +
+                    CommonUtil.getNoMarkEditText(tv_linksman_login) +
                     "\",\n" +
                     "\"vp_visitman\":\"" +
                     MyApplication.getInstance().mLoginUser.getNickName() +

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/CommonUtil.java

@@ -32,6 +32,7 @@ import android.util.Log;
 import android.util.Patterns;
 import android.widget.TextView;
 
+import com.andreabaccega.widget.FormEditText;
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.assist.ImageScaleType;
 import com.xzjmyk.pm.activity.bean.Friend;
@@ -756,4 +757,32 @@ public class CommonUtil {
         }
         return false;
     }
+
+    /**
+     * 去除字符串中的换行符，空格
+     * @param s
+     * @return
+     */
+    public static String removeStringMark(String s){
+        String result = "";
+        if (!TextUtils.isEmpty(s)){
+            Pattern pattern = Pattern.compile("\\s*|\t|\r|\n");
+//            Pattern pattern = Pattern.compile("\r|\n");
+            Matcher matcher = pattern.matcher(s);
+            result = matcher.replaceAll("");
+        }
+        return result;
+    }
+
+    /**
+     * 返回输入框内去除换行符和空格之后的字符串
+     * @param et
+     * @return
+     */
+    public static String getNoMarkEditText(FormEditText et){
+        String temp = "";
+        temp = et.getText().toString().trim();
+        temp = removeStringMark(temp);
+        return temp;
+    }
 }

WeiChat/src/main/res/layout/activity_customter_add.xml

@@ -275,7 +275,7 @@
                 style="@style/form_relative_right_text"
                 android:hint="请输入"
                 whatever:testType="regexp"
-                whatever:customRegexp="^[\u4e00-\u9fa5_a-zA-Z0-9_]{0,100}$"
+                whatever:customRegexp="^[\u4e00-\u9fa5_a-zA-Z0-9_\n]{0,100}$"
                 whatever:testErrorString="限定字符长度不大于100" />
         </RelativeLayout>
 
@@ -303,7 +303,7 @@
                 style="@style/form_relative_right_text"
                 android:hint="请输入"
                 whatever:testType="regexp"
-                whatever:customRegexp="^[\u4e00-\u9fa5_a-zA-Z0-9_]{0,100}$"
+                whatever:customRegexp="^[\u4e00-\u9fa5_a-zA-Z0-9_\n]{0,100}$"
                 whatever:testErrorString="限定字符长度不大于100"/>
         </RelativeLayout>
 

WeiChat/src/main/res/layout/activity_visit_report_add.xml

@@ -263,6 +263,39 @@
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
+        <RelativeLayout
+            style="@style/form_relative_customer"
+            android:background="@color/white">
+
+            <TextView
+                android:id="@+id/tv_id9"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="20dp"
+                android:drawablePadding="10dp"
+                android:gravity="center"
+                android:text="关联商机"
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_main" />
+
+            <TextView
+                style="@style/form_relative_left_text"
+                android:layout_marginLeft="20dp"
+                android:layout_toRightOf="@+id/tv_id9"
+                android:text="*"
+                android:textColor="@color/red" />
+
+            <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                android:id="@+id/tv_relate_business"
+                style="@style/form_relative_right_text"
+                android:drawableRight="@drawable/nav_icon_search_default"
+                android:focusable="false"
+                android:focusableInTouchMode="false"
+                android:hint="请选择"
+                editTextFormExample:testType="nocheck" />
+        </RelativeLayout>
+
         <RelativeLayout
             style="@style/form_relative_customer"
             android:background="@color/white">