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('E:/CompanyProject/applicationsignname[20150409]')
+            storeFile file('C:/Users/Arison/Desktop/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

WeiChat/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="52"
-    android:versionName="5.2">
+    android:versionCode="53"
+    android:versionName="5.3">
 
     <uses-sdk
         android:minSdkVersion="11"

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

@@ -297,7 +297,7 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
                 loadLeader(2);
                 break;
             case R.id.tv_date:
-                showDateWheel(R.id.tv_date);
+               // showDateWheel(R.id.tv_date);
                 break;
             case R.id.tv_business_state:
                 loadJieDuan(5);

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

@@ -35,6 +35,7 @@ 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.EmptyLayout;
 import com.xzjmyk.pm.activity.view.ClearEditText;
 import com.xzjmyk.pm.activity.view.SmoothCheckBox;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
@@ -53,6 +54,8 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
     private String code;
     @ViewInject(R.id.search_edit)
     private ClearEditText search_edit;
+    
+    private EmptyLayout mEmptyLayout;
 
     private String cu_code;
     private String cu_name;
@@ -75,6 +78,11 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
     }
 
     private void initListener() {
+
+        mEmptyLayout = new EmptyLayout(this, mlist.getRefreshableView());
+        mEmptyLayout.setShowLoadingButton(false);
+        mEmptyLayout.setShowEmptyButton(false);
+        mEmptyLayout.setShowErrorButton(false);
         mlist.setMode(PullToRefreshBase.Mode.DISABLED);
         mlist.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
             @Override
@@ -93,13 +101,16 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
                 BusinessSelectCustomerActivity.BussinessDetailAdapter.ViewHolder holder = (BussinessDetailAdapter.ViewHolder) view.getTag();
                 cu_code = holder.code;
                 cu_name = holder.tv_business_name.getText().toString();
-                final boolean flag = !mData.get(position - 1).isChecked;
+                final boolean flag = !mAdapter.getMdata().get(position - 1).isChecked;
                 Log.i(TAG, "onClick:" + position + " check:" + !flag);
+                for (Business model : mAdapter.getMdata()) {
+                    model.setIsChecked(false);
+                }
+                //把源数据清空
                 for (Business model : mData) {
                     model.setIsChecked(false);
                 }
-
-                mData.get(position - 1).setIsChecked(flag);
+                mAdapter.getMdata().get(position - 1).setIsChecked(flag);
                 mHandler.postDelayed(new Runnable() {
                     @Override
                     public void run() {
@@ -117,7 +128,11 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
 
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
-                
+                if (!StringUtils.isEmpty(search_edit.getText().toString())) {
+                    mAdapter.getFilter().filter(search_edit.getText().toString());
+                } else {
+                    mAdapter.getFilter().filter("");
+                }
             }
 
             @Override
@@ -162,6 +177,11 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
         private Context ct;
         private ArrayList<Business> mdata = new ArrayList<>();
         private LayoutInflater inflater;
+        private String searchkeys;
+
+        public ArrayList<Business> getMdata() {
+            return mdata;
+        }
 
         public BussinessDetailAdapter(Context ct, ArrayList<Business> data) {
             this.ct = ct;
@@ -218,15 +238,64 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
             holder.cb_left.setEnabled(false);
             holder.cb_left.setClickable(false);
             holder.code=mdata.get(position).getCode();
-            holder.tv_business_name.setText(mdata.get(position).getName());
             holder.cb_left.setChecked(mdata.get(position).isChecked(), mdata.get(position).isChecked());
-            holder.tv_business_leader.setText("负责人:"+mdata.get(position).getLeader());
+            
+            if (!StringUtils.isEmpty(searchkeys)){
+              //  holder.tv_business_name.setText(mdata.get(position).getName());
+
+                //holder.tv_business_leader.setText("负责人:"+mdata.get(position).getLeader());
+                CommonUtil.textSpanForStyle(holder.tv_business_name, mdata.get(position).getName(),
+                        searchkeys, ct.getResources().getColor(R.color.yellow));
+                CommonUtil.textSpanForStyle(holder.tv_business_leader, "负责人:"+mdata.get(position).getLeader(),
+                        searchkeys, ct.getResources().getColor(R.color.yellow));
+            }else{
+                holder.tv_business_name.setText(mdata.get(position).getName());
+
+                holder.tv_business_leader.setText("负责人:"+mdata.get(position).getLeader());
+            }
+         
             return convertView;
         }
 
         @Override
         public Filter getFilter() {
-            return null;
+          return   new Filter() {
+                @Override
+                protected FilterResults performFiltering(CharSequence constraint) {
+                    //过滤数据
+                    FilterResults searchResults = new FilterResults();
+
+                    if (constraint == null || constraint.length() == 0){
+                        
+                        searchResults.values=mData;
+                        searchResults.count=mData.size();
+                    }else{
+                        mdata=mData;
+                        ArrayList<Business> newArry=new ArrayList<Business>();
+                        for (int i=0;i<mdata.size();i++){
+                           Business model=mdata.get(i);
+                           if (model.getName().contains(constraint)||model.getLeader().contains(constraint)){
+                               newArry.add(model);
+                           }
+                        }
+
+                        searchResults.values=newArry;
+                        searchResults.count=newArry.size();
+                    }
+                    return searchResults;
+                }
+
+                @Override
+                protected void publishResults(CharSequence constraint, FilterResults results) {
+                    //装配数据
+                    mdata= (ArrayList<Business>) results.values;
+                    searchkeys=constraint.toString();
+                    if (mAdapter.getCount() == 0) {
+
+                    }
+                    notifyDataSetChanged();
+                }
+            };
         }
 
 
@@ -258,6 +327,10 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
                    }
                     mAdapter = new BussinessDetailAdapter(ct, mData);
                     mlist.setAdapter(mAdapter);
+                    if (mAdapter.getCount()==0){
+                        mEmptyLayout.showEmpty();
+                        
+                    }
                     break;
                 case 2:
                     progressDialog.dismiss();

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

@@ -18,6 +18,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.andreabaccega.widget.FormEditText;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.DbfindListActivity;
@@ -27,12 +28,14 @@ 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 com.xzjmyk.pm.activity.util.DateFormatUtil;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.net.URLEncoder;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -197,8 +200,12 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                     && tv_cu_businesscode.testValidity() && tv_cu_currency.testValidity()
                     && tv_cu_taxrate.testValidity() && tv_cu_nichestep.testValidity()
                    ) {
+                //  
                 formStore = "{\n" +
                         " \"cu_id\":" + mCuId + ",\n" +
+                        " \"cu_recordman\":" + MyApplication.getInstance().mLoginUser.getNickName()+ ",\n" +
+                        " \"cu_recorddate\":" + DateFormatUtil.getStrDate4Date(new Date(),"yyyy-MM-dd HH:mm:ss")+ ",\n" +
+                        " \"cu_status\":" +"\"长期\""+ ",\n" +
                         " \"cu_arcode\":" +"\"\""+ ",\n" +
                         " \"cu_arname\":" + "\"\""+ ",\n" +
                         " \"cu_code\":\"" + CommonUtil.getNoMarkEditText(et_cu_code) + "\",\n" +
@@ -552,10 +559,9 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
         params.put("which", "form");
         params.put("caller", "Customer!base");
         params.put("field", "cu_paymentscode");
-
+        params.put("pageSize",1000);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, PAY_METHODS, null, null, "post");
     }
 

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

@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     style="@style/crm_ll_card"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
     android:background="@color/white"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.crm.BusinessLessActivity">
 

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

@@ -168,7 +168,7 @@
                 android:drawableLeft="@drawable/my_shangwu"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="商务管理"
+                android:text="B2B商务"
                 android:textColor="@color/text_main"
                 android:textSize="14sp" />
 

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

@@ -54,7 +54,7 @@
     <LinearLayout style="@style/crm_ll_sale_item">
 
         <TextView
-            android:text="当前阶段："
+            android:text="当前阶段"
             android:minWidth="100dp"
             android:gravity="left"
             style="@style/TextView_Basic" />
@@ -83,7 +83,7 @@
     <LinearLayout style="@style/crm_ll_sale_item">
 
         <TextView
-            android:text="业务员："
+            android:text="业务员"
             android:minWidth="100dp"
             android:gravity="left"
             style="@style/TextView_Basic" />
@@ -102,7 +102,7 @@
             android:minWidth="100dp"
             android:gravity="left"
             android:id="@+id/tv_crm_business_datetv"
-            android:text="最后更进时间："
+            android:text="最后更进时间"
             android:layout_gravity="center_vertical"
             style="@style/TextView_Basic" />