测试版本5.2.7 9-13

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

@@ -165,7 +165,7 @@ public class BusinessDetailActivty extends BaseActivity {
             ll_top_state.setVisibility(View.GONE);
             sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page);
         } else if (type == 3) {
-            getSupportActionBar().setTitle("商机");
+            getSupportActionBar().setTitle(business_steps);
             ll_top_state.setVisibility(View.GONE);
             isAdminer(12);
         }else{
@@ -281,6 +281,7 @@ public class BusinessDetailActivty extends BaseActivity {
                         searchResults.values = mData;
                         searchResults.count = mData.size();
                     } else {
+                        mdata=mData;
                         ArrayList<String> searchKey = new ArrayList<String>();
                         ArrayList<Business> newBusiness = new ArrayList<>();
                         for (Business business : mdata) {
@@ -311,9 +312,7 @@ public class BusinessDetailActivty extends BaseActivity {
                 protected void publishResults(CharSequence constraint, FilterResults results) {
                     //装配数据
                     mdata = (ArrayList<Business>) results.values;
-                    if (mAdapter.getCount() == 0) {
-
-                    }
+                    if (mAdapter.getCount() == 0) {}
                     notifyDataSetChanged();
                 }
             };

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

@@ -5,6 +5,8 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.support.v7.widget.PopupMenu;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -23,6 +25,7 @@ import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
 
 import org.json.JSONException;
@@ -117,6 +120,25 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
         et_cu_payments.setKeyListener(null);
         tv_cu_currency.setKeyListener(null);
         et_cu_sellername.setKeyListener(null);
+        
+        tv_cu_remark.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                 if (!StringUtils.isEmpty(s.toString())){
+                     tv_cu_remark.testValidity();
+                 }
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+
+            }
+        });
     }
 
     private void initData() {
@@ -131,7 +153,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
             type = intent.getIntExtra("type", 0);
             if (type == 1) {
                 ll_infomal.setVisibility(View.VISIBLE);
-                getSupportActionBar().setTitle("客户录入");
+                getSupportActionBar().setTitle("正式客户");
                 CommonUtil.getCommonId(this,"PRECUSTOMER_SEQ",mHandler,GET_CU_ID);
             } else {
                 ll_infomal.setVisibility(View.GONE);
@@ -164,6 +186,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
     private void saveData() {
         String formStore = "";
         Log.i("commoncuid",mCuId+"");
+       
         if (type == 1) {
             if (et_cu_code.testValidity() && et_cu_name.testValidity()
                     && tv_cu_address.testValidity() && et_cu_kind.testValidity()
@@ -172,7 +195,8 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                     && tv_cu_contact.testValidity() && tv_cu_degree.testValidity()
                     && tv_cu_mobile.testValidity() && tv_cu_email.testValidity()
                     && tv_cu_businesscode.testValidity() && tv_cu_currency.testValidity()
-                    && tv_cu_taxrate.testValidity() && tv_cu_nichestep.testValidity()) {
+                    && tv_cu_taxrate.testValidity() && tv_cu_nichestep.testValidity()
+                   ) {
                 formStore = "{\n" +
                         " \"cu_id\":" + mCuId + ",\n" +
                         " \"cu_arcode\":" +"\"\""+ ",\n" +
@@ -207,7 +231,8 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                     && et_cu_district.testValidity() && et_cu_kind.testValidity()
                     && et_cu_payments.testValidity() && et_cu_sellername.testValidity()
                     && tv_cu_contact.testValidity() && tv_cu_degree.testValidity()
-                    && tv_cu_mobile.testValidity() && tv_cu_email.testValidity()) {
+                    && tv_cu_mobile.testValidity() && tv_cu_email.testValidity()
+                   ) {
                 formStore = "{\n" +
                         " \"cu_id\":" + mCuId + ",\n" +
                         " \"cu_code\":\"" + et_cu_code.getText().toString() + "\",\n" +
@@ -268,7 +293,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                     if (falg == 0) {
                         ll_infomal.setVisibility(View.VISIBLE);
                         type=1;//正式客户
-                        getSupportActionBar().setTitle("客户录入");
+                        getSupportActionBar().setTitle("正式客户");
                         CommonUtil.getCommonId(ct, "PRECUSTOMER_SEQ", mHandler, GET_CU_ID);
                     } else {
                         ll_infomal.setVisibility(View.GONE);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorksFragment.java

@@ -111,7 +111,7 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
             case R.id.setting_rl:
                 String phone = CommonUtil.getSharedPreferences(getActivity(), "user_phone");
                 String password = CommonUtil.getSharedPreferences(getActivity(), "user_password");
-                String url = "http://www.ubtob.com/signin#/redirect/" + phone + "/" + password;
+                String url = "http://www.ubtob.com/signin#/redirect/" + phone + "/" + password+"?client_type=im";
                 ViewUtil.webLinks(ct, url, "我的商务");
                 break;
             case R.id.rl_uas_sys:

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

@@ -266,6 +266,7 @@
             </RelativeLayout>
             <LinearLayout
                 android:layout_marginTop="20dp"
+                android:layout_height="wrap_content"
                 style="@style/crm_ll_card">
                 <TextView
                     android:layout_width="match_parent"

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

@@ -59,12 +59,14 @@
                 android:layout_toRightOf="@+id/tv_c12"
                 android:text="*"
                 android:textColor="@color/red" />
-
+<!--^[\u4e00-\u9fa5]{1,7}$|^[\dA-Za-z_]{1,7}$-->
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/et_cu_name"
                 style="@style/form_relative_right_text"
                 android:hint="请输入"
-                editTextFormExample:testType="nocheck" />
+                whatever:testType="regexp"
+                whatever:customRegexp="^[\u4e00-\u9fa5_a-zA-Z0-9_]{0,300}$"
+                whatever:testErrorString="限定字符长度不大于300" />
         </RelativeLayout>
 
         <!--<ImageView style="@style/app_comm_list_line_gray" />-->
@@ -109,7 +111,9 @@
                 android:id="@+id/tv_cu_address"
                 style="@style/form_relative_right_text"
                 android:hint="请输入"
-                editTextFormExample:testType="nocheck" />
+                whatever:testType="regexp"
+                whatever:customRegexp="^[\u4e00-\u9fa5]{1,500}$|^[\dA-Za-z_]{1,500}$"
+                whatever:testErrorString="限定字符长度不大于500" />
         </RelativeLayout>
 
 
@@ -264,8 +268,9 @@
                 android:id="@+id/tv_cu_contact"
                 style="@style/form_relative_right_text"
                 android:hint="请输入"
-                editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
-                editTextFormExample:testType="nocheck" />
+                whatever:testType="regexp"
+                whatever:customRegexp="^[\u4e00-\u9fa5_a-zA-Z0-9_]{0,100}$"
+                whatever:testErrorString="限定字符长度不大于100" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -291,7 +296,9 @@
                 android:id="@+id/tv_cu_degree"
                 style="@style/form_relative_right_text"
                 android:hint="请输入"
-                editTextFormExample:testType="nocheck" />
+                whatever:testType="regexp"
+                whatever:customRegexp="^[\u4e00-\u9fa5_a-zA-Z0-9_]{0,100}$"
+                whatever:testErrorString="限定字符长度不大于100"/>
         </RelativeLayout>
 
         <RelativeLayout
@@ -317,7 +324,8 @@
                 android:id="@+id/tv_cu_mobile"
                 style="@style/form_relative_right_text"
                 android:hint="请输入"
-                editTextFormExample:testType="nocheck" />
+                android:maxHeight="35dp"
+                editTextFormExample:testType="phone" />
         </RelativeLayout>
 
 
@@ -343,7 +351,8 @@
                 android:id="@+id/tv_cu_email"
                 style="@style/form_relative_right_text"
                 android:hint="请输入"
-                editTextFormExample:testType="nocheck" />
+                android:maxHeight="35dp"
+                editTextFormExample:testType="email" />
 
         </RelativeLayout>
 
@@ -426,7 +435,8 @@
                     android:id="@+id/tv_cu_taxrate"
                     style="@style/form_relative_right_text"
                     android:hint="请输入"
-                    editTextFormExample:testType="nocheck" />
+                    android:maxHeight="35dp"
+                    editTextFormExample:testType="numeric" />
             </RelativeLayout>
 
             <RelativeLayout
@@ -472,8 +482,10 @@
                 android:id="@+id/tv_cu_remark"
                 style="@style/form_relative_right_text"
                 android:hint="请输入"
-                editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
-                editTextFormExample:testType="nocheck" />
+                android:text=" "
+                whatever:testType="regexp"
+                whatever:customRegexp="^[\u4e00-\u9fa5_a-zA-Z0-9_\s]{0,50}$"
+                whatever:testErrorString="限定字符长度不大于50" />
         </RelativeLayout>
     </LinearLayout>
 </ScrollView>